Changeset 6af6470 for src/UIElements/CommandLineUI

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

Files:

• CommandLineDialog.hpp (modified) (2 diffs)
• Query/CommandLineQuery.hpp (modified) (1 diff)

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