Changeset f130d4 for src/UIElements/Qt4/Query
- Timestamp:
- Oct 5, 2013, 9:31:54 AM (12 years ago)
- 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, Candidate_v1.7.0, 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:
- 25ce49
- Parents:
- 07414d7
- git-author:
- Frederik Heber <heber@…> (09/06/13 15:36:56)
- git-committer:
- Frederik Heber <heber@…> (10/05/13 09:31:54)
- Location:
- src/UIElements/Qt4/Query
- Files:
-
- 24 edited
-
AtomQtQuery.cpp (modified) (2 diffs)
-
AtomsQtQuery.cpp (modified) (1 diff)
-
BooleanQtQuery.cpp (modified) (2 diffs)
-
DoubleQtQuery.cpp (modified) (2 diffs)
-
DoublesQtQuery.cpp (modified) (1 diff)
-
ElementQtQuery.cpp (modified) (2 diffs)
-
ElementsQtQuery.cpp (modified) (1 diff)
-
EmptyQtQuery.cpp (modified) (2 diffs)
-
FileQtQuery.cpp (modified) (2 diffs)
-
FilesQtQuery.cpp (modified) (1 diff)
-
IntQtQuery.cpp (modified) (2 diffs)
-
IntsQtQuery.cpp (modified) (1 diff)
-
MoleculeQtQuery.cpp (modified) (2 diffs)
-
MoleculesQtQuery.cpp (modified) (1 diff)
-
QtQuery.hpp (modified) (23 diffs)
-
QtQueryList.hpp (modified) (1 diff)
-
RandomNumberDistribution_ParametersQtQuery.cpp (modified) (2 diffs)
-
RealSpaceMatrixQtQuery.cpp (modified) (2 diffs)
-
StringQtQuery.cpp (modified) (2 diffs)
-
StringsQtQuery.cpp (modified) (1 diff)
-
UnsignedIntQtQuery.cpp (modified) (2 diffs)
-
UnsignedIntsQtQuery.cpp (modified) (1 diff)
-
VectorQtQuery.cpp (modified) (2 diffs)
-
VectorsQtQuery.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/UIElements/Qt4/Query/AtomQtQuery.cpp
r07414d7 rf130d4 44 44 #include "World.hpp" 45 45 46 QtDialog::AtomQtQuery::AtomQtQuery(Parameter<const atom *> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :47 QtQuery<const atom *>(_param, _title ),46 QtDialog::AtomQtQuery::AtomQtQuery(Parameter<const atom *> &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 47 QtQuery<const atom *>(_param, _title, _description), 48 48 parent(_parent), 49 49 dialog(_dialog) … … 51 51 thisLayout = new QHBoxLayout(); 52 52 titleLabel = new QLabel(QString(getTitle().c_str())); 53 titleLabel->setToolTip(QString(getDescription().c_str())); 53 54 inputBox = new QComboBox(); 54 55 inputBox->insertItem(-1, QString("no atom")); -
src/UIElements/Qt4/Query/AtomsQtQuery.cpp
r07414d7 rf130d4 43 43 44 44 45 QtDialog::AtomsQtQuery::AtomsQtQuery(Parameter<std::vector<const atom *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :46 QtQuery<std::vector<const atom *> >(_param, _title ),45 QtDialog::AtomsQtQuery::AtomsQtQuery(Parameter<std::vector<const atom *> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 46 QtQuery<std::vector<const atom *> >(_param, _title, _description), 47 47 QtQueryList<const atom *>(_param, _parent, _dialog, temp) 48 48 { 49 49 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 50 subQuery = new AtomQtQuery(*subParam, _title, thisVLayout, subDialog);50 subQuery = new AtomQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 51 51 subDialog->setSubQuery(subQuery); 52 52 -
src/UIElements/Qt4/Query/BooleanQtQuery.cpp
r07414d7 rf130d4 42 42 43 43 44 QtDialog::BooleanQtQuery::BooleanQtQuery(Parameter<bool> &_param, std::string _title, QBoxLayout *_parent, Dialog *_dialog) :45 QtQuery<bool>(_param, _title ),44 QtDialog::BooleanQtQuery::BooleanQtQuery(Parameter<bool> &_param, const std::string &_title, const std::string &_description, QBoxLayout *_parent, Dialog *_dialog) : 45 QtQuery<bool>(_param, _title, _description), 46 46 parent(_parent), 47 47 dialog(_dialog) … … 52 52 thisLayout = new QHBoxLayout(); 53 53 titleLabel = new QLabel(QString(getTitle().c_str())); 54 titleLabel->setToolTip(QString(getDescription().c_str())); 54 55 booleanCheckBox = new QCheckBox(QString(getTitle().c_str())); 55 56 booleanCheckBox->setCheckState(temp ? Qt::Checked : Qt::Unchecked); -
src/UIElements/Qt4/Query/DoubleQtQuery.cpp
r07414d7 rf130d4 42 42 43 43 44 QtDialog::DoubleQtQuery::DoubleQtQuery(Parameter<double> &_param, std::string title,QBoxLayout *_parent,Dialog *_dialog) :45 QtQuery<double>(_param, title),44 QtDialog::DoubleQtQuery::DoubleQtQuery(Parameter<double> &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 45 QtQuery<double>(_param, _title, _description), 46 46 parent(_parent), 47 47 dialog(_dialog) … … 52 52 thisLayout = new QHBoxLayout(); 53 53 titleLabel = new QLabel(QString(getTitle().c_str())); 54 titleLabel->setToolTip(QString(getDescription().c_str())); 54 55 inputBox = new QDoubleSpinBox(); 55 56 inputBox->setValue(temp); -
src/UIElements/Qt4/Query/DoublesQtQuery.cpp
r07414d7 rf130d4 43 43 44 44 45 QtDialog::DoublesQtQuery::DoublesQtQuery(Parameter<std::vector<double> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :46 QtQuery<std::vector<double> >(_param, _title ),45 QtDialog::DoublesQtQuery::DoublesQtQuery(Parameter<std::vector<double> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 46 QtQuery<std::vector<double> >(_param, _title, _description), 47 47 QtQueryList<double>(_param, _parent, _dialog, temp) 48 48 { 49 49 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 50 subQuery = new DoubleQtQuery(*subParam, _title, thisVLayout, subDialog);50 subQuery = new DoubleQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 51 51 subDialog->setSubQuery(subQuery); 52 52 -
src/UIElements/Qt4/Query/ElementQtQuery.cpp
r07414d7 rf130d4 45 45 #include "World.hpp" 46 46 47 QtDialog::ElementQtQuery::ElementQtQuery(Parameter<const element *> &_param, std::string _title, QBoxLayout *_parent, Dialog *_dialog) :48 QtQuery<const element *>(_param, _title ),47 QtDialog::ElementQtQuery::ElementQtQuery(Parameter<const element *> &_param, const std::string &_title, const std::string &_description, QBoxLayout *_parent, Dialog *_dialog) : 48 QtQuery<const element *>(_param, _title, _description), 49 49 parent(_parent), 50 50 dialog(_dialog) … … 53 53 thisLayout = new QHBoxLayout(); 54 54 titleLabel = new QLabel(QString(getTitle().c_str())); 55 titleLabel->setToolTip(QString(getDescription().c_str())); 55 56 inputBox = new QComboBox(); 56 57 for(periodentafel::const_iterator iter = periode->begin(); -
src/UIElements/Qt4/Query/ElementsQtQuery.cpp
r07414d7 rf130d4 44 44 45 45 46 QtDialog::ElementsQtQuery::ElementsQtQuery(Parameter<std::vector<const element *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :47 QtQuery<std::vector<const element *> >(_param, _title ),46 QtDialog::ElementsQtQuery::ElementsQtQuery(Parameter<std::vector<const element *> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 47 QtQuery<std::vector<const element *> >(_param, _title, _description), 48 48 QtQueryList<const element *>(_param, _parent, _dialog, temp) 49 49 { 50 50 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 51 subQuery = new ElementQtQuery(*subParam, _title, thisVLayout, subDialog);51 subQuery = new ElementQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 52 52 subDialog->setSubQuery(subQuery); 53 53 -
src/UIElements/Qt4/Query/EmptyQtQuery.cpp
r07414d7 rf130d4 41 41 42 42 43 QtDialog::EmptyQtQuery::EmptyQtQuery( std::string _title, QBoxLayout *_parent, Dialog *_dialog) :44 Dialog::EmptyQuery(_title ),43 QtDialog::EmptyQtQuery::EmptyQtQuery(const std::string &_title, const std::string &_description, QBoxLayout *_parent, Dialog *_dialog) : 44 Dialog::EmptyQuery(_title, _description), 45 45 parent(_parent), 46 46 dialog(_dialog) … … 48 48 thisLayout = new QHBoxLayout(); 49 49 titleLabel = new QLabel(QString(getTitle().c_str())); 50 titleLabel->setToolTip(QString(getDescription().c_str())); 50 51 51 52 parent->addLayout(thisLayout); -
src/UIElements/Qt4/Query/FileQtQuery.cpp
r07414d7 rf130d4 48 48 #include "Parser/FormatParserStorage.hpp" 49 49 50 QtDialog::FileQtQuery::FileQtQuery(Parameter<boost::filesystem::path> &_param, std::string _title, QBoxLayout *_parent, Dialog *_dialog) :51 QtQuery<boost::filesystem::path>(_param, _title ),50 QtDialog::FileQtQuery::FileQtQuery(Parameter<boost::filesystem::path> &_param, const std::string &_title, const std::string &_description, QBoxLayout *_parent, Dialog *_dialog) : 51 QtQuery<boost::filesystem::path>(_param, _title, _description), 52 52 parent(_parent), 53 53 dialog(_dialog) … … 59 59 filenameLabel = new QLabel(QString("Input file:")); 60 60 filenameLabel->setBuddy(filenameLineEdit); 61 filenameLabel->setToolTip(QString(getDescription().c_str())); 61 62 62 63 filedialogButton = new QPushButton("&Choose"); -
src/UIElements/Qt4/Query/FilesQtQuery.cpp
r07414d7 rf130d4 44 44 45 45 46 QtDialog::FilesQtQuery::FilesQtQuery(Parameter<std::vector<boost::filesystem::path> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :47 QtQuery<std::vector<boost::filesystem::path> >(_param, _title ),46 QtDialog::FilesQtQuery::FilesQtQuery(Parameter<std::vector<boost::filesystem::path> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 47 QtQuery<std::vector<boost::filesystem::path> >(_param, _title, _description), 48 48 QtQueryList<boost::filesystem::path>(_param, _parent, _dialog, temp) 49 49 { 50 50 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 51 subQuery = new FileQtQuery(*subParam, _title, thisVLayout, subDialog);51 subQuery = new FileQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 52 52 subDialog->setSubQuery(subQuery); 53 53 -
src/UIElements/Qt4/Query/IntQtQuery.cpp
r07414d7 rf130d4 42 42 43 43 44 QtDialog::IntQtQuery::IntQtQuery(Parameter<int> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :45 QtQuery<int>(_param, _title ),44 QtDialog::IntQtQuery::IntQtQuery(Parameter<int> &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 45 QtQuery<int>(_param, _title, _description), 46 46 parent(_parent), 47 47 dialog(_dialog) … … 52 52 thisLayout = new QHBoxLayout(); 53 53 titleLabel = new QLabel(QString(getTitle().c_str())); 54 titleLabel->setToolTip(QString(getDescription().c_str())); 54 55 inputBox = new QSpinBox(); 55 56 inputBox->setValue(temp); -
src/UIElements/Qt4/Query/IntsQtQuery.cpp
r07414d7 rf130d4 43 43 44 44 45 QtDialog::IntsQtQuery::IntsQtQuery(Parameter<std::vector<int> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :46 QtQuery<std::vector<int> >(_param, _title ),45 QtDialog::IntsQtQuery::IntsQtQuery(Parameter<std::vector<int> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 46 QtQuery<std::vector<int> >(_param, _title, _description), 47 47 QtQueryList<int>(_param, _parent, _dialog, temp) 48 48 { 49 49 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 50 subQuery = new IntQtQuery(*subParam, _title, thisVLayout, subDialog);50 subQuery = new IntQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 51 51 subDialog->setSubQuery(subQuery); 52 52 -
src/UIElements/Qt4/Query/MoleculeQtQuery.cpp
r07414d7 rf130d4 45 45 46 46 47 QtDialog::MoleculeQtQuery::MoleculeQtQuery(Parameter<const molecule *> &_param, std::string _title, QBoxLayout *_parent,Dialog *_dialog) :48 QtQuery<const molecule *>(_param, _title ),47 QtDialog::MoleculeQtQuery::MoleculeQtQuery(Parameter<const molecule *> &_param, const std::string &_title, const std::string &_description, QBoxLayout *_parent,Dialog *_dialog) : 48 QtQuery<const molecule *>(_param, _title, _description), 49 49 parent(_parent), 50 50 dialog(_dialog) … … 52 52 thisLayout = new QHBoxLayout(); 53 53 titleLabel = new QLabel(QString(getTitle().c_str())); 54 titleLabel->setToolTip(QString(getDescription().c_str())); 54 55 inputBox = new QComboBox(); 55 56 // add all molecules to the combo box -
src/UIElements/Qt4/Query/MoleculesQtQuery.cpp
r07414d7 rf130d4 43 43 44 44 45 QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :46 QtQuery<std::vector<const molecule *> >(_param, _title ),45 QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 46 QtQuery<std::vector<const molecule *> >(_param, _title, _description), 47 47 QtQueryList<const molecule *>(_param, _parent, _dialog, temp) 48 48 { 49 49 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 50 subQuery = new MoleculeQtQuery(*subParam, _title, thisVLayout, subDialog);50 subQuery = new MoleculeQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 51 51 subDialog->setSubQuery(subQuery); 52 52 -
src/UIElements/Qt4/Query/QtQuery.hpp
r07414d7 rf130d4 39 39 { 40 40 public: 41 QtQuery(Parameter<T> &_param, std::string title, std::string_description = "") :42 Dialog::TQuery<T>(_param, title, _description) {}41 QtQuery(Parameter<T> &_param, const std::string &_title, const std::string &_description = "") : 42 Dialog::TQuery<T>(_param, _title, _description) {} 43 43 // QtQueries are interactive - no need for handle(). 44 44 virtual bool handle(){ return true; } … … 48 48 Q_OBJECT 49 49 public: 50 AtomQtQuery(Parameter<const atom *> &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);50 AtomQtQuery(Parameter<const atom *> &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 51 51 virtual ~AtomQtQuery(); 52 52 … … 65 65 Q_OBJECT 66 66 public: 67 AtomsQtQuery(Parameter<std::vector<const atom *> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);67 AtomsQtQuery(Parameter<std::vector<const atom *> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 68 68 virtual ~AtomsQtQuery(); 69 69 … … 82 82 Q_OBJECT 83 83 public: 84 BooleanQtQuery(Parameter<bool> &, std::string _title, QBoxLayout *_parent, Dialog *_dialog);84 BooleanQtQuery(Parameter<bool> &, const std::string &_title, const std::string &description, QBoxLayout *_parent, Dialog *_dialog); 85 85 virtual ~BooleanQtQuery(); 86 86 … … 99 99 Q_OBJECT 100 100 public: 101 RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);101 RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 102 102 virtual ~RealSpaceMatrixQtQuery(); 103 103 … … 116 116 Q_OBJECT 117 117 public: 118 DoubleQtQuery(Parameter<double> &, std::string title,QBoxLayout *_parent,Dialog *_dialog);118 DoubleQtQuery(Parameter<double> &, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog); 119 119 virtual ~DoubleQtQuery(); 120 120 … … 133 133 Q_OBJECT 134 134 public: 135 DoublesQtQuery(Parameter<std::vector<double> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);135 DoublesQtQuery(Parameter<std::vector<double> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 136 136 virtual ~DoublesQtQuery(); 137 137 … … 150 150 Q_OBJECT 151 151 public: 152 ElementQtQuery(Parameter<const element *> &, std::string _title, QBoxLayout *_parent, Dialog *_dialog);152 ElementQtQuery(Parameter<const element *> &, const std::string &_title, const std::string &description, QBoxLayout *_parent, Dialog *_dialog); 153 153 virtual ~ElementQtQuery(); 154 154 … … 167 167 Q_OBJECT 168 168 public: 169 ElementsQtQuery(Parameter<std::vector<const element *> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);169 ElementsQtQuery(Parameter<std::vector<const element *> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 170 170 virtual ~ElementsQtQuery(); 171 171 … … 183 183 class QtDialog::EmptyQtQuery : public Dialog::EmptyQuery { 184 184 public: 185 EmptyQtQuery( std::string _title, QBoxLayout *_parent, Dialog *_dialog);185 EmptyQtQuery(const std::string &_title, const std::string &description, QBoxLayout *_parent, Dialog *_dialog); 186 186 virtual ~EmptyQtQuery(); 187 187 virtual bool handle(); … … 196 196 Q_OBJECT 197 197 public: 198 FileQtQuery(Parameter<boost::filesystem::path> &, std::string _title, QBoxLayout *_parent, Dialog *_dialog);198 FileQtQuery(Parameter<boost::filesystem::path> &, const std::string &_title, const std::string &description, QBoxLayout *_parent, Dialog *_dialog); 199 199 virtual ~FileQtQuery(); 200 200 … … 216 216 Q_OBJECT 217 217 public: 218 FilesQtQuery(Parameter<std::vector<boost::filesystem::path> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);218 FilesQtQuery(Parameter<std::vector<boost::filesystem::path> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 219 219 virtual ~FilesQtQuery(); 220 220 … … 233 233 Q_OBJECT 234 234 public: 235 IntQtQuery(Parameter<int> &, std::string _title,QBoxLayout *_parent,Dialog *_dialog);235 IntQtQuery(Parameter<int> &, const std::string &_title, const std::string &description,QBoxLayout *_parent,Dialog *_dialog); 236 236 virtual ~IntQtQuery(); 237 237 … … 250 250 Q_OBJECT 251 251 public: 252 IntsQtQuery(Parameter<std::vector<int> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);252 IntsQtQuery(Parameter<std::vector<int> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 253 253 virtual ~IntsQtQuery(); 254 254 … … 267 267 Q_OBJECT 268 268 public: 269 MoleculeQtQuery(Parameter<const molecule *> &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);269 MoleculeQtQuery(Parameter<const molecule *> &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 270 270 virtual ~MoleculeQtQuery(); 271 271 … … 284 284 Q_OBJECT 285 285 public: 286 MoleculesQtQuery(Parameter<std::vector<const molecule *> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);286 MoleculesQtQuery(Parameter<std::vector<const molecule *> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 287 287 virtual ~MoleculesQtQuery(); 288 288 … … 301 301 Q_OBJECT 302 302 public: 303 StringQtQuery(Parameter<std::string> &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);303 StringQtQuery(Parameter<std::string> &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 304 304 virtual ~StringQtQuery(); 305 305 … … 320 320 Q_OBJECT 321 321 public: 322 StringsQtQuery(Parameter<std::vector<std::string> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);322 StringsQtQuery(Parameter<std::vector<std::string> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 323 323 virtual ~StringsQtQuery(); 324 324 … … 337 337 Q_OBJECT 338 338 public: 339 UnsignedIntQtQuery(Parameter<unsigned int> &, std::string _title,QBoxLayout *_parent,Dialog *_dialog);339 UnsignedIntQtQuery(Parameter<unsigned int> &, const std::string &_title, const std::string &description,QBoxLayout *_parent,Dialog *_dialog); 340 340 virtual ~UnsignedIntQtQuery(); 341 341 … … 354 354 Q_OBJECT 355 355 public: 356 UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);356 UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 357 357 virtual ~UnsignedIntsQtQuery(); 358 358 … … 371 371 Q_OBJECT 372 372 public: 373 VectorQtQuery(Parameter<Vector> &, std::string title,QBoxLayout *,Dialog *);373 VectorQtQuery(Parameter<Vector> &, const std::string &_title, const std::string &_description,QBoxLayout *,Dialog *); 374 374 virtual ~VectorQtQuery(); 375 375 … … 395 395 Q_OBJECT 396 396 public: 397 VectorsQtQuery(Parameter<std::vector<Vector> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);397 VectorsQtQuery(Parameter<std::vector<Vector> > &, const std::string &_title, const std::string &description, QBoxLayout *_parent,Dialog *_dialog); 398 398 virtual ~VectorsQtQuery(); 399 399 … … 412 412 Q_OBJECT 413 413 public: 414 RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &, std::string title,QBoxLayout *,Dialog *);414 RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &, const std::string &_title, const std::string &_description,QBoxLayout *,Dialog *); 415 415 virtual ~RandomNumberDistribution_ParametersQtQuery(); 416 416 -
src/UIElements/Qt4/Query/QtQueryList.hpp
r07414d7 rf130d4 117 117 void setSubQuery(Query *_sub){ sub = _sub; } 118 118 119 virtual void queryEmpty(const char*, std::string){}120 virtual void queryBoolean(Parameter<bool> &, const char *,std::string = ""){}121 virtual void queryInt(Parameter<int> &, const char *,std::string = ""){}122 virtual void queryInts(Parameter<std::vector<int> > &, const char *,std::string = ""){}123 virtual void queryUnsignedInt(Parameter<unsigned int> &, const char *,std::string = ""){}124 virtual void queryUnsignedInts(Parameter<std::vector<unsigned int> > &, const char *,std::string = ""){}125 virtual void queryDouble(Parameter<double> &, const char*,std::string = ""){}126 virtual void queryDoubles(Parameter<std::vector<double> > &, const char*,std::string = ""){}127 virtual void queryString(Parameter<std::string> &, const char*,std::string = ""){}128 virtual void queryStrings(Parameter<std::vector<std::string> > &, const char*,std::string = ""){}129 virtual void queryAtom(Parameter<const atom *> &, const char*,std::string = ""){}130 virtual void queryAtoms(Parameter<std::vector<const atom *> > &, const char*,std::string = ""){}131 virtual void queryMolecule(Parameter<const molecule *> &, const char*,std::string = ""){}132 virtual void queryMolecules(Parameter<std::vector<const molecule *> > &, const char*,std::string = ""){}133 virtual void queryVector(Parameter<Vector> &, const char*,std::string = ""){}134 virtual void queryVectors(Parameter<std::vector<Vector> > &, const char*,std::string = ""){}135 virtual void queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &, const char*,std::string = ""){}136 virtual void queryElement(Parameter<const element *> &, const char*,std::string = ""){}137 virtual void queryElements(Parameter<std::vector<const element *> > &, const char*,std::string = ""){}138 virtual void queryFile(Parameter<boost::filesystem::path> &, const char*,std::string = ""){}139 virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const char*,std::string = ""){}140 virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const char*,std::string = ""){}119 virtual void queryEmpty(const std::string = "", const std::string = ""){} 120 virtual void queryBoolean(Parameter<bool> &, const std::string = "", const std::string = ""){} 121 virtual void queryInt(Parameter<int> &, const std::string = "", const std::string = ""){} 122 virtual void queryInts(Parameter<std::vector<int> > &, const std::string = "", const std::string = ""){} 123 virtual void queryUnsignedInt(Parameter<unsigned int> &, const std::string = "", const std::string = ""){} 124 virtual void queryUnsignedInts(Parameter<std::vector<unsigned int> > &, const std::string = "", const std::string = ""){} 125 virtual void queryDouble(Parameter<double> &, const std::string = "", const std::string = ""){} 126 virtual void queryDoubles(Parameter<std::vector<double> > &, const std::string = "", const std::string = ""){} 127 virtual void queryString(Parameter<std::string> &, const std::string = "", const std::string = ""){} 128 virtual void queryStrings(Parameter<std::vector<std::string> > &, const std::string = "", const std::string = ""){} 129 virtual void queryAtom(Parameter<const atom *> &, const std::string = "", const std::string = ""){} 130 virtual void queryAtoms(Parameter<std::vector<const atom *> > &, const std::string = "", const std::string = ""){} 131 virtual void queryMolecule(Parameter<const molecule *> &, const std::string = "", const std::string = ""){} 132 virtual void queryMolecules(Parameter<std::vector<const molecule *> > &, const std::string = "", const std::string = ""){} 133 virtual void queryVector(Parameter<Vector> &, const std::string = "", const std::string = ""){} 134 virtual void queryVectors(Parameter<std::vector<Vector> > &, const std::string = "", const std::string = ""){} 135 virtual void queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &, const std::string = "", const std::string = ""){} 136 virtual void queryElement(Parameter<const element *> &, const std::string = "", const std::string = ""){} 137 virtual void queryElements(Parameter<std::vector<const element *> > &, const std::string = "", const std::string = ""){} 138 virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string = "", const std::string = ""){} 139 virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const std::string = "", const std::string = ""){} 140 virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const std::string = "", const std::string = ""){} 141 141 private: 142 142 QtQueryListUntyped *parent; -
src/UIElements/Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp
r07414d7 rf130d4 45 45 #include "World.hpp" 46 46 47 QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :48 QtQuery<RandomNumberDistribution_Parameters>(_param, _title ),47 QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 48 QtQuery<RandomNumberDistribution_Parameters>(_param, _title, _description), 49 49 parent(_parent), 50 50 dialog(_dialog) … … 52 52 thisLayout = new QHBoxLayout(); 53 53 titleLabel = new QLabel(QString(getTitle().c_str())); 54 titleLabel->setToolTip(QString(getDescription().c_str())); 54 55 55 56 // inputBox->insertItem(-1, QString("no distribution")); -
src/UIElements/Qt4/Query/RealSpaceMatrixQtQuery.cpp
r07414d7 rf130d4 44 44 #include "World.hpp" 45 45 46 QtDialog::RealSpaceMatrixQtQuery::RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :47 QtQuery<RealSpaceMatrix>(_param, _title ),46 QtDialog::RealSpaceMatrixQtQuery::RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 47 QtQuery<RealSpaceMatrix>(_param, _title, _description), 48 48 parent(_parent), 49 49 dialog(_dialog) … … 51 51 thisLayout = new QHBoxLayout(); 52 52 titleLabel = new QLabel(QString(getTitle().c_str())); 53 titleLabel->setToolTip(QString(getDescription().c_str())); 53 54 54 55 // init input table -
src/UIElements/Qt4/Query/StringQtQuery.cpp
r07414d7 rf130d4 43 43 44 44 45 QtDialog::StringQtQuery::StringQtQuery(Parameter<std::string> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :46 QtQuery<std::string>(_param, _title ),45 QtDialog::StringQtQuery::StringQtQuery(Parameter<std::string> &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 46 QtQuery<std::string>(_param, _title, _description), 47 47 parent(_parent), 48 48 dialog(_dialog) … … 53 53 thisLayout = new QHBoxLayout(); 54 54 titleLabel = new QLabel(QString(getTitle().c_str())); 55 titleLabel->setToolTip(QString(getDescription().c_str())); 55 56 parent->addLayout(thisLayout); 56 57 thisLayout->addWidget(titleLabel); 57 58 59 58 60 59 if (dynamic_cast<DiscreteValidator<std::string>*>(&_param.getValidator()) != NULL){ -
src/UIElements/Qt4/Query/StringsQtQuery.cpp
r07414d7 rf130d4 43 43 44 44 45 QtDialog::StringsQtQuery::StringsQtQuery(Parameter<std::vector<std::string> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :46 QtQuery<std::vector<std::string> >(_param, _title ),45 QtDialog::StringsQtQuery::StringsQtQuery(Parameter<std::vector<std::string> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 46 QtQuery<std::vector<std::string> >(_param, _title, _description), 47 47 QtQueryList<std::string>(_param, _parent, _dialog, temp) 48 48 { 49 49 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 50 subQuery = new StringQtQuery(*subParam, _title, thisVLayout, subDialog);50 subQuery = new StringQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 51 51 subDialog->setSubQuery(subQuery); 52 52 -
src/UIElements/Qt4/Query/UnsignedIntQtQuery.cpp
r07414d7 rf130d4 42 42 43 43 44 QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(Parameter<unsigned int> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :45 QtQuery<unsigned int>(_param, _title ),44 QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(Parameter<unsigned int> &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 45 QtQuery<unsigned int>(_param, _title, _description), 46 46 parent(_parent), 47 47 dialog(_dialog) … … 52 52 thisLayout = new QHBoxLayout(); 53 53 titleLabel = new QLabel(QString(getTitle().c_str())); 54 titleLabel->setToolTip(QString(getDescription().c_str())); 54 55 inputBox = new QSpinBox(); 55 56 inputBox->setValue(temp); -
src/UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp
r07414d7 rf130d4 43 43 44 44 45 QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :46 QtQuery<std::vector<unsigned int> >(_param, _title ),45 QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 46 QtQuery<std::vector<unsigned int> >(_param, _title, _description), 47 47 QtQueryList<unsigned int>(_param, _parent, _dialog, temp) 48 48 { 49 49 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 50 subQuery = new UnsignedIntQtQuery(*subParam, _title, thisVLayout, subDialog);50 subQuery = new UnsignedIntQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 51 51 subDialog->setSubQuery(subQuery); 52 52 -
src/UIElements/Qt4/Query/VectorQtQuery.cpp
r07414d7 rf130d4 43 43 44 44 45 QtDialog::VectorQtQuery::VectorQtQuery(Parameter<Vector> &_param, std::string title, QBoxLayout *_parent,Dialog *_dialog) :46 QtQuery<Vector>(_param, title),45 QtDialog::VectorQtQuery::VectorQtQuery(Parameter<Vector> &_param, const std::string &_title, const std::string &_description, QBoxLayout *_parent,Dialog *_dialog) : 46 QtQuery<Vector>(_param, _title, _description), 47 47 parent(_parent), 48 48 dialog(_dialog) … … 53 53 mainLayout= new QHBoxLayout(); 54 54 titleLabel = new QLabel(QString(getTitle().c_str())); 55 titleLabel->setToolTip(QString(getDescription().c_str())); 55 56 mainLayout->addWidget(titleLabel); 56 57 subLayout = new QVBoxLayout(); -
src/UIElements/Qt4/Query/VectorsQtQuery.cpp
r07414d7 rf130d4 44 44 45 45 46 QtDialog::VectorsQtQuery::VectorsQtQuery(Parameter<std::vector<Vector> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :47 QtQuery<std::vector<Vector> >(_param, _title ),46 QtDialog::VectorsQtQuery::VectorsQtQuery(Parameter<std::vector<Vector> > &_param, const std::string &_title, const std::string &_description,QBoxLayout *_parent,Dialog *_dialog) : 47 QtQuery<std::vector<Vector> >(_param, _title, _description), 48 48 QtQueryList<Vector>(_param, _parent, _dialog, temp) 49 49 { 50 50 ListQuerySubDialog *subDialog = new ListQuerySubDialog(this); 51 subQuery = new VectorQtQuery(*subParam, _title, thisVLayout, subDialog);51 subQuery = new VectorQtQuery(*subParam, _title, _description, thisVLayout, subDialog); 52 52 subDialog->setSubQuery(subQuery); 53 53
Note:
See TracChangeset
for help on using the changeset viewer.
