Changeset 6af6470 for src/UIElements/TextUI

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/TextUI

Files:

• Query/TextQuery.hpp (modified) (1 diff)
• TextDialog.hpp (modified) (2 diffs)

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