Changeset 1ae820 for src/UIElements/Qt4

Timestamp:

Jul 24, 2012, 3:21:17 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:

08e137

Parents:

2f4e81

git-author:

Michael Ankele <ankele@…> (07/24/12 14:50:05)

git-committer:

Michael Ankele <ankele@…> (07/24/12 15:21:17)

Message:

QtQueryList applied to MoleculesQtQuery

Location:

src/UIElements/Qt4/Query

Files:

• MoleculesQtQuery.cpp (modified) (2 diffs)
• QtQuery.hpp (modified) (2 diffs)

src/UIElements/Qt4/Query/MoleculesQtQuery.cpp

@@ -18 +18 @@
 #endif
 
+#include <Qt/qpushbutton.h>
 #include <Qt/qboxlayout.h>
-#include <Qt/qcombobox.h>
-#include <Qt/qlabel.h>
+#include <Qt/qlistwidget.h>
 
 #include "CodePatterns/MemDebug.hpp"
 
 #include "UIElements/Qt4/Query/QtQuery.hpp"
-#include "UIElements/Qt4/Pipe/MoleculesQtQueryPipe.hpp"
-
-#include "molecule.hpp"
-#include "World.hpp"
+#include "UIElements/Qt4/Query/QtQueryList.hpp"
+#include "UIElements/Qt4/Pipe/QtQueryListPipe.hpp"
 
 
-QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &_param, std::string _title, QBoxLayout *_parent,Dialog *_dialog) :
+QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     Dialog::MoleculesQuery(_param, _title),
-    parent(_parent),
-    dialog(_dialog)
+    QtQueryList<const molecule *>(_parent, _dialog, temp)
 {
-  thisLayout = new QHBoxLayout();
-  titleLabel = new QLabel(QString(getTitle().c_str()));
-  inputBox = new QComboBox();
-  // add all molecules to the combo box
-  vector<molecule*> molecules = World::getInstance().getAllMolecules();
-  for(vector<molecule*>::iterator iter  = molecules.begin();
-      iter != molecules.end();
-      ++iter) {
-    std::stringstream sstr;
-    sstr << (*iter)->IndexNr << "\t" << (*iter)->getName();
-    inputBox->addItem(QString(sstr.str().c_str()),QVariant((*iter)->IndexNr));
-  }
-  parent->addLayout(thisLayout);
-  thisLayout->addWidget(titleLabel);
-  thisLayout->addWidget(inputBox);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  subQuery = new MoleculeQtQuery(*subParam, _title, thisVLayout, subDialog);
+  subDialog->setSubQuery(subQuery);
 
-  /*pipe = new MoleculesQtQueryPipe(temp,_dialog,inputBox);
-  pipe->update(inputBox->currentIndex());
-  connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));*/
+  connect(inputList,SIGNAL(itemSelectionChanged()),this,SLOT(onElementSelected()));
+  connect(addButton,SIGNAL(clicked()),this,SLOT(onAddElement()));
+  connect(removeButton,SIGNAL(clicked()),this,SLOT(onRemoveElement()));
 }
 
 QtDialog::MoleculesQtQuery::~MoleculesQtQuery()
 {
+  delete(subQuery);
 }
 
-void QtDialog::MoleculesQtQuery::onUpdate() {
-  dialog->update();
+void QtDialog::MoleculesQtQuery::onSubUpdate()
+{
+  addButton->setEnabled(subParam->isSet());
 }
 
-// Handling is easy, since the GUI makes it impossible to select invalid values
+void QtDialog::MoleculesQtQuery::onElementSelected() {
+  elementSelected();
+}
+
+void QtDialog::MoleculesQtQuery::onAddElement() {
+  addElement();
+}
+
+void QtDialog::MoleculesQtQuery::onRemoveElement() {
+  removeElements();
+}
+
 bool QtDialog::MoleculesQtQuery::handle()
 {
@@ -75 +73 @@
 }
 
+
+

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -284 +284 @@
 };
 
-class QtDialog::MoleculesQtQuery : public QWidget, public Dialog::MoleculesQuery {
+class QtDialog::MoleculesQtQuery : public QWidget, public Dialog::MoleculesQuery, public QtQueryList<const molecule *> {
   Q_OBJECT
 public:
@@ -291 +291 @@
   virtual bool handle();
 
-public slots:
-  void onUpdate();
-
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
-  QComboBox *inputBox;
-  Dialog *dialog;
+  virtual void onSubUpdate();
+
+public slots:
+  void onAddElement();
+  void onRemoveElement();
+  void onElementSelected();
+
+private:
+  MoleculeQtQuery *subQuery;
 };