Changeset 852ea3 for src/UIElements/Qt4/Query/QtQuery.hpp

Timestamp:

Aug 27, 2012, 11:36:59 AM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

7e6a1b

Parents:

1c55b8

git-author:

Michael Ankele <ankele@…> (08/16/12 15:38:10)

git-committer:

Michael Ankele <ankele@…> (08/27/12 11:36:59)

Message:

further query merging (QtQuery added, handle() won't use param.set())

File:

• src/UIElements/Qt4/Query/QtQuery.hpp (modified) (21 diffs)

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -35 +35 @@
 class QFileDialog;
 
-class QtDialog::AtomQtQuery : public QWidget, public Dialog::TQuery<const atom *> {
+template<class T>
+class QtQuery : public Dialog::TQuery<T>
+{
+public:
+  QtQuery(Parameter<T> &_param, std::string title, std::string _description = "") :
+    Dialog::TQuery<T>(_param, title, _description) {}
+  // QtQueries are interactive - no need for handle().
+  virtual bool handle(){  return true;  }
+};
+
+class QtDialog::AtomQtQuery : public QWidget, public QtQuery<const atom *> {
   Q_OBJECT
 public:
   AtomQtQuery(Parameter<const atom *> &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~AtomQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -53 +62 @@
 };
 
-class QtDialog::AtomsQtQuery : public QWidget, public Dialog::TQuery<std::vector<const atom *> >, public QtQueryList<const atom *> {
+class QtDialog::AtomsQtQuery : public QWidget, public QtQuery<std::vector<const atom *> >, public QtQueryList<const atom *> {
   Q_OBJECT
 public:
   AtomsQtQuery(Parameter<std::vector<const atom *> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~AtomsQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -71 +79 @@
 };
 
-class QtDialog::BooleanQtQuery : public QWidget, public Dialog::TQuery<bool> {
+class QtDialog::BooleanQtQuery : public QWidget, public QtQuery<bool> {
   Q_OBJECT
 public:
   BooleanQtQuery(Parameter<bool> &, std::string _title, QBoxLayout *_parent, Dialog *_dialog);
   virtual ~BooleanQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -89 +96 @@
 };
 
-class QtDialog::RealSpaceMatrixQtQuery : public QWidget, public Dialog::TQuery<RealSpaceMatrix> {
+class QtDialog::RealSpaceMatrixQtQuery : public QWidget, public QtQuery<RealSpaceMatrix> {
   Q_OBJECT
 public:
   RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~RealSpaceMatrixQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -107 +113 @@
 };
 
-class QtDialog::DoubleQtQuery : public QWidget, public Dialog::TQuery<double> {
+class QtDialog::DoubleQtQuery : public QWidget, public QtQuery<double> {
   Q_OBJECT
 public:
   DoubleQtQuery(Parameter<double> &, std::string title,QBoxLayout *_parent,Dialog *_dialog);
   virtual ~DoubleQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -125 +130 @@
 };
 
-class QtDialog::DoublesQtQuery : public QWidget, public Dialog::TQuery<std::vector<double> >, public QtQueryList<double> {
+class QtDialog::DoublesQtQuery : public QWidget, public QtQuery<std::vector<double> >, public QtQueryList<double> {
   Q_OBJECT
 public:
   DoublesQtQuery(Parameter<std::vector<double> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~DoublesQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -143 +147 @@
 };
 
-class QtDialog::ElementQtQuery : public QWidget, public Dialog::TQuery<const element *> {
+class QtDialog::ElementQtQuery : public QWidget, public QtQuery<const element *> {
   Q_OBJECT
 public:
   ElementQtQuery(Parameter<const element *> &, std::string _title, QBoxLayout *_parent, Dialog *_dialog);
   virtual ~ElementQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -161 +164 @@
 };
 
-class QtDialog::ElementsQtQuery : public QWidget, public Dialog::TQuery<std::vector<const element *> >, public QtQueryList<const element *> {
+class QtDialog::ElementsQtQuery : public QWidget, public QtQuery<std::vector<const element *> >, public QtQueryList<const element *> {
   Q_OBJECT
 public:
   ElementsQtQuery(Parameter<std::vector<const element *> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~ElementsQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -191 +193 @@
 };
 
-class QtDialog::FileQtQuery : public QWidget, public Dialog::TQuery<boost::filesystem::path> {
+class QtDialog::FileQtQuery : public QWidget, public QtQuery<boost::filesystem::path> {
   Q_OBJECT
 public:
   FileQtQuery(Parameter<boost::filesystem::path> &, std::string _title, QBoxLayout *_parent, Dialog *_dialog);
   virtual ~FileQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -212 +213 @@
 };
 
-class QtDialog::FilesQtQuery : public QWidget, public Dialog::TQuery<std::vector<boost::filesystem::path> >, public QtQueryList<boost::filesystem::path> {
+class QtDialog::FilesQtQuery : public QWidget, public QtQuery<std::vector<boost::filesystem::path> >, public QtQueryList<boost::filesystem::path> {
   Q_OBJECT
 public:
   FilesQtQuery(Parameter<std::vector<boost::filesystem::path> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~FilesQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -230 +230 @@
 };
 
-class QtDialog::IntQtQuery : public QWidget, public Dialog::TQuery<int> {
+class QtDialog::IntQtQuery : public QWidget, public QtQuery<int> {
   Q_OBJECT
 public:
   IntQtQuery(Parameter<int> &, std::string _title,QBoxLayout *_parent,Dialog *_dialog);
   virtual ~IntQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -248 +247 @@
 };
 
-class QtDialog::IntsQtQuery : public QWidget, public Dialog::TQuery<std::vector<int> >, public QtQueryList<int> {
+class QtDialog::IntsQtQuery : public QWidget, public QtQuery<std::vector<int> >, public QtQueryList<int> {
   Q_OBJECT
 public:
   IntsQtQuery(Parameter<std::vector<int> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~IntsQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -266 +264 @@
 };
 
-class QtDialog::MoleculeQtQuery : public QWidget, public Dialog::TQuery<const molecule *> {
+class QtDialog::MoleculeQtQuery : public QWidget, public QtQuery<const molecule *> {
   Q_OBJECT
 public:
   MoleculeQtQuery(Parameter<const molecule *> &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~MoleculeQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -284 +281 @@
 };
 
-class QtDialog::MoleculesQtQuery : public QWidget, public Dialog::TQuery<std::vector<const molecule *> >, public QtQueryList<const molecule *> {
+class QtDialog::MoleculesQtQuery : public QWidget, public QtQuery<std::vector<const molecule *> >, public QtQueryList<const molecule *> {
   Q_OBJECT
 public:
   MoleculesQtQuery(Parameter<std::vector<const molecule *> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~MoleculesQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -302 +298 @@
 };
 
-class QtDialog::StringQtQuery : public QWidget, public Dialog::TQuery<std::string> {
+class QtDialog::StringQtQuery : public QWidget, public QtQuery<std::string> {
   Q_OBJECT
 public:
   StringQtQuery(Parameter<std::string> &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~StringQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -320 +315 @@
 };
 
-class QtDialog::StringsQtQuery : public QWidget, public Dialog::TQuery<std::vector<std::string> >, public QtQueryList<std::string> {
+class QtDialog::StringsQtQuery : public QWidget, public QtQuery<std::vector<std::string> >, public QtQueryList<std::string> {
   Q_OBJECT
 public:
   StringsQtQuery(Parameter<std::vector<std::string> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~StringsQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -338 +332 @@
 };
 
-class QtDialog::UnsignedIntQtQuery : public QWidget, public Dialog::TQuery<unsigned int> {
+class QtDialog::UnsignedIntQtQuery : public QWidget, public QtQuery<unsigned int> {
   Q_OBJECT
 public:
   UnsignedIntQtQuery(Parameter<unsigned int> &, std::string _title,QBoxLayout *_parent,Dialog *_dialog);
   virtual ~UnsignedIntQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -356 +349 @@
 };
 
-class QtDialog::UnsignedIntsQtQuery : public QWidget, public Dialog::TQuery<std::vector<unsigned int> >, public QtQueryList<unsigned int> {
+class QtDialog::UnsignedIntsQtQuery : public QWidget, public QtQuery<std::vector<unsigned int> >, public QtQueryList<unsigned int> {
   Q_OBJECT
 public:
   UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~UnsignedIntsQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -374 +366 @@
 };
 
-class QtDialog::VectorQtQuery : public QWidget, public Dialog::TQuery<Vector> {
+class QtDialog::VectorQtQuery : public QWidget, public QtQuery<Vector> {
   Q_OBJECT
 public:
   VectorQtQuery(Parameter<Vector> &, std::string title,QBoxLayout *,Dialog *);
   virtual ~VectorQtQuery();
-  virtual bool handle();
 
 public slots:
@@ -399 +390 @@
 };
 
-class QtDialog::VectorsQtQuery : public QWidget, public Dialog::TQuery<std::vector<Vector> >, public QtQueryList<Vector> {
+class QtDialog::VectorsQtQuery : public QWidget, public QtQuery<std::vector<Vector> >, public QtQueryList<Vector> {
   Q_OBJECT
 public:
   VectorsQtQuery(Parameter<std::vector<Vector> > &, std::string _title, QBoxLayout *_parent,Dialog *_dialog);
   virtual ~VectorsQtQuery();
-  virtual bool handle();
 
   virtual void onSubUpdate();
@@ -417 +407 @@
 };
 
-class QtDialog::RandomNumberDistribution_ParametersQtQuery : public QWidget, public Dialog::TQuery<RandomNumberDistribution_Parameters> {
+class QtDialog::RandomNumberDistribution_ParametersQtQuery : public QWidget, public QtQuery<RandomNumberDistribution_Parameters> {
   Q_OBJECT
 public:
   RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &, std::string title,QBoxLayout *,Dialog *);
   virtual ~RandomNumberDistribution_ParametersQtQuery();
-  virtual bool handle();
 
 public slots: