Changeset 6af6470 for src/UIElements

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.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineDialog.hpp (modified) (2 diffs)
• CommandLineUI/Query/CommandLineQuery.hpp (modified) (1 diff)
• Dialog.cpp (modified) (1 diff)
• Dialog.hpp (modified) (3 diffs)
• GlobalListOfParameterQueries.hpp (modified) (2 diffs)
• Qt4/QtDialog.hpp (modified) (2 diffs)
• Qt4/Query/QtQueryList.hpp (modified) (1 diff)
• TextUI/Query/TextQuery.hpp (modified) (1 diff)
• TextUI/TextDialog.hpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -48 +48 @@
   #include <boost/preprocessor/facilities/empty.hpp>
 
+  virtual void queryVector(Parameter<Vector> &, const std::string ="", const std::string = "");
+  virtual void queryVectors(Parameter< std::vector<Vector> > &, const std::string ="", const std::string = "");
+
   // iterate over all parameter query types for query declarations
   #if defined GLOBALLISTOFPARAMETERQUERIES_Token && defined GLOBALLISTOFPARAMETERQUERIES_Type
@@ -57 +60 @@
   #undef SUFFIX
   #endif
+
+  class VectorCommandLineQuery;
+  class VectorsCommandLineQuery;
 
   // iterate over all parameter query types for forward declarations

src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

@@ -24 +24 @@
 };
 
+class CommandLineDialog::VectorCommandLineQuery : public Dialog::TQuery<Vector> {
+public:
+  VectorCommandLineQuery(Parameter<Vector> &_param, const std::string &_title, const std::string &_description = "");
+  virtual ~VectorCommandLineQuery();
+  virtual bool handle();
+};
+
+class CommandLineDialog::VectorsCommandLineQuery : public Dialog::TQuery< std::vector<Vector> > {
+public:
+  VectorsCommandLineQuery(Parameter< std::vector<Vector> > &_param, const std::string &_title, const std::string &_description = "");
+  virtual ~VectorsCommandLineQuery();
+  virtual bool handle();
+};
+
   /** With the following boost::preprocessor code we generate forward declarations
    * of query class for all desired query types in the Qt specialization class of

src/UIElements/Dialog.cpp

@@ -134 +134 @@
   queryEmpty(param, title, description);
 }*/
+template <>
+void Dialog::query<Vector>(Parameter<Vector> &param, const std::string title, const std::string description)
+{
+  queryVector(param, title, description);
+}
+template <>
+void Dialog::query< std::vector<Vector> >(Parameter< std::vector<Vector> > &param, const std::string title, const std::string description)
+{
+  queryVectors(param, title, description);
+}
 
 /** With the following boost::preprocessor code we generate template

src/UIElements/Dialog.hpp

@@ -158 +158 @@
   virtual void queryEmpty(const std::string ="", const std::string = "")=0;
 
+  virtual void queryVector(Parameter<Vector> &, const std::string ="", const std::string = "")=0;
+  virtual void queryVectors(Parameter< std::vector<Vector> > &, const std::string ="", const std::string = "")=0;
+
   /** With the following boost::preprocessor code we generate virtual function
    * definitions for all desired query types in the abstract class Dialog.
@@ -250 +253 @@
   };
 
-
   template<class T>
   class TQuery : public Query {
@@ -282 +284 @@
 };
 
+// we have specialization of Vector to allow internal storing as string
+template <>
+void Dialog::query<Vector>(Parameter<Vector> &, const std::string, const std::string);
+template <>
+void Dialog::query< std::vector<Vector> >(Parameter< std::vector<Vector> > &, const std::string, const std::string);
+
+/** Template specialization for Query<Vector> to allow internal storing of a
+ * string instead of a Vector.
+ *
+ * Because we need to evaluate the string as a possible GeometryRegistry key
+ * and we may do this only when the Action (whose options we are querying)
+ * is executed, not before.
+ */
+template <>
+class Dialog::TQuery<Vector> : public Query {
+public:
+  TQuery(Parameter<Vector> &_param, const std::string title, const std::string _description = "") :
+    Query(title, _description), param(_param) {}
+  virtual ~TQuery(){}
+  virtual bool handle()=0;
+  virtual bool isValid(){ return param.isValid(temp);  }
+  virtual void setResult(){ param.set(temp);  }
+protected:
+  Vector temp;
+  Parameter<Vector> &param;
+};
+
+template <>
+class Dialog::TQuery< std::vector<Vector> > : public Query {
+public:
+  TQuery(Parameter< std::vector<Vector> > &_param, const std::string title, const std::string _description = "") :
+    Query(title, _description), param(_param) {}
+  virtual ~TQuery(){}
+  virtual bool handle()=0;
+  virtual bool isValid(){ return param.isValid(temp);  }
+  virtual void setResult(){ param.set(temp);  }
+protected:
+  std::vector<Vector> temp;
+  Parameter< std::vector<Vector> > &param;
+};
+
+
 #endif /* DIALOG_HPP_ */

src/UIElements/GlobalListOfParameterQueries.hpp

@@ -28 +28 @@
         (Molecule) \
         (Molecules) \
-        (Vector) \
-        (Vectors) \
         (RealSpaceMatrix) \
         (Element) \
@@ -52 +50 @@
         (const molecule *) \
         (std::vector<const molecule *> ) \
-        (Vector) \
-        (std::vector<Vector> ) \
         (RealSpaceMatrix) \
         (const element *) \

src/UIElements/Qt4/QtDialog.hpp

@@ -36 +36 @@
   virtual void queryEmpty(const std::string ="", const std::string = "");
 
+  virtual void queryVector(Parameter<Vector> &, const std::string ="", const std::string = "");
+  virtual void queryVectors(Parameter< std::vector<Vector> > &, const std::string ="", const std::string = "");
+
   /** With the following boost::preprocessor code we generate virtual function
    * definitions for all desired query types in the abstract class Dialog.
@@ -64 +67 @@
 
   class EmptyQtQuery;
+
+  class VectorQtQuery;
+  class VectorsQtQuery;
 
   /** With the following boost::preprocessor code we generate forward declarations

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;
 };
 

src/UIElements/TextUI/Query/TextQuery.hpp

@@ -24 +24 @@
 };
 
+class TextDialog::VectorTextQuery : public Dialog::TQuery<Vector> {
+public:
+  VectorTextQuery(Parameter<Vector> &_param, const std::string &_title, const std::string &_description = "");
+  virtual ~VectorTextQuery();
+  virtual bool handle();
+};
+
+class TextDialog::VectorsTextQuery : public Dialog::TQuery< std::vector<Vector> > {
+public:
+  VectorsTextQuery(Parameter< std::vector<Vector> > &_param, const std::string &_title, const std::string &_description = "");
+  virtual ~VectorsTextQuery();
+  virtual bool handle();
+};
 
   /** With the following boost::preprocessor code we generate forward declarations

src/UIElements/TextUI/TextDialog.hpp

@@ -34 +34 @@
   virtual void queryEmpty(const std::string ="", const std::string = "");
 
+  virtual void queryVector(Parameter<Vector> &, const std::string ="", const std::string = "");
+  virtual void queryVectors(Parameter< std::vector<Vector> > &, const std::string ="", const std::string = "");
+
   /** With the following boost::preprocessor code we generate virtual function
    * definitions for all desired query types in the abstract class Dialog.
@@ -59 +62 @@
   class EmptyTextQuery;
 
+  class VectorTextQuery;
+  class VectorsTextQuery;
+
   /** With the following boost::preprocessor code we generate forward declarations
    * of query class for all desired query types in the Qt specialization class of