Changeset 6af6470 for src/UIElements/Qt4/Query

Timestamp:

Jun 19, 2017, 8:24:16 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

d8c6c7

Parents:

d6d2129

git-author:

Frederik Heber <heber@…> (03/30/17 14:37:42)

git-committer:

Frederik Heber <frederik.heber@…> (06/19/17 08:24:16)

Message:

Removed Vector and Vectors from boost preprocessor magic.

• this is preparatory for allowing to change the class Dialog::Query<Vector> by specialization and have the Vector stored as string and not directly as Vector.

File:

• src/UIElements/Qt4/Query/QtQueryList.hpp (modified) (1 diff)

src/UIElements/Qt4/Query/QtQueryList.hpp

@@ -100 +100 @@
   std::vector<T> &tempRef;
   Parameter<T> *subParam;
+};
+
+template<>
+class QtQueryList<Vector> : public QtQueryListUntyped {
+public:
+  QtQueryList(Parameter<std::vector<Vector> > &parentParam, QBoxLayout *parent, Dialog *_dialog, std::vector<Vector> &_temp) : QtQueryListUntyped(parent, _dialog), tempRef(_temp)
+  {
+    // do we have an STLVectorValidator?
+    Validator<std::vector<Vector> > *val = &parentParam.getValidator();
+    STLVectorValidator<std::vector<Vector> > *vector_val = NULL;
+
+    // might be hidden inside an And_Validator
+    And_Validator<std::vector<Vector> > * and_val = dynamic_cast<And_Validator<std::vector<Vector> > *>(val);
+    if (and_val){
+      if (dynamic_cast<STLVectorValidator<std::vector<Vector> > *>(and_val->getA()))
+        vector_val = dynamic_cast<STLVectorValidator<std::vector<Vector> > *>(and_val->getA());
+      else if (dynamic_cast<STLVectorValidator<std::vector<Vector> > *>(and_val->getB()))
+        vector_val = dynamic_cast<STLVectorValidator<std::vector<Vector> > *>(and_val->getB());
+    }else{
+      vector_val = dynamic_cast<STLVectorValidator<std::vector<Vector> > *>(val);
+    }
+
+    if (vector_val){
+      // if so, try to use its ElementwiseValidator
+      subParam = new Parameter<Vector>("sub-param", *(vector_val->getElementwiseValidator()));
+    }else{
+      subParam = new Parameter<Vector>("sub-param");
+    }
+  }
+  virtual ~QtQueryList()
+  {
+    delete(subParam);
+  }
+
+  void addElement() {
+    // add item to both
+    addElementToListWidget(subParam->getAsString());
+    tempRef.push_back(subParam->get());
+    onUpdate();
+  }
+  void removeElements()
+  {
+    std::vector<int> rows = getSelectedRows();
+    removeSelectedRows(rows);
+    for (int i = rows.size() - 1; i >= 0; i --){
+      ASSERT((size_t)(rows[i]) < tempRef.size(), "QtQueryList<Vector>::removeElements() trying to remove invalid element.");
+      tempRef.erase(tempRef.begin() + rows[i]);
+    }
+    onUpdate();
+  }
+protected:
+  std::vector<Vector> &tempRef;
+  Parameter<Vector> *subParam;
 };