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

File:

• src/UIElements/Dialog.cpp (modified) (1 diff)

src/UIElements/Dialog.cpp

@@ -135 +135 @@
 }*/
 
-template <> void Dialog::query<bool>(Parameter<bool> &param, const std::string title, const std::string description)
-{
-  queryBoolean(param, title, description);
-}
+/** With the following boost::preprocessor code we generate template
+ * specializations for each desired query types in the abstract class Dialog.
+ */
+#include "UIElements/GlobalListOfParameterQueries.hpp"
+#include "UIElements/Dialog_impl_pre.hpp"
 
-template <> void Dialog::query<int>(Parameter<int> &param, const std::string title, const std::string description)
-{
-  queryInt(param, title, description);
-}
+  // print a template body
+  #define dialog_definition(z,n,TOKENLIST,TYPELIST) \
+  template <> void Dialog::query< \
+    BOOST_PP_SEQ_ELEM(n, TYPELIST) \
+  >(Parameter< \
+    BOOST_PP_SEQ_ELEM(n, TYPELIST) \
+  > &param, const std::string title, const std::string description) { \
+  BOOST_PP_CAT(query, BOOST_PP_SEQ_ELEM(n, TOKENLIST)) \
+  (param, title, description); }
 
-template <> void Dialog::query< std::vector<int> >(Parameter<std::vector<int> > &param, const std::string title, const std::string description)
-{
-  queryInts(param, title, description);
-}
+  // print template specialization for every query type
+  #if defined GLOBALLISTOFPARAMETERQUERIES_Token && defined GLOBALLISTOFPARAMETERQUERIES_Type
+  #define BOOST_PP_LOCAL_MACRO(n) dialog_definition(~, n, GLOBALLISTOFPARAMETERQUERIES_Token, GLOBALLISTOFPARAMETERQUERIES_Type)
+  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMETERTOKENS-1)
+  #include BOOST_PP_LOCAL_ITERATE()
+  #endif
 
-template <> void Dialog::query<unsigned int>(Parameter<unsigned int> &param, const std::string title, const std::string description)
-{
-  queryUnsignedInt(param, title, description);
-}
+  #undef dialog_definition
 
-template <> void Dialog::query< std::vector<unsigned int> >(Parameter<std::vector<unsigned int> > &param, const std::string title, const std::string description)
-{
-  queryUnsignedInts(param, title, description);
-}
+#include "Dialog_impl_undef.hpp"
+/* End of preprocessor code piece */
 
-template <> void Dialog::query<double>(Parameter<double> &param, const std::string title, const std::string description)
-{
-  queryDouble(param, title, description);
-}
-
-template <> void Dialog::query< std::vector<double> >(Parameter<std::vector<double> > &param, const std::string title, const std::string description)
-{
-  queryDoubles(param, title, description);
-}
-
-template <> void Dialog::query<std::string>(Parameter<std::string> &param, const std::string title, const std::string description)
-{
-  queryString(param, title, description);
-}
-
-template <> void Dialog::query< std::vector<std::string> >(Parameter<std::vector<std::string> > &param, const std::string title, const std::string description)
-{
-  queryStrings(param, title, description);
-}
-
-template <> void Dialog::query<const atom *>(Parameter<const atom *> &param, const std::string title, const std::string description)
-{
-  queryAtom(param, title, description);
-}
-
-template <> void Dialog::query< std::vector<const atom *> >(Parameter<std::vector<const atom *> > &param, const std::string title, const std::string description)
-{
-  queryAtoms(param, title, description);
-}
-
-template <> void Dialog::query<const molecule *>(Parameter<const molecule *> &param, const std::string title, const std::string description)
-{
-  queryMolecule(param, title, description);
-}
-
-template <> void Dialog::query< std::vector<const molecule *> >(Parameter<std::vector<const molecule *> > &param, const std::string title, const std::string description)
-{
-  queryMolecules(param, title, description);
-}
-
-template <> void Dialog::query<Vector>(Parameter<Vector> &param, const std::string title, const std::string description)
-{
-  queryVector(param, title, description);
-}
-
-template <> void Dialog::query< std::vector<Vector> >(Parameter<std::vector<Vector> > &param, const std::string title, const std::string description)
-{
-  queryVectors(param, title, description);
-}
-
-template <> void Dialog::query<RealSpaceMatrix>(Parameter<RealSpaceMatrix> &param, const std::string title, const std::string description)
-{
-  queryRealSpaceMatrix(param, title, description);
-}
-
-template <> void Dialog::query<const element *>(Parameter<const element *> &param, const std::string title, const std::string description)
-{
-  queryElement(param, title, description);
-}
-
-template <> void Dialog::query< std::vector<const element *> >(Parameter<std::vector<const element *> > &param, const std::string title, const std::string description)
-{
-  queryElements(param, title, description);
-}
-
-template <> void Dialog::query< boost::filesystem::path >(Parameter<boost::filesystem::path> &param, const std::string title, const std::string description)
-{
-  queryFile(param, title, description);
-}
-
-template <> void Dialog::query< std::vector<boost::filesystem::path> >(Parameter<std::vector< boost::filesystem::path> > &param, const std::string title, const std::string description)
-{
-  queryFiles(param, title, description);
-}
-
-template <> void Dialog::query< RandomNumberDistribution_Parameters >(Parameter<RandomNumberDistribution_Parameters> &param, const std::string title, const std::string description)
-{
-  queryRandomNumberDistribution_Parameters(param, title, description);
-}
+//template <> void Dialog::query< std::vector<KeyValuePair> >(Parameter< std::vector<KeyValuePair> > &param, const std::string title, const std::string description)
+//{
+//  queryKeyValuePairs(param, title, description);
+//}
 
 /************************** Query Infrastructure ************************/