Changeset 2aafe8 for src

Timestamp:

Jul 17, 2012, 12:17:26 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:

99e8ea

Parents:

c7e000

git-author:

Michael Ankele <ankele@…> (06/05/12 12:38:27)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:26)

Message:

Fix: StringsQtQuery works

• created StringsQtQueryPipe as its own class so moc can operate without template'ized classes

Location:

src/UIElements

Files:

• Makefile.am (modified) (1 diff)
• Qt4/Pipe/QtQueryListPipe.hpp (modified) (4 diffs)
• Qt4/Pipe/QtQueryPipe.hpp (modified) (2 diffs)
• Qt4/Query/QtQuery.hpp (modified) (1 diff)
• Qt4/Query/StringsQtQuery.cpp (modified) (3 diffs)

src/UIElements/Makefile.am

@@ -228 +228 @@
   UIElements/Qt4/Pipe/MoleculeQtQueryPipe.hpp \
   UIElements/Qt4/Pipe/MoleculesQtQueryPipe.hpp \
+  UIElements/Qt4/Pipe/QtQueryListPipe.hpp \
   UIElements/Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.hpp \
   UIElements/Qt4/Pipe/RealSpaceMatrixQtQueryPipe.hpp \

src/UIElements/Qt4/Pipe/QtQueryListPipe.hpp

@@ -18 +18 @@
 #include "QtQueryPipe.hpp"
 
+// Qt moc needs these because it generates its own .cpp file from QtQueryListPipe.hpp.
+#include <Qt/qboxlayout.h>
+#include <Qt/qlabel.h>
+#include <Qt/qlineedit.h>
+#include <Qt/qlistwidget.h>
+#include <Qt/qpushbutton.h>
+
 #include <boost/lexical_cast.hpp>
 
@@ -36 +43 @@
 {}
 
-template<typename T> void QtQueryListPipe<T>::IntegerEntered(const QString&)
+template<typename T> void QtQueryListPipe<T>::elementEntered(const QString& t)
 {
-  AddButton->setEnabled(true);
+  AddButton->setEnabled(t.length() > 0);
 }
 
-template<typename T> void QtQueryListPipe<T>::IntegerSelected()
+template<typename T> void QtQueryListPipe<T>::elementSelected()
 {
   if (inputList->selectedItems().empty())
@@ -49 +56 @@
 }
 
