Changeset 37a67f for src/UIElements/CommandLineUI

Timestamp:

Jun 11, 2015, 11:21:41 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

08d042

Parents:

043598

git-author:

Frederik Heber <heber@…> (05/17/15 13:50:53)

git-committer:

Frederik Heber <heber@…> (06/11/15 23:21:41)

Message:

Replaced Query.. class and query..() function declarations in Dialog.. by boost preprocessor magic.

• this removes a lot of copy&paste code.

Location:

src/UIElements/CommandLineUI

Files:

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

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -34 +34 @@
 
   virtual void queryEmpty(const std::string ="", const std::string = "");
-  virtual void queryInt(Parameter<int> &, const std::string ="", const std::string = "");
-  virtual void queryInts(Parameter<std::vector<int> > &, const std::string ="", const std::string = "");
-  virtual void queryUnsignedInt(Parameter<unsigned int> &, const std::string ="", const std::string = "");
-  virtual void queryUnsignedInts(Parameter<std::vector<unsigned int> > &, const std::string ="", const std::string = "");
-  virtual void queryBoolean(Parameter<bool> &, const std::string ="", const std::string = "");
-  virtual void queryString(Parameter<std::string> &, const std::string ="", const std::string = "");
-  virtual void queryStrings(Parameter<std::vector<std::string> > &, const std::string ="", const std::string = "");
-  virtual void queryDouble(Parameter<double> &, const std::string ="", const std::string = "");
-  virtual void queryDoubles(Parameter<std::vector<double> > &, const std::string ="", const std::string = "");
-  virtual void queryAtom(Parameter<const atom *> &, const std::string ="", const std::string = "");
-  virtual void queryAtoms(Parameter<std::vector<const atom *> > &, const std::string ="", const std::string = "");
-  virtual void queryMolecule(Parameter<const molecule *> &, const std::string ="", const std::string = "");
-  virtual void queryMolecules(Parameter<std::vector<const molecule *> > &, 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 = "");
-  virtual void queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &, const std::string ="", const std::string = "");
-  virtual void queryElement(Parameter<const element *> &, const std::string ="", const std::string = "");
-  virtual void queryElements(Parameter<std::vector<const element *> > &, const std::string ="", const std::string = "");
-  virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string ="", const std::string = "");
-  virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const std::string ="", const std::string = "");
-  virtual void queryKeyValuePair(Parameter<KeyValuePair> &, const std::string ="", const std::string = "");
-  virtual void queryKeyValuePairs(Parameter< std::vector<KeyValuePair> > &, const std::string ="", const std::string = "");
 
-  // specialized stuff for command line queries
-  // all placed into Query/CommandLineQuery.hpp
-  // !please adhere to alphabetical ordering!
+protected:
 
-  class AtomCommandLineQuery;
-  class AtomsCommandLineQuery;
-  class BooleanCommandLineQuery;
-  class DoubleCommandLineQuery;
-  class DoublesCommandLineQuery;
-  class ElementCommandLineQuery;
-  class ElementsCommandLineQuery;
   class EmptyCommandLineQuery;
-  class FileCommandLineQuery;
-  class FilesCommandLineQuery;
-  class IntCommandLineQuery;
-  class IntsCommandLineQuery;
-  class KeyValuePairCommandLineQuery;
-  class KeyValuePairsCommandLineQuery;
-  class MoleculeCommandLineQuery;
-  class MoleculesCommandLineQuery;
-  class RealSpaceMatrixCommandLineQuery;
-  class StringCommandLineQuery;
-  class StringsCommandLineQuery;
-  class UnsignedIntCommandLineQuery;
-  class UnsignedIntsCommandLineQuery;
-  class VectorCommandLineQuery;
-  class VectorsCommandLineQuery;
+
+  /** With the following boost::preprocessor code we generate virtual function
+   * definitions and forward declarations for all desired query types in the
+   * CommandLineUI specialization of class Dialog.
+   */
+#include "UIElements/GlobalListOfParameterQueries.hpp"
+#include "UIElements/Dialog_impl_pre.hpp"
+
+  #include <boost/preprocessor/facilities/empty.hpp>
+
+  // iterate over all parameter query types for query declarations
+  #if defined GLOBALLISTOFPARAMETERQUERIES_Token && defined GLOBALLISTOFPARAMETERQUERIES_Type
+  #define SUFFIX BOOST_PP_EMPTY()
+  #define BOOST_PP_LOCAL_MACRO(n) dialog_declaration(~, n, GLOBALLISTOFPARAMETERQUERIES_Token, GLOBALLISTOFPARAMETERQUERIES_Type)
+  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMETERTOKENS-1)
+  #include BOOST_PP_LOCAL_ITERATE()
+  #undef dialog_declaration
+  #undef SUFFIX
+  #endif
+
+  // iterate over all parameter query types for forward declarations
+  #if defined GLOBALLISTOFPARAMETERQUERIES_Token && defined GLOBALLISTOFPARAMETERQUERIES_Type
+  #define BOOST_PP_LOCAL_MACRO(n) forward_declaration(~, n, GLOBALLISTOFPARAMETERQUERIES_Token, CommandLineQuery)
+  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMETERTOKENS-1)
+  #include BOOST_PP_LOCAL_ITERATE()
+  #undef forward_declaration
+  #endif
+
+#include "Dialog_impl_undef.hpp"
+  /* End of preprocessor code piece */
+
 };
 

src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

@@ -24 +24 @@
 };
 
