Changes in src/UIElements/Dialog.hpp [163110:37a67f]

File:

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

src/UIElements/Dialog.hpp

@@ -22 +22 @@
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
 #include "LinearAlgebra/Vector.hpp"
-#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
 #include "Parameters/Parameter.hpp"
+#include "Parameters/Specifics/KeyValuePair.hpp"
 
 class atom;
@@ -29 +29 @@
 class element;
 class molecule;
-
 
 /** Dialog is one of the two main classes of the UIFactory base class.
@@ -133 +132 @@
  * Due to the three present UI interfaces we have to add a specific Query for each, here
  * is a list:
- *   -# add ValueStorage::setCurrentValue() and ValueStorage::queryCurrentValue() for
- *      both types
- *   -# add Dialog::query...()
- *   -# add Dialog::query<>() specialization calling the above function
- *   -# add CommandLineDialog::query...(), TextDialog::query...(), and QtDialog::query...(),
- *      i.e. for each of the three interface
- *   -# add empty definition DummyDialog::query...() to the stub for Action unittests in DummUI.hpp.
- *   -# add Dialog::...Query class with tmp value of desired type
+ *   -# add a token (i.e. a unique name for the query parameter) and its type to the
+ *      global list in \ref GlobalListOfParameterQueries.hpp. This will via boost
+ *      preprocessor magic add definitions and some intermediatr template specializations.
+ *   -# add a specialization for each of the UI interfaces of Dialog::...Query class.
+ *   -# add class declaration of QtDialog::...Query in \ref QtQuery.hpp
  *   -# add CommandLineDialog::...Query, TextDialog::...Query, QtDialog::...Query
- *   -# you probably also need a QtDialog::...QueryPipe() to handle the signal/slot stuff,
- *      Qt's moc does not like nested classes. Hence, this has to go extra.
- *   -# TypeEnumContainer add new type to query
+ *   -# TypeEnumContainer add new type to query. Make the Type name match with the token
  *   -# CommandLineParser::AddOptionToParser() add new type to query
  *   -# CommandLineParser_valdiates.[ch]pp: If given above as a new type
  *      program_options::value, define and implement a validate() function here.
+ *
+ * Note that the Empty..Query is always specificly present as it has not type and thus
+ * does not fit into the preprocessor magic scheme (on the plus side it also serves
+ * as a kind of visualization of what the preprocessor actually does).
  *
  */
@@ -159 +157 @@
 
   virtual void queryEmpty(const std::string ="", const std::string = "")=0;
-  virtual void queryBoolean(Parameter<bool> &, const std::string ="", const std::string = "")=0;
-  virtual void queryInt(Parameter<int> &, const std::string ="", const std::string = "")=0;
-  virtual void queryInts(Parameter<std::vector<int> > &, const std::string ="", const std::string = "")=0;
-  virtual void queryUnsignedInt(Parameter<unsigned int> &, const std::string ="", const std::string = "")=0;
-  virtual void queryUnsignedInts(Parameter<std::vector<unsigned int> > &, const std::string ="", const std::string = "")=0;
-  virtual void queryDouble(Parameter<double> &, const std::string ="", const std::string = "")=0;
-  virtual void queryDoubles(Parameter<std::vector<double> > &, const std::string ="", const std::string = "")=0;
-  virtual void queryString(Parameter<std::string> &, const std::string ="", const std::string = "")=0;
-  virtual void queryStrings(Parameter<std::vector<std::string> > &, const std::string ="", const std::string = "")=0;
-  virtual void queryAtom(Parameter<const atom *> &, const std::string = "", const std::string = "")=0;
-  virtual void queryAtoms(Parameter<std::vector<const atom *> > &, const std::string = "", const std::string = "")=0;
-  virtual void queryMolecule(Parameter<const molecule *> &, const std::string ="", const std::string = "")=0;
-  virtual void queryMolecules(Parameter<std::vector<const molecule *> > &, 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;
-  virtual void queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &, const std::string ="", const std::string = "")=0;
-  virtual void queryElement(Parameter<const element *> &, const std::string ="", const std::string = "")=0;
-  virtual void queryElements(Parameter<std::vector<const element *> > &, const std::string ="", const std::string = "")=0;
-  virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string ="", const std::string = "")=0;
-  virtual void queryFiles(Parameter< std::vector<boost::filesystem::path> > &, const std::string ="", const std::string = "")=0;
-  virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, 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.
+   */
+#include "UIElements/GlobalListOfParameterQueries.hpp"
+#include "UIElements/Dialog_impl_pre.hpp"
+
+  // iterate over all parameter query types
+  #if defined GLOBALLISTOFPARAMETERQUERIES_Token && defined GLOBALLISTOFPARAMETERQUERIES_Type
+  #define SUFFIX =0
+  #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 */
 
   virtual bool display();
@@ -286 +282 @@
 };
 
-
 #endif /* DIALOG_HPP_ */