-template<typename T> void QtQueryListPipe<T>::AddInteger() {
+template<typename T> void QtQueryListPipe<T>::addElement() {
   // type-check
   std::string text = inputBox->text().toStdString();
-  int number = 0;
+  T value;
   try {
-    number = boost::lexical_cast<int>(text);
+    value = boost::lexical_cast<T>(text);
   } catch (boost::bad_lexical_cast&) {
     return;
   };
   // add item to both
-  inputList->addItem(QString(number));
-  AddValue(number);
+  inputList->addItem(QString(toString(value).c_str()));
+  addValue(value);
 }
 
-template<typename T> void QtQueryListPipe<T>::AddValue(T item) {
-  content->push_back(item);
+template<typename T> void QtQueryListPipe<T>::addValue(T item) {
+  std::vector<T> temp = content.get();
+  temp.push_back(item);
+  content.set(temp);
 
   dialog->update();
 }
 
-template<typename T> void QtQueryListPipe<T>::RemoveInteger() {
+template<typename T> void QtQueryListPipe<T>::removeElement() {
   QList<QListWidgetItem *> items = inputList->selectedItems();
   for (QList<QListWidgetItem *>::iterator iter = items.begin(); !items.empty(); iter = items.begin()) {
@@ -75 +84 @@
     inputList->setCurrentItem(*iter);
     // remove
-    QtQueryListPipe<T>::RemoteRow(inputList->currentRow()); // template parameters needs to be known, such that compiler knows which to call
-    inputList->removeItemWidget(*iter);
+    QtQueryListPipe<T>::removeRow(inputList->currentRow()); // template parameters needs to be known, such that compiler knows which to call
+    inputList->takeItem(inputList->currentRow());
+    items.erase(iter);
   }
 }
 
-template<typename T> void QtQueryListPipe<T>::RemoveRow(int row) {
+template<typename T> void QtQueryListPipe<T>::removeRow(int row) {
   int counter = 0;
-  typename std::vector<T>::iterator iter = content->begin();
-  for (; iter != content->end(); ++iter)
+  std::vector<T> temp = content.get();
+  typename std::vector<T>::iterator iter = temp.begin();
+  for (; iter != temp.end(); ++iter)
     if (counter++ == row)
       break;
-  if (iter != content->end())
-      content->erase(iter);
+  if (iter != temp.end())
+    temp.erase(iter);
+  content.set(temp);
 }
+
+class StringsQtQueryPipe : public QtQueryListPipe<std::string>
+{
+  Q_OBJECT
+public:
+  StringsQtQueryPipe(Parameter<std::vector<std::string> > &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton) :
+    QtQueryListPipe<std::string>(_content, _dialog, _inputBox, _inputList, _AddButton, _RemoveButton) { }
+
+public slots:
+  virtual void elementEntered(const QString& t)
+  {
+    QtQueryListPipe<std::string>::elementEntered(t);
+  }
+  virtual void elementSelected()
+  {
+    QtQueryListPipe<std::string>::elementSelected();
+  }
+  virtual void addElement()
+  {
+    QtQueryListPipe<std::string>::addElement();
+  }
+  virtual void removeElement()
+  {
+    QtQueryListPipe<std::string>::removeElement();
+  }
+};
 
 

src/UIElements/Qt4/Pipe/QtQueryPipe.hpp

@@ -24 +24 @@
 #include <vector>
 
-#include "CodePatterns/MemDebug.hpp"
-
 class QLineEdit;
 class QListWidget;
@@ -36 +34 @@
     QtQueryListPipe(Parameter<std::vector<T> > &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton);
     virtual ~QtQueryListPipe();
-    void AddInteger();
-    void RemoveInteger();
-    void IntegerSelected();
-    void IntegerEntered(const QString&);
+
+  // Slots to-be.
+    virtual void addElement();
+    virtual void removeElement();
+    virtual void elementSelected();
+    virtual void elementEntered(const QString&);
 
   private:
-    void AddValue(T item);
-    void RemoveRow(int row);
+    void addValue(T item);
+    void removeRow(int row);
 
     Parameter<std::vector<T> > &content;

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -298 +298 @@
   QLineEdit *inputBox;
 
-  QtQueryListPipe<std::string> *pipe;
+  StringsQtQueryPipe *pipe;
 };
 

src/UIElements/Qt4/Query/StringsQtQuery.cpp

@@ -60 +60 @@
   thisHLayout->addLayout(thisV2Layout);
 
-  pipe = new QtQueryListPipe<std::string>(tmp,_dialog,inputBox,inputList,AddButton,RemoveButton);
-  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(IntegerEntered(const QString&)));
-  connect(inputList,SIGNAL(itemSelectionChanged()),pipe,SLOT(IntegerSelected()));
-  connect(AddButton,SIGNAL(Clicked()),pipe,SLOT(AddValue()));
-  connect(RemoveButton,SIGNAL(Clicked()),pipe,SLOT(RemoveRow()));}
+  pipe = new StringsQtQueryPipe(tmp,_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()));}
 
 QtDialog::StringsQtQuery::~StringsQtQuery()
@@ -74 +74 @@
 bool QtDialog::StringsQtQuery::handle()
 {
-  // dissect by ","
+/*  // dissect by ","
   std::string::iterator olditer = temp.begin();
   std::vector<std::string> temp_strings;
@@ -87 +87 @@
   tmp.set(temp_strings);
 
-  return temp!="";
+  return temp!="";*/
+  return true;
 }