Changeset 7b8a8e for src/UIElements/Qt4/Query

Timestamp:

Jul 24, 2012, 3:19:01 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:

a2aa2f

Parents:

7dfd07

git-author:

Michael Ankele <ankele@…> (07/24/12 13:28:39)

git-committer:

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

Message:

QtQueryList added (only used in StringsQtQuery yet)

Location:

src/UIElements/Qt4/Query

Files:

• QtQuery.hpp (modified) (3 diffs)
• QtQueryList.cpp (added)
• QtQueryList.hpp (added)
• StringsQtQuery.cpp (modified) (3 diffs)

src/UIElements/Qt4/Query/QtQuery.hpp ¶

@@ -18 +18 @@
 #include "Qt4/QtDialog.hpp"
 #include "Parameters/Parameter.hpp"
+#include "QtQueryList.hpp"
 
 class QHBoxLayout;
@@ -326 +327 @@
 };
 
-class QtDialog::StringsQtQuery : public QWidget, public Dialog::StringsQuery {
+class QtDialog::StringsQtQuery : public QWidget, public Dialog::StringsQuery, public QtQueryList<std::string> {
   Q_OBJECT
 public:
@@ -333 +334 @@
   virtual bool handle();
 
-public slots:
-  void onUpdate();
-
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
-  QLineEdit *inputBox;
-  Dialog *dialog;
+  virtual void onSubUpdate();
+
+public slots:
+  void onAddElement();
+  void onRemoveElement();
+  void onElementSelected();
+
+private:
+  StringQtQuery *subQuery;
 };
 

src/UIElements/Qt4/Query/StringsQtQuery.cpp ¶

@@ -18 +18 @@
 #endif
 
+#include <Qt/qpushbutton.h>
 #include <Qt/qboxlayout.h>
-#include <Qt/qlabel.h>
-#include <Qt/qlineedit.h>
 #include <Qt/qlistwidget.h>
-#include <Qt/qpushbutton.h>
 
 #include "CodePatterns/MemDebug.hpp"
 
 #include "UIElements/Qt4/Query/QtQuery.hpp"
+#include "UIElements/Qt4/Query/QtQueryList.hpp"
 #include "UIElements/Qt4/Pipe/QtQueryListPipe.hpp"
 
@@ -32 +31 @@
 QtDialog::StringsQtQuery::StringsQtQuery(Parameter<std::vector<std::string> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     Dialog::StringsQuery(_param, _title),
-    parent(_parent),
-    dialog(_dialog)
+    QtQueryList<std::string>(_parent, _dialog, temp)
 {
-  QHBoxLayout * thisHLayout = new QHBoxLayout();
-  QVBoxLayout * thisV1Layout = new QVBoxLayout();
-  QVBoxLayout * thisV2Layout = new QVBoxLayout();
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  subQuery = new StringQtQuery(*subParam, _title, thisVLayout, subDialog);
+  subDialog->setSubQuery(subQuery);
 
-  QLabel *titleLabel = new QLabel(QString(getTitle().c_str()));
-  QLabel *inputLabel = new QLabel("Enter to add");
-  QListWidget* inputList = new QListWidget();
-  inputList->setSelectionMode(QAbstractItemView::ExtendedSelection);
-  QLineEdit* inputBox = new QLineEdit();
-  inputLabel->setBuddy(inputBox);
-  titleLabel->setBuddy(inputList);
-  QPushButton* AddButton = new QPushButton("Add");
-  AddButton->setEnabled(false);
-  QPushButton* RemoveButton = new QPushButton("Remove");
-  RemoveButton->setEnabled(false);
-
-  thisV1Layout->addWidget(titleLabel);
-  thisV1Layout->addWidget(inputList);
-  thisV2Layout->addWidget(inputLabel);
-  thisV2Layout->addWidget(inputBox);
-  thisV2Layout->addWidget(AddButton);
-  thisV2Layout->addWidget(RemoveButton);
-  parent->addLayout(thisHLayout);
-  thisHLayout->addLayout(thisV1Layout);
-  thisHLayout->addLayout(thisV2Layout);
-
- /* pipe = new StringsQtQueryPipe(temp,_dialog,inputBox,inputList,AddButton,RemoveButton);
-  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(elementEntered(const QString&)));
-  connect(inputList,SIGNAL(itemSelectionChanged()),pipe,SLOT(elementSelected()));
-  connect(AddButton,SIGNAL(clicked()),pipe,SLOT(addElement()));
-  connect(RemoveButton,SIGNAL(clicked()),pipe,SLOT(removeElement()));*/
+  connect(inputList,SIGNAL(itemSelectionChanged()),this,SLOT(onElementSelected()));
+  connect(addButton,SIGNAL(clicked()),this,SLOT(onAddElement()));
+  connect(removeButton,SIGNAL(clicked()),this,SLOT(onRemoveElement()));
 }
 
 QtDialog::StringsQtQuery::~StringsQtQuery()
 {
+  delete(subQuery);
 }
 
-void QtDialog::StringsQtQuery::onUpdate() {
-  dialog->update();
+void QtDialog::StringsQtQuery::onSubUpdate()
+{
+  addButton->setEnabled(subParam->isSet());
+}
+
+void QtDialog::StringsQtQuery::onElementSelected() {
+  elementSelected();
+}
+
+void QtDialog::StringsQtQuery::onAddElement() {
+  addElement();
+}
+
+void QtDialog::StringsQtQuery::onRemoveElement() {
+  removeElements();
 }
 
@@ -79 +67 @@
 bool QtDialog::StringsQtQuery::handle()
 {
-/*  // dissect by ","
-  std::string::iterator olditer = temp.begin();
-  std::vector<std::string> temp_strings;
-  for(std::string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
-    if (*iter == ' ') {
-      temp_strings.push_back(std::string(iter, olditer));
-      olditer = iter;
-    }
-  }
-  if (olditer != temp.begin())  // insert last part also
-    temp_strings.push_back(std::string(olditer, temp.end()));
-  tmp.set(temp_strings);
-
-  return temp!="";*/
   if (param.isValid(temp)){
     param.set(temp);