Changeset 7c9921 for src/UIElements/Qt4/Query/QtQuery.hpp

Timestamp:

Jul 19, 2012, 3:28:07 PM (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:

7dfd07

Parents:

3c53fa

git-author:

Michael Ankele <ankele@…> (07/19/12 15:14:14)

git-committer:

Michael Ankele <ankele@…> (07/19/12 15:28:07)

Message:

Refactoring: smarter QtQueries won't need pipes

• derived all xxxQtQuery classes from QWidget (multiple inheritance officially allowed in this particular case)
• xxxQtQuery uses its own slots

TODO: ListQueries not rewritten yet!

File:

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

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -15 +15 @@
 
 
+#include <Qt/qwidget.h>
 #include "Qt4/QtDialog.hpp"
 #include "Parameters/Parameter.hpp"
@@ -31 +32 @@
 class QComboBox;
 class QCheckBox;
+class QFileDialog;
 
 // Forward declarations for plumbing
@@ -56 +58 @@
 class RandomNumberDistribution_ParametersQtQueryPipe;
 
-class QtDialog::AtomQtQuery : public Dialog::AtomQuery {
+class QtDialog::AtomQtQuery : public QWidget, public Dialog::AtomQuery {
+  Q_OBJECT
 public:
   AtomQtQuery(Parameter<const atom *> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~AtomQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(int);
+
 private:
   QBoxLayout *parent;
@@ -66 +73 @@
   QLabel *titleLabel;
   QComboBox *inputBox;
+  QtDialog *dialog;
 
   AtomQtQueryPipe *pipe;
 };
 
-class QtDialog::AtomsQtQuery : public Dialog::AtomsQuery {
+class QtDialog::AtomsQtQuery : public QWidget, public Dialog::AtomsQuery {
+  Q_OBJECT
 public:
   AtomsQtQuery(Parameter<std::vector<const atom *> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~AtomsQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate();
+
 private:
   QBoxLayout *parent;
@@ -81 +94 @@
   QLabel *inputLabel;
   QListWidget *inputList;
+  QtDialog *dialog;
 
   AtomsQtQueryPipe *pipe;
 };
 
-class QtDialog::BooleanQtQuery : public Dialog::BooleanQuery {
+class QtDialog::BooleanQtQuery : public QWidget, public Dialog::BooleanQuery {
+  Q_OBJECT
 public:
   BooleanQtQuery(Parameter<bool> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
   virtual ~BooleanQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(int);
+
 private:
   QBoxLayout *parent;
@@ -95 +114 @@
   QLabel *titleLabel;
   QCheckBox *booleanCheckBox;
+  QtDialog *dialog;
 
   BooleanQtQueryPipe *pipe;
 };
 
-class QtDialog::RealSpaceMatrixQtQuery : public Dialog::RealSpaceMatrixQuery {
+class QtDialog::RealSpaceMatrixQtQuery : public QWidget, public Dialog::RealSpaceMatrixQuery {
+  Q_OBJECT
 public:
   RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~RealSpaceMatrixQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(int, int);
+
 private:
   QBoxLayout *parent;
@@ -109 +134 @@
   QLabel *titleLabel;
   QTableWidget *inputTable;
+  QtDialog *dialog;
 
   RealSpaceMatrixQtQueryPipe *pipe;
 };
 
-class QtDialog::DoubleQtQuery : public Dialog::DoubleQuery {
+class QtDialog::DoubleQtQuery : public QWidget, public Dialog::DoubleQuery {
+  Q_OBJECT
 public:
   DoubleQtQuery(Parameter<double> &, std::string title,QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~DoubleQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(double);
+
 private:
   QBoxLayout *parent;
@@ -123 +154 @@
   QLabel *titleLabel;
   QDoubleSpinBox *inputBox;
+  QtDialog *dialog;
 
   DoubleQtQueryPipe *pipe;
 };
 
-class QtDialog::DoublesQtQuery : public Dialog::DoublesQuery {
+class QtDialog::DoublesQtQuery : public QWidget, public Dialog::DoublesQuery {
+  Q_OBJECT
 public:
   DoublesQtQuery(Parameter<std::vector<double> > &, std::string title,QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~DoublesQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate();
+
 private:
   QBoxLayout *parent;
@@ -137 +174 @@
   QLabel *titleLabel;
   QDoubleSpinBox *inputBox;
+  QtDialog *dialog;
 
   QtQueryListPipe<double> *pipe;
 };
 
-class QtDialog::ElementQtQuery : public Dialog::ElementQuery {
+class QtDialog::ElementQtQuery : public QWidget, public Dialog::ElementQuery {
+  Q_OBJECT
 public:
   ElementQtQuery(Parameter<const element *> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
   virtual ~ElementQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(int);
+
 private:
   QBoxLayout *parent;
@@ -151 +194 @@
   QLabel *titleLabel;
   QComboBox *inputBox;
+  QtDialog *dialog;
 
   ElementQtQueryPipe *pipe;
 };
 
-class QtDialog::ElementsQtQuery : public Dialog::ElementsQuery {
+class QtDialog::ElementsQtQuery : public QWidget, public Dialog::ElementsQuery {
+  Q_OBJECT
 public:
   ElementsQtQuery(Parameter<std::vector<const element *> > &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
   virtual ~ElementsQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate();
+
 private:
   QBoxLayout *parent;
@@ -165 +214 @@
   QLabel *titleLabel;
   QComboBox *inputBox;
+  QtDialog *dialog;
 
   ElementsQtQueryPipe *pipe;
@@ -178 +228 @@
   QBoxLayout *thisLayout;
   QLabel *titleLabel;
+  QtDialog *dialog;
 
   EmptyQtQueryPipe *pipe;
 };
 
-class QtDialog::FileQtQuery : public Dialog::FileQuery {
+class QtDialog::FileQtQuery : public QWidget, public Dialog::FileQuery {
+  Q_OBJECT
 public:
   FileQtQuery(Parameter<boost::filesystem::path> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
   virtual ~FileQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate();
+  void showFileDialog();
+
 private:
   QBoxLayout *parent;
@@ -193 +250 @@
   QLineEdit *filenameLineEdit;
   QPushButton *filedialogButton;
+  QFileDialog *theFileDialog;
+  QtDialog *dialog;
 
   FileQtQueryPipe *pipe;
 };
 
-class QtDialog::FilesQtQuery : public Dialog::FilesQuery {
+class QtDialog::FilesQtQuery : public QWidget, public Dialog::FilesQuery {
+  Q_OBJECT
 public:
   FilesQtQuery(Parameter<std::vector< boost::filesystem::path> > &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
@@ -206 +266 @@
   void AddInteger();
   void RemoveInteger();
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
+
+public slots:
+  void onUpdate();
+
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QtDialog *dialog;
 
   QtQueryListPipe<boost::filesystem::path> *pipe;
 };
 
-class QtDialog::IntQtQuery : public Dialog::IntQuery {
+class QtDialog::IntQtQuery : public QWidget, public Dialog::IntQuery {
+  Q_OBJECT
 public:
   IntQtQuery(Parameter<int> &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~IntQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(int);
+
 private:
   QBoxLayout *parent;
@@ -224 +294 @@
   QLabel *titleLabel;
   QSpinBox *inputBox;
+  QtDialog *dialog;
 
   IntQtQueryPipe *pipe;
 };
 
-class QtDialog::IntsQtQuery : public Dialog::IntsQuery {
+class QtDialog::IntsQtQuery : public QWidget, public Dialog::IntsQuery {
+  Q_OBJECT
 public:
   IntsQtQuery(Parameter<std::vector<int> > &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
@@ -237 +309 @@
   void AddInteger();
   void RemoveInteger();
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
+
+public slots:
+  void onUpdate();
+
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QtDialog *dialog;
 
   QtQueryListPipe<int> *pipe;
 };
 
-class QtDialog::MoleculeQtQuery : public Dialog::MoleculeQuery {
+class QtDialog::MoleculeQtQuery : public QWidget, public Dialog::MoleculeQuery {
+  Q_OBJECT
 public:
   MoleculeQtQuery(Parameter<const molecule *> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~MoleculeQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(int);
+
 private:
   QBoxLayout *parent;
@@ -255 +337 @@
   QLabel *titleLabel;
   QComboBox *inputBox;
+  QtDialog *dialog;
 
   MoleculeQtQueryPipe *pipe;
 };
 
-class QtDialog::MoleculesQtQuery : public Dialog::MoleculesQuery {
+class QtDialog::MoleculesQtQuery : public QWidget, public Dialog::MoleculesQuery {
+  Q_OBJECT
 public:
   MoleculesQtQuery(Parameter<std::vector<const molecule *> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~MoleculesQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate();
+
 private:
   QBoxLayout *parent;
@@ -269 +357 @@
   QLabel *titleLabel;
   QComboBox *inputBox;
+  QtDialog *dialog;
 
   MoleculesQtQueryPipe *pipe;
 };
 
-class QtDialog::StringQtQuery : public Dialog::StringQuery {
+class QtDialog::StringQtQuery : public QWidget, public Dialog::StringQuery {
+  Q_OBJECT
 public:
   StringQtQuery(Parameter<std::string> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~StringQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(const QString&);
+
 private:
   QBoxLayout *parent;
@@ -283 +377 @@
   QLabel *titleLabel;
   QLineEdit *inputBox;
+  QtDialog *dialog;
 
   StringQtQueryPipe *pipe;
 };
 
-class QtDialog::StringsQtQuery : public Dialog::StringsQuery {
+class QtDialog::StringsQtQuery : public QWidget, public Dialog::StringsQuery {
+  Q_OBJECT
 public:
   StringsQtQuery(Parameter<std::vector<std::string> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~StringsQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate();
+
 private:
   QBoxLayout *parent;
@@ -297 +397 @@
   QLabel *titleLabel;
   QLineEdit *inputBox;
+  QtDialog *dialog;
 
   StringsQtQueryPipe *pipe;
 };
 
-class QtDialog::UnsignedIntQtQuery : public Dialog::UnsignedIntQuery {
+class QtDialog::UnsignedIntQtQuery : public QWidget, public Dialog::UnsignedIntQuery {
+  Q_OBJECT
 public:
   UnsignedIntQtQuery(Parameter<unsigned int> &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~UnsignedIntQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate(unsigned int);
+
 private:
   QBoxLayout *parent;
@@ -311 +417 @@
   QLabel *titleLabel;
   QSpinBox *inputBox;
+  QtDialog *dialog;
 
   UnsignedIntQtQueryPipe *pipe;
 };
 
-class QtDialog::UnsignedIntsQtQuery : public Dialog::UnsignedIntsQuery {
+class QtDialog::UnsignedIntsQtQuery : public QWidget, public Dialog::UnsignedIntsQuery {
+  Q_OBJECT
 public:
   UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
@@ -324 +432 @@
   void AddInteger();
   void RemoveInteger();
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
+
+public slots:
+  void onUpdate();
+
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QtDialog *dialog;
 
   QtQueryListPipe<unsigned int> *pipe;
@@ -333 +446 @@
 
 
-class QtDialog::VectorQtQuery : public Dialog::VectorQuery {
+class QtDialog::VectorQtQuery : public QWidget, public Dialog::VectorQuery {
+  Q_OBJECT
 public:
   VectorQtQuery(Parameter<Vector> &, std::string title,QBoxLayout *,QtDialog *);
   virtual ~VectorQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdateX(double);
+  void onUpdateY(double);
+  void onUpdateZ(double);
+
 private:
   QBoxLayout *parent;
@@ -348 +468 @@
   QDoubleSpinBox *coordInputY;
   QDoubleSpinBox *coordInputZ;
+  QtDialog *dialog;
 
   VectorQtQueryPipe *pipe;
 };
 
-class QtDialog::VectorsQtQuery : public Dialog::VectorsQuery {
+class QtDialog::VectorsQtQuery : public QWidget, public Dialog::VectorsQuery {
+  Q_OBJECT
 public:
   VectorsQtQuery(Parameter<std::vector<Vector> > &, std::string title,QBoxLayout *,QtDialog *);
   virtual ~VectorsQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate();
+
 private:
   QBoxLayout *parent;
@@ -365 +491 @@
   QLabel *coordLabel;
   QDoubleSpinBox *coordInput;
+  QtDialog *dialog;
 
   VectorsQtQueryPipe *pipe;
 };
 
-class QtDialog::RandomNumberDistribution_ParametersQtQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
+class QtDialog::RandomNumberDistribution_ParametersQtQuery : public QWidget, public Dialog::RandomNumberDistribution_ParametersQuery {
+  Q_OBJECT
 public:
   RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &, std::string title,QBoxLayout *,QtDialog *);
   virtual ~RandomNumberDistribution_ParametersQtQuery();
   virtual bool handle();
+
+public slots:
+  void onUpdate();
+
 private:
   QBoxLayout *parent;
@@ -380 +512 @@
   QTextEdit *inputBox;
   QPushButton *okButton;
+  QtDialog *dialog;
 
   RandomNumberDistribution_ParametersQtQueryPipe *pipe;