Ignore:
Timestamp:
Jun 11, 2012, 9:53:19 AM (13 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
95f965
Parents:
b9c69d
git-author:
Michael Ankele <ankele@…> (04/24/12 13:55:16)
git-committer:
Frederik Heber <heber@…> (06/11/12 09:53:19)
Message:

disastrously big and ugly commit

  • using new Parameter<T> classes:
    • Actions
    • Queries (all UIs)
  • TODO:
    • actions crash cause Value is unset
    • no query<BoxVector>
Location:
src/UIElements/Qt4/Query
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • src/UIElements/Qt4/Query/AtomQtQuery.cpp

    rb9c69d rf10b0c  
    3030#include "World.hpp"
    3131
    32 QtDialog::AtomQtQuery::AtomQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    33     Dialog::AtomQuery(_title),
     32QtDialog::AtomQtQuery::AtomQtQuery(Parameter<const atom *> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     33    Dialog::AtomQuery(param, _title),
    3434    parent(_parent)
    3535{
     
    4646  thisLayout->addWidget(inputBox);
    4747
    48   pipe = new AtomQtQueryPipe(&tmp,_dialog, inputBox);
     48  pipe = new AtomQtQueryPipe(tmp,_dialog, inputBox);
    4949  pipe->update(inputBox->currentIndex());
    5050  connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));
  • src/UIElements/Qt4/Query/AtomsQtQuery.cpp

    rb9c69d rf10b0c  
    3333
    3434
    35 QtDialog::AtomsQtQuery::AtomsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    36     Dialog::AtomsQuery(_title),
     35QtDialog::AtomsQtQuery::AtomsQtQuery(Parameter<std::vector<const atom *> > &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     36    Dialog::AtomsQuery(param, _title),
    3737    parent(_parent)
    3838{
     
    6767  thisHLayout->addLayout(thisV2Layout);
    6868
    69   pipe = new AtomsQtQueryPipe(&tmp,_dialog,inputList);
     69  pipe = new AtomsQtQueryPipe(tmp,_dialog,inputList);
    7070  connect(inputList,SIGNAL(itemSelectionChanged()),pipe,SLOT(IntegerSelected()));
    7171  connect(AddButton,SIGNAL(Clicked()),pipe,SLOT(add()));
  • src/UIElements/Qt4/Query/BooleanQtQuery.cpp

    rb9c69d rf10b0c  
    2828
    2929
    30 QtDialog::BooleanQtQuery::BooleanQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
    31     Dialog::BooleanQuery(_title),
     30QtDialog::BooleanQtQuery::BooleanQtQuery(Parameter<bool> &param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
     31    Dialog::BooleanQuery(param, _title),
    3232    parent(_parent)
    3333{
     
    4040  thisLayout->addWidget(booleanCheckBox);
    4141
    42   pipe = new BooleanQtQueryPipe(&tmp,_dialog,booleanCheckBox);
     42  pipe = new BooleanQtQueryPipe(tmp,_dialog,booleanCheckBox);
    4343  connect(booleanCheckBox, SIGNAL(stateChanged(int)), pipe, SLOT(update(int)));
    4444}
  • src/UIElements/Qt4/Query/BoxQtQuery.cpp

    rb9c69d rf10b0c  
    3030#include "World.hpp"
    3131
    32 QtDialog::BoxQtQuery::BoxQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    33     Dialog::BoxQuery(_title),
     32QtDialog::BoxQtQuery::BoxQtQuery(Parameter<Box> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     33    Dialog::BoxQuery(param, _title),
    3434    parent(_parent)
    3535{
  • src/UIElements/Qt4/Query/DoubleQtQuery.cpp

    rb9c69d rf10b0c  
    2828
    2929
    30 QtDialog::DoubleQtQuery::DoubleQtQuery(std::string title,QBoxLayout *_parent,QtDialog *_dialog) :
    31     Dialog::DoubleQuery(title),
     30QtDialog::DoubleQtQuery::DoubleQtQuery(Parameter<double> &param, std::string title,QBoxLayout *_parent,QtDialog *_dialog) :
     31    Dialog::DoubleQuery(param, title),
    3232    parent(_parent)
    3333{
     
    4242  thisLayout->addWidget(inputBox);
    4343
    44   pipe = new DoubleQtQueryPipe(&tmp,_dialog);
     44  pipe = new DoubleQtQueryPipe(tmp,_dialog);
    4545  pipe->update(inputBox->value());
    4646  connect(inputBox,SIGNAL(valueChanged(double)),pipe,SLOT(update(double)));
  • src/UIElements/Qt4/Query/DoublesQtQuery.cpp

    rb9c69d rf10b0c  
    3030
    3131
    32 QtDialog::DoublesQtQuery::DoublesQtQuery(std::string title,QBoxLayout *_parent,QtDialog *_dialog) :
    33     Dialog::DoublesQuery(title),
     32QtDialog::DoublesQtQuery::DoublesQtQuery(Parameter<std::vector<double> > &param, std::string title,QBoxLayout *_parent,QtDialog *_dialog) :
     33    Dialog::DoublesQuery(param, title),
    3434    parent(_parent)
    3535{
     
    6060  thisHLayout->addLayout(thisV2Layout);
    6161
    62   pipe = new QtQueryListPipe<double>(&tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
     62  pipe = new QtQueryListPipe<double>(tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
    6363  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(IntegerEntered(const QString&)));
    6464  connect(inputList,SIGNAL(itemSelectionChanged()),pipe,SLOT(IntegerSelected()));
  • src/UIElements/Qt4/Query/ElementQtQuery.cpp

    rb9c69d rf10b0c  
    3131#include "World.hpp"
    3232
    33 QtDialog::ElementQtQuery::ElementQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
    34     Dialog::ElementQuery(_title),
     33QtDialog::ElementQtQuery::ElementQtQuery(Parameter<const element *> &param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
     34    Dialog::ElementQuery(param, _title),
    3535    parent(_parent)
    3636{
     
    5151  thisLayout->addWidget(inputBox);
    5252
    53   pipe = new ElementQtQueryPipe(&tmp,_dialog,inputBox);
     53  pipe = new ElementQtQueryPipe(tmp,_dialog,inputBox);
    5454  pipe->update(inputBox->currentIndex());
    5555  connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));
  • src/UIElements/Qt4/Query/ElementsQtQuery.cpp

    rb9c69d rf10b0c  
    3232
    3333
    34 QtDialog::ElementsQtQuery::ElementsQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
    35     Dialog::ElementsQuery(_title),
     34QtDialog::ElementsQtQuery::ElementsQtQuery(Parameter<std::vector<const element *> > &param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
     35    Dialog::ElementsQuery(param, _title),
    3636    parent(_parent)
    3737{
     
    5252  thisLayout->addWidget(inputBox);
    5353
    54   pipe = new ElementsQtQueryPipe(&tmp,_dialog,inputBox);
     54  pipe = new ElementsQtQueryPipe(tmp,_dialog,inputBox);
    5555  pipe->update(inputBox->currentIndex());
    5656  connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));
  • src/UIElements/Qt4/Query/FileQtQuery.cpp

    rb9c69d rf10b0c  
    2929
    3030
    31 QtDialog::FileQtQuery::FileQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
    32     Dialog::FileQuery(_title),
     31QtDialog::FileQtQuery::FileQtQuery(Parameter<boost::filesystem::path> &param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
     32    Dialog::FileQuery(param, _title),
    3333    parent(_parent)
    3434{
     
    4343  filedialogButton = new QPushButton("&Choose", _dialog);
    4444
    45   pipe = new FileQtQueryPipe(&tmp,_dialog,filenameLineEdit,filedialogButton);
     45  pipe = new FileQtQueryPipe(tmp,_dialog,filenameLineEdit,filedialogButton);
    4646
    4747  thisLayout = new QHBoxLayout();
  • src/UIElements/Qt4/Query/IntQtQuery.cpp

    rb9c69d rf10b0c  
    2828
    2929
    30 QtDialog::IntQtQuery::IntQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    31     Dialog::IntQuery(_title),
     30QtDialog::IntQtQuery::IntQtQuery(Parameter<int> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     31    Dialog::IntQuery(param, _title),
    3232    parent(_parent)
    3333{
     
    4040  thisLayout->addWidget(inputBox);
    4141
    42   pipe = new IntQtQueryPipe(&tmp,_dialog);
     42  pipe = new IntQtQueryPipe(tmp,_dialog);
    4343  pipe->update(inputBox->value());
    4444  connect(inputBox,SIGNAL(valueChanged(int)),pipe,SLOT(update(int)));
  • src/UIElements/Qt4/Query/IntsQtQuery.cpp

    rb9c69d rf10b0c  
    3030
    3131
    32 QtDialog::IntsQtQuery::IntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    33     Dialog::IntsQuery(_title),
     32QtDialog::IntsQtQuery::IntsQtQuery(Parameter<std::vector<int> > &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     33    Dialog::IntsQuery(param, _title),
    3434    parent(_parent)
    3535{
     
    6060  thisHLayout->addLayout(thisV2Layout);
    6161
    62   pipe = new QtQueryListPipe<int>(&tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
     62  pipe = new QtQueryListPipe<int>(tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
    6363  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(IntegerEntered(const QString&)));
    6464  connect(inputList,SIGNAL(itemSelectionChanged()),pipe,SLOT(IntegerSelected()));
  • src/UIElements/Qt4/Query/MoleculeQtQuery.cpp

    rb9c69d rf10b0c  
    3131
    3232
    33 QtDialog::MoleculeQtQuery::MoleculeQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
    34     Dialog::MoleculeQuery(_title),
     33QtDialog::MoleculeQtQuery::MoleculeQtQuery(Parameter<const molecule *> &param, std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
     34    Dialog::MoleculeQuery(param, _title),
    3535    parent(_parent)
    3636{
     
    5151  thisLayout->addWidget(inputBox);
    5252
    53   pipe = new MoleculeQtQueryPipe(&tmp,_dialog,inputBox);
     53  pipe = new MoleculeQtQueryPipe(tmp,_dialog,inputBox);
    5454  pipe->update(inputBox->currentIndex());
    5555  connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));
  • src/UIElements/Qt4/Query/MoleculesQtQuery.cpp

    rb9c69d rf10b0c  
    3131
    3232
    33 QtDialog::MoleculesQtQuery::MoleculesQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
    34     Dialog::MoleculesQuery(_title),
     33QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &param, std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
     34    Dialog::MoleculesQuery(param, _title),
    3535    parent(_parent)
    3636{
     
    5151  thisLayout->addWidget(inputBox);
    5252
    53   pipe = new MoleculesQtQueryPipe(&tmp,_dialog,inputBox);
     53  pipe = new MoleculesQtQueryPipe(tmp,_dialog,inputBox);
    5454  pipe->update(inputBox->currentIndex());
    5555  connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));
  • src/UIElements/Qt4/Query/QtQuery.hpp

    rb9c69d rf10b0c  
    1616
    1717#include "Qt4/QtDialog.hpp"
     18#include "Parameters/Parameter.hpp"
    1819
    1920class QHBoxLayout;
     
    5657class QtDialog::AtomQtQuery : public Dialog::AtomQuery {
    5758public:
    58   AtomQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
     59  AtomQtQuery(Parameter<const atom *> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
    5960  virtual ~AtomQtQuery();
    6061  virtual bool handle();
     
    7071class QtDialog::AtomsQtQuery : public Dialog::AtomsQuery {
    7172public:
    72   AtomsQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
     73  AtomsQtQuery(Parameter<std::vector<const atom *> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
    7374  virtual ~AtomsQtQuery();
    7475  virtual bool handle();
     
    8586class QtDialog::BooleanQtQuery : public Dialog::BooleanQuery {
    8687public:
    87   BooleanQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
     88  BooleanQtQuery(Parameter<bool> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
    8889  virtual ~BooleanQtQuery();
    8990  virtual bool handle();
     
    99100class QtDialog::BoxQtQuery : public Dialog::BoxQuery {
    100101public:
    101   BoxQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
     102  BoxQtQuery(Parameter<Box> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
    102103  virtual ~BoxQtQuery();
    103104  virtual bool handle();
     
    113114class QtDialog::DoubleQtQuery : public Dialog::DoubleQuery {
    114115public:
    115   DoubleQtQuery(std::string title,QBoxLayout *_parent,QtDialog *_dialog);
     116  DoubleQtQuery(Parameter<double> &, std::string title,QBoxLayout *_parent,QtDialog *_dialog);
    116117  virtual ~DoubleQtQuery();
    117118  virtual bool handle();
     
    127128class QtDialog::DoublesQtQuery : public Dialog::DoublesQuery {
    128129public:
    129   DoublesQtQuery(std::string title,QBoxLayout *_parent,QtDialog *_dialog);
     130  DoublesQtQuery(Parameter<std::vector<double> > &, std::string title,QBoxLayout *_parent,QtDialog *_dialog);
    130131  virtual ~DoublesQtQuery();
    131132  virtual bool handle();
     
    141142class QtDialog::ElementQtQuery : public Dialog::ElementQuery {
    142143public:
    143   ElementQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
     144  ElementQtQuery(Parameter<const element *> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
    144145  virtual ~ElementQtQuery();
    145146  virtual bool handle();
     
    155156class QtDialog::ElementsQtQuery : public Dialog::ElementsQuery {
    156157public:
    157   ElementsQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
     158  ElementsQtQuery(Parameter<std::vector<const element *> > &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
    158159  virtual ~ElementsQtQuery();
    159160  virtual bool handle();
     
    182183class QtDialog::FileQtQuery : public Dialog::FileQuery {
    183184public:
    184   FileQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
     185  FileQtQuery(Parameter<boost::filesystem::path> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
    185186  virtual ~FileQtQuery();
    186187  virtual bool handle();
     
    197198class QtDialog::IntQtQuery : public Dialog::IntQuery {
    198199public:
    199   IntQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
     200  IntQtQuery(Parameter<int> &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
    200201  virtual ~IntQtQuery();
    201202  virtual bool handle();
     
    211212class QtDialog::IntsQtQuery : public Dialog::IntsQuery {
    212213public:
    213   IntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
     214  IntsQtQuery(Parameter<std::vector<int> > &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
    214215  virtual ~IntsQtQuery();
    215216  virtual bool handle();
     
    228229class QtDialog::MoleculeQtQuery : public Dialog::MoleculeQuery {
    229230public:
    230   MoleculeQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
     231  MoleculeQtQuery(Parameter<const molecule *> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
    231232  virtual ~MoleculeQtQuery();
    232233  virtual bool handle();
     
    242243class QtDialog::MoleculesQtQuery : public Dialog::MoleculesQuery {
    243244public:
    244   MoleculesQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
     245  MoleculesQtQuery(Parameter<std::vector<const molecule *> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
    245246  virtual ~MoleculesQtQuery();
    246247  virtual bool handle();
     
    256257class QtDialog::StringQtQuery : public Dialog::StringQuery {
    257258public:
    258   StringQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
     259  StringQtQuery(Parameter<std::string> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
    259260  virtual ~StringQtQuery();
    260261  virtual bool handle();
     
    270271class QtDialog::StringsQtQuery : public Dialog::StringsQuery {
    271272public:
    272   StringsQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
     273  StringsQtQuery(Parameter<std::vector<std::string> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
    273274  virtual ~StringsQtQuery();
    274275  virtual bool handle();
     
    284285class QtDialog::UnsignedIntQtQuery : public Dialog::UnsignedIntQuery {
    285286public:
    286   UnsignedIntQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
     287  UnsignedIntQtQuery(Parameter<unsigned int> &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
    287288  virtual ~UnsignedIntQtQuery();
    288289  virtual bool handle();
     
    298299class QtDialog::UnsignedIntsQtQuery : public Dialog::UnsignedIntsQuery {
    299300public:
    300   UnsignedIntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
     301  UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
    301302  virtual ~UnsignedIntsQtQuery();
    302303  virtual bool handle();
     
    316317class QtDialog::VectorQtQuery : public Dialog::VectorQuery {
    317318public:
    318   VectorQtQuery(std::string title,bool _check,QBoxLayout *,QtDialog *);
     319  VectorQtQuery(Parameter<Vector> &, std::string title,bool _check,QBoxLayout *,QtDialog *);
    319320  virtual ~VectorQtQuery();
    320321  virtual bool handle();
     
    335336class QtDialog::VectorsQtQuery : public Dialog::VectorsQuery {
    336337public:
    337   VectorsQtQuery(std::string title,bool _check,QBoxLayout *,QtDialog *);
     338  VectorsQtQuery(Parameter<std::vector<Vector> > &, std::string title,bool _check,QBoxLayout *,QtDialog *);
    338339  virtual ~VectorsQtQuery();
    339340  virtual bool handle();
     
    352353class QtDialog::RandomNumberDistribution_ParametersQtQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
    353354public:
    354   RandomNumberDistribution_ParametersQtQuery(std::string title,QBoxLayout *,QtDialog *);
     355  RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &, std::string title,QBoxLayout *,QtDialog *);
    355356  virtual ~RandomNumberDistribution_ParametersQtQuery();
    356357  virtual bool handle();
  • src/UIElements/Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp

    rb9c69d rf10b0c  
    3131#include "World.hpp"
    3232
    33 QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    34     Dialog::RandomNumberDistribution_ParametersQuery(_title),
     33QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     34    Dialog::RandomNumberDistribution_ParametersQuery(param, _title),
    3535    parent(_parent)
    3636{
     
    5050  okButton = new QPushButton(tr("Ok"));
    5151
    52   pipe = new RandomNumberDistribution_ParametersQtQueryPipe(&tmp,_dialog, inputBox);
     52  pipe = new RandomNumberDistribution_ParametersQtQueryPipe(tmp,_dialog, inputBox);
    5353  connect(okButton,SIGNAL(clicked()),pipe,SLOT(update()));
    5454}
  • src/UIElements/Qt4/Query/StringQtQuery.cpp

    rb9c69d rf10b0c  
    2828
    2929
    30 QtDialog::StringQtQuery::StringQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    31     Dialog::StringQuery(_title),
     30QtDialog::StringQtQuery::StringQtQuery(Parameter<std::string> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     31    Dialog::StringQuery(param, _title),
    3232    parent(_parent)
    3333{
     
    3939  thisLayout->addWidget(inputBox);
    4040
    41   pipe = new StringQtQueryPipe(&tmp,_dialog);
     41  pipe = new StringQtQueryPipe(tmp,_dialog);
    4242  pipe->update(inputBox->text());
    4343  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(update(const QString&)));
     
    5252bool QtDialog::StringQtQuery::handle()
    5353{
    54   return tmp!="";
     54  return tmp.get() != "";
    5555}
    5656
  • src/UIElements/Qt4/Query/StringsQtQuery.cpp

    rb9c69d rf10b0c  
    3030
    3131
    32 QtDialog::StringsQtQuery::StringsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    33     Dialog::StringsQuery(_title),
     32QtDialog::StringsQtQuery::StringsQtQuery(Parameter<std::vector<std::string> > &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     33    Dialog::StringsQuery(param, _title),
    3434    parent(_parent)
    3535{
     
    6060  thisHLayout->addLayout(thisV2Layout);
    6161
    62   pipe = new QtQueryListPipe<std::string>(&tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
     62  pipe = new QtQueryListPipe<std::string>(tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
    6363  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(IntegerEntered(const QString&)));
    6464  connect(inputList,SIGNAL(itemSelectionChanged()),pipe,SLOT(IntegerSelected()));
     
    7676  // dissect by ","
    7777  std::string::iterator olditer = temp.begin();
     78  std::vector<std::string> temp_strings;
    7879  for(std::string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
    7980    if (*iter == ' ') {
    80       tmp.push_back(std::string(iter, olditer));
     81      temp_strings.push_back(std::string(iter, olditer));
    8182      olditer = iter;
    8283    }
    8384  }
    8485  if (olditer != temp.begin())  // insert last part also
    85     tmp.push_back(std::string(olditer, temp.end()));
     86    temp_strings.push_back(std::string(olditer, temp.end()));
     87  tmp.set(temp_strings);
    8688
    8789  return temp!="";
  • src/UIElements/Qt4/Query/UnsignedIntQtQuery.cpp

    rb9c69d rf10b0c  
    2828
    2929
    30 QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    31     Dialog::UnsignedIntQuery(_title),
     30QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(Parameter<unsigned int> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     31    Dialog::UnsignedIntQuery(param, _title),
    3232    parent(_parent)
    3333{
     
    4040  thisLayout->addWidget(inputBox);
    4141
    42   pipe = new UnsignedIntQtQueryPipe(&tmp,_dialog);
     42  pipe = new UnsignedIntQtQueryPipe(tmp,_dialog);
    4343  pipe->update(inputBox->value());
    4444  connect(inputBox,SIGNAL(valueChanged(unsigned int)),pipe,SLOT(update(unsigned int)));
  • src/UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp

    rb9c69d rf10b0c  
    3030
    3131
    32 QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    33     Dialog::UnsignedIntsQuery(_title),
     32QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     33    Dialog::UnsignedIntsQuery(param, _title),
    3434    parent(_parent)
    3535{
     
    6060  thisHLayout->addLayout(thisV2Layout);
    6161
    62   pipe = new QtQueryListPipe<unsigned int>(&tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
     62  pipe = new QtQueryListPipe<unsigned int>(tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
    6363  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(IntegerEntered(const QString&)));
    6464  connect(inputList,SIGNAL(itemSelectionChanged()),pipe,SLOT(IntegerSelected()));
  • src/UIElements/Qt4/Query/VectorQtQuery.cpp

    rb9c69d rf10b0c  
    2929
    3030
    31 QtDialog::VectorQtQuery::VectorQtQuery(std::string title, bool _check,QBoxLayout *_parent,QtDialog *_dialog) :
    32     Dialog::VectorQuery(title,_check),
     31QtDialog::VectorQtQuery::VectorQtQuery(Parameter<Vector> &param, std::string title, bool _check,QBoxLayout *_parent,QtDialog *_dialog) :
     32    Dialog::VectorQuery(param, title,_check),
    3333    parent(_parent)
    3434{
     35  param.set(Vector(0,0,0));
    3536  mainLayout= new QHBoxLayout();
    3637  titleLabel = new QLabel(QString(getTitle().c_str()));
     
    5859  coordInputZ->setDecimals(3);
    5960  coordLayout->addWidget(coordInputZ);
    60   pipe = new VectorQtQueryPipe(&(tmp),_dialog,inputBox);
     61  pipe = new VectorQtQueryPipe(tmp,_dialog,inputBox);
    6162  //pipe->update(coordInput->value());
    6263  connect(coordInputX,SIGNAL(valueChanged(double)),pipe,SLOT(updateX(double)));
  • src/UIElements/Qt4/Query/VectorsQtQuery.cpp

    rb9c69d rf10b0c  
    2929
    3030
    31 QtDialog::VectorsQtQuery::VectorsQtQuery(std::string title, bool _check,QBoxLayout *_parent,QtDialog *_dialog) :
    32     Dialog::VectorsQuery(title,_check),
     31QtDialog::VectorsQtQuery::VectorsQtQuery(Parameter<std::vector<Vector> > &param, std::string title, bool _check,QBoxLayout *_parent,QtDialog *_dialog) :
     32    Dialog::VectorsQuery(param, title,_check),
    3333    parent(_parent)
    3434{
     
    4747  coordInput->setDecimals(3);
    4848  coordLayout->addWidget(coordInput);
    49   pipe = new VectorsQtQueryPipe(&(tmp),_dialog,inputBox);
     49  pipe = new VectorsQtQueryPipe(tmp,_dialog,inputBox);
    5050  //pipe->update(coordInput->value());
    5151  connect(coordInput,SIGNAL(valueChanged(double)),pipe,SLOT(update(double)));
Note: See TracChangeset for help on using the changeset viewer.