-class CommandLineDialog::IntCommandLineQuery : public Dialog::TQuery<int> {
-public:
-  IntCommandLineQuery(Parameter<int> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~IntCommandLineQuery();
-  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
+   * Dialog.
+   */
+#include "UIElements/GlobalListOfParameterQueries.hpp"
+#include "UIElements/Dialog_impl_pre.hpp"
 
-class CommandLineDialog::IntsCommandLineQuery : public Dialog::TQuery<std::vector<int> > {
-public:
-  IntsCommandLineQuery(Parameter<std::vector<int> > &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~IntsCommandLineQuery();
-  virtual bool handle();
-};
+  #include <boost/preprocessor/facilities/empty.hpp>
 
-class CommandLineDialog::UnsignedIntCommandLineQuery : public Dialog::TQuery<unsigned int> {
-public:
-  UnsignedIntCommandLineQuery(Parameter<unsigned int> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~UnsignedIntCommandLineQuery();
-  virtual bool handle();
-};
+  // iterate over all parameter query types for forward declarations
+  #if defined GLOBALLISTOFPARAMETERQUERIES_Token && defined GLOBALLISTOFPARAMETERQUERIES_Type
+  #define BOOST_PP_LOCAL_MACRO(n) queryclass_definition(~, n, GLOBALLISTOFPARAMETERQUERIES_Token, GLOBALLISTOFPARAMETERQUERIES_Type, CommandLine)
+  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMETERTOKENS-1)
+  #include BOOST_PP_LOCAL_ITERATE()
+  #undef queryclass_definition
+  #endif
 
-class CommandLineDialog::UnsignedIntsCommandLineQuery : public Dialog::TQuery<std::vector<unsigned int> > {
-public:
-  UnsignedIntsCommandLineQuery(Parameter<std::vector<unsigned int> > &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~UnsignedIntsCommandLineQuery();
-  virtual bool handle();
-};
+#include "Dialog_impl_undef.hpp"
+  /* End of preprocessor code piece */
 
-class CommandLineDialog::BooleanCommandLineQuery : public Dialog::TQuery<bool> {
-public:
-  BooleanCommandLineQuery(Parameter<bool> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~BooleanCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::DoubleCommandLineQuery : public Dialog::TQuery<double> {
-public:
-  DoubleCommandLineQuery(Parameter<double> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~DoubleCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::DoublesCommandLineQuery : public Dialog::TQuery<std::vector<double> > {
-public:
-  DoublesCommandLineQuery(Parameter<std::vector<double> > &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~DoublesCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::StringCommandLineQuery : public Dialog::TQuery<std::string> {
-public:
-  StringCommandLineQuery(Parameter<std::string> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~StringCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::StringsCommandLineQuery : public Dialog::TQuery<std::vector<std::string> > {
-public:
-  StringsCommandLineQuery(Parameter<std::vector<std::string> > &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~StringsCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::AtomCommandLineQuery : public Dialog::TQuery<const atom *> {
-public:
-  AtomCommandLineQuery(Parameter<const atom *> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~AtomCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::AtomsCommandLineQuery : public Dialog::TQuery<std::vector<const atom*> > {
-public:
-  AtomsCommandLineQuery(Parameter<std::vector<const atom *> > &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~AtomsCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::MoleculeCommandLineQuery : public Dialog::TQuery<const molecule *> {
-public:
-  MoleculeCommandLineQuery(Parameter<const molecule *> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~MoleculeCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::MoleculesCommandLineQuery : public Dialog::TQuery<std::vector<const molecule*> > {
-public:
-  MoleculesCommandLineQuery(Parameter<std::vector<const molecule *> > &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~MoleculesCommandLineQuery();
-  virtual bool handle();
-};
-
-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();
-};
-
-class CommandLineDialog::RealSpaceMatrixCommandLineQuery : public Dialog::TQuery<RealSpaceMatrix> {
-public:
-  RealSpaceMatrixCommandLineQuery(Parameter<RealSpaceMatrix> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~RealSpaceMatrixCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::ElementCommandLineQuery : public Dialog::TQuery<const element *> {
-public:
-  ElementCommandLineQuery(Parameter<const element *> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~ElementCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::ElementsCommandLineQuery : public Dialog::TQuery<std::vector<const element *> > {
-public:
-  ElementsCommandLineQuery(Parameter<std::vector<const element *> > &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~ElementsCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::FileCommandLineQuery : public Dialog::TQuery<boost::filesystem::path> {
-public:
-  FileCommandLineQuery(Parameter<boost::filesystem::path> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~FileCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::FilesCommandLineQuery : public Dialog::TQuery<std::vector<boost::filesystem::path> > {
-public:
-  FilesCommandLineQuery(Parameter<std::vector< boost::filesystem::path> > &param, const std::string &_title, const std::string &_description = "");
-  virtual ~FilesCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::KeyValuePairCommandLineQuery : public Dialog::TQuery<KeyValuePair> {
-public:
-  KeyValuePairCommandLineQuery(Parameter<KeyValuePair> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~KeyValuePairCommandLineQuery();
-  virtual bool handle();
-};
-
-class CommandLineDialog::KeyValuePairsCommandLineQuery : public Dialog::TQuery<std::vector<KeyValuePair> > {
-public:
-  KeyValuePairsCommandLineQuery(Parameter<std::vector<KeyValuePair> > &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~KeyValuePairsCommandLineQuery();
-  virtual bool handle();
-};
 
 #endif /* COMMANDLINEQUERY_HPP_ */