Changeset be848d for src/UIElements/Dialog.hpp

Timestamp:

Jun 21, 2017, 10:02:14 PM (9 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, Candidate_v1.7.0, Candidate_v1.7.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, 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, stable

Children:

78ea3c

Parents:

9a9f847 (diff), 6116df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GeometryObjects' into Candidate_v1.6.1

File:

• src/UIElements/Dialog.hpp (modified) (3 diffs)

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.isValidAsString(temp);  }
+  virtual void setResult(){ param.setAsString(temp);  }
+protected:
+  std::string 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();
+  virtual void setResult();
+protected:
+  std::vector<std::string> temp;
+  Parameter< std::vector<Vector> > &param;
+};
+
+
 #endif /* DIALOG_HPP_ */