Changeset 37a67f for src/UIElements/TextUI

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

Files:

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

src/UIElements/TextUI/Query/TextQuery.hpp

@@ -17 +17 @@
 #include "TextUI/TextDialog.hpp"
 
-class TextDialog::AtomTextQuery : public Dialog::TQuery<const atom *> {
-public:
-  AtomTextQuery(Parameter<const atom *> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~AtomTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::AtomsTextQuery : public Dialog::TQuery<std::vector<const atom *> > {
-public:
-  AtomsTextQuery(Parameter<std::vector<const atom *> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~AtomsTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::BooleanTextQuery : public Dialog::TQuery<bool> {
-public:
-  BooleanTextQuery(Parameter<bool> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~BooleanTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::RealSpaceMatrixTextQuery : public Dialog::TQuery<RealSpaceMatrix> {
-public:
-  RealSpaceMatrixTextQuery(Parameter<RealSpaceMatrix> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~RealSpaceMatrixTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::DoubleTextQuery : public Dialog::TQuery<double> {
-public:
-  DoubleTextQuery(Parameter<double> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~DoubleTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::DoublesTextQuery : public Dialog::TQuery<std::vector<double> > {
-public:
-  DoublesTextQuery(Parameter<std::vector<double> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~DoublesTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::ElementTextQuery : public Dialog::TQuery<const element *> {
-public:
-  ElementTextQuery(Parameter<const element *> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~ElementTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::ElementsTextQuery : public Dialog::TQuery<std::vector<const element *> > {
-public:
-  ElementsTextQuery(Parameter<std::vector<const element *> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~ElementsTextQuery();
-  virtual bool handle();
-};
-
 class TextDialog::EmptyTextQuery : public Dialog::EmptyQuery {
 public:
@@ -80 +24 @@
 };
 
-class TextDialog::FileTextQuery : public Dialog::TQuery<boost::filesystem::path> {
-public:
-  FileTextQuery(Parameter<boost::filesystem::path> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~FileTextQuery();
-  virtual bool handle();
-};
 
-class TextDialog::FilesTextQuery : public Dialog::TQuery<std::vector<boost::filesystem::path> > {
-public:
-  FilesTextQuery(Parameter<std::vector< boost::filesystem::path> > &param, const std::string &_title, const std::string &_description = NULL);
-  virtual ~FilesTextQuery();
-  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 TextDialog::IntTextQuery : public Dialog::TQuery<int> {
-public:
-  IntTextQuery(Parameter<int> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~IntTextQuery();
-  virtual bool handle();
-};
+  #include <boost/preprocessor/facilities/empty.hpp>
 
-class TextDialog::IntsTextQuery : public Dialog::TQuery<std::vector<int> > {
-public:
-  IntsTextQuery(Parameter<std::vector<int> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~IntsTextQuery();
-  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, Text)
+  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMETERTOKENS-1)
+  #include BOOST_PP_LOCAL_ITERATE()
+  #undef queryclass_definition
+  #endif
 
-class TextDialog::KeyValuePairTextQuery : public Dialog::TQuery<KeyValuePair> {
-public:
-  KeyValuePairTextQuery(Parameter<KeyValuePair> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~KeyValuePairTextQuery();
-  virtual bool handle();
-};
+#include "Dialog_impl_undef.hpp"
+  /* End of preprocessor code piece */
 
-class TextDialog::KeyValuePairsTextQuery : public Dialog::TQuery<std::vector<KeyValuePair> > {
-public:
-  KeyValuePairsTextQuery(Parameter<std::vector<KeyValuePair> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~KeyValuePairsTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::MoleculeTextQuery : public Dialog::TQuery<const molecule *> {
-public:
-  MoleculeTextQuery(Parameter<const molecule *> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~MoleculeTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::MoleculesTextQuery : public Dialog::TQuery<std::vector<const molecule *> > {
-public:
-  MoleculesTextQuery(Parameter<std::vector<const molecule *> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~MoleculesTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::StringTextQuery : public Dialog::TQuery<std::string> {
-public:
-  StringTextQuery(Parameter<std::string> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~StringTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::StringsTextQuery : public Dialog::TQuery<std::vector<std::string> > {
-public:
-  StringsTextQuery(Parameter<std::vector<std::string> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~StringsTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::UnsignedIntTextQuery : public Dialog::TQuery<unsigned int> {
-public:
-  UnsignedIntTextQuery(Parameter<unsigned int> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~UnsignedIntTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::UnsignedIntsTextQuery : public Dialog::TQuery<std::vector<unsigned int> > {
-public:
-  UnsignedIntsTextQuery(Parameter<std::vector<unsigned int> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~UnsignedIntsTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::VectorTextQuery : public Dialog::TQuery<Vector> {
-public:
-  VectorTextQuery(Parameter<Vector> &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~VectorTextQuery();
-  virtual bool handle();
-};
-
-class TextDialog::VectorsTextQuery : public Dialog::TQuery<std::vector<Vector> > {
-public:
-  VectorsTextQuery(Parameter<std::vector<Vector> > &, const std::string &_title, const std::string &_description = NULL);
-  virtual ~VectorsTextQuery();
-  virtual bool handle();
-};
 
 #endif /* TEXTQUERY_HPP_ */

src/UIElements/TextUI/TextDialog.hpp

@@ -33 +33 @@
 
   virtual void queryEmpty(const std::string ="", const std::string = "");
-  virtual void queryBoolean(Parameter<bool> &, 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 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 = "",std::string = "");
-  virtual void queryAtoms(Parameter<std::vector<const atom *> > &, const std::string = "",std::string = "");
-  virtual void queryMolecule(Parameter<const molecule *> &, const std::string = "",std::string = "");
-  virtual void queryMolecules(Parameter<std::vector<const molecule *> > &, const std::string = "",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 = "");
+
+  /** With the following boost::preprocessor code we generate virtual function
+   * definitions for all desired query types in the abstract class Dialog.
+   */
+#include "UIElements/GlobalListOfParameterQueries.hpp"
+#include "UIElements/Dialog_impl_pre.hpp"
+
+  #include <boost/preprocessor/facilities/empty.hpp>
+
+  // iterate over all parameter query types
+  #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
+
+#include "Dialog_impl_undef.hpp"
+  /* End of preprocessor code piece */
 
 protected:
-  // specialized stuff for text queries
-  // all placed into Query/TextQuery.hpp
-  // !please adhere to alphabetical ordering!
-  class AtomTextQuery;
-  class AtomsTextQuery;
-  class BooleanTextQuery;
-  class DoubleTextQuery;
-  class DoublesTextQuery;
-  class ElementTextQuery;
-  class ElementsTextQuery;
+
   class EmptyTextQuery;
-  class FileTextQuery;
-  class FilesTextQuery;
-  class IntTextQuery;
-  class IntsTextQuery;
-  class KeyValuePairTextQuery;
-  class KeyValuePairsTextQuery;
-  class MoleculeTextQuery;
-  class MoleculesTextQuery;
-  class RealSpaceMatrixTextQuery;
-  class StringTextQuery;
-  class StringsTextQuery;
-  class UnsignedIntTextQuery;
-  class UnsignedIntsTextQuery;
-  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
+   * Dialog.
+   */
+#include "UIElements/GlobalListOfParameterQueries.hpp"
+#include "UIElements/Dialog_impl_pre.hpp"
+
+  #include <boost/preprocessor/facilities/empty.hpp>
+
+  // 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, TextQuery)
+  #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 */
+
 };