Changes in src/UIElements/Dialog.cpp [7d9416:2c5765]

File:

• src/UIElements/Dialog.cpp (modified) (4 diffs)

src/UIElements/Dialog.cpp

@@ -26 +26 @@
 #include "CodePatterns/Verbose.hpp"
 
-#include "Parameters/ParameterExceptions.hpp"
-
 class Atom;
+class Box;
 class element;
 class RealSpaceMatrix;
@@ -66 +65 @@
   bool retval = true;
   for(iter=queries.begin(); iter!=queries.end(); iter++){
-    try {
-      retval &= (*iter)->handle();
-    } catch (ParameterException &e) {
-      if( const std::string *name=boost::get_error_info<ParameterName>(e) )
-        ELOG(1, "The following parameter value is not valid: " << *name << ".");
-      retval = false;
-      break;
-    }
+    retval &= (*iter)->handle();
     // if any query fails (is canceled), we can end the handling process
     if(!retval) {
@@ -86 +78 @@
   list<Query*>::iterator iter;
   for(iter=queries.begin(); iter!=queries.end(); iter++) {
-    try {
-      (*iter)->setResult();
-    } catch (ParameterException &e) {
-      if( const std::string *name=boost::get_error_info<ParameterName>(e) )
-        ELOG(1, "The following parameter value is not valid: " << *name << ".");
-      break;
-    }
+    (*iter)->setResult();
   }
 }
@@ -100 +86 @@
 }
 
-template <> void Dialog::query<void *>(Parameter<void *> &param, const char *token, std::string description)
+template <> void Dialog::query<void *>(const char *token, std::string description)
 {
   queryEmpty(token, description);
 }
 
-template <> void Dialog::query<bool>(Parameter<bool> &param, const char *token, std::string description)
-{
-  queryBoolean(param, token, description);
-}
-
-template <> void Dialog::query<int>(Parameter<int> &param, const char *token, std::string description)
-{
-  queryInt(param, token, description);
-}
-
-template <> void Dialog::query< std::vector<int> >(Parameter<std::vector<int> > &param, const char *token, std::string description)
-{
-  queryInts(param, token, description);
-}
-
-template <> void Dialog::query<unsigned int>(Parameter<unsigned int> &param, const char *token, std::string description)
-{
-  queryUnsignedInt(param, token, description);
-}
-
-template <> void Dialog::query< std::vector<unsigned int> >(Parameter<std::vector<unsigned int> > &param, const char *token, std::string description)
-{
-  queryUnsignedInts(param, token, description);
-}
-
-template <> void Dialog::query<double>(Parameter<double> &param, const char *token, std::string description)
-{
-  queryDouble(param, token, description);
-}
-
-template <> void Dialog::query< std::vector<double> >(Parameter<std::vector<double> > &param, const char *token, std::string description)
-{
-  queryDoubles(param, token, description);
-}
-
-template <> void Dialog::query<std::string>(Parameter<std::string> &param, const char *token, std::string description)
-{
-  queryString(param, token, description);
-}
-
-template <> void Dialog::query< std::vector<std::string> >(Parameter<std::vector<std::string> > &param, const char *token, std::string description)
-{
-  queryStrings(param, token, description);
-}
-
-template <> void Dialog::query<const atom *>(Parameter<const atom *> &param, const char *token, std::string description)
-{
-  queryAtom(param, token, description);
-}
-
-template <> void Dialog::query< std::vector<const atom *> >(Parameter<std::vector<const atom *> > &param, const char *token, std::string description)
-{
-  queryAtoms(param, token, description);
-}
-
-template <> void Dialog::query<const molecule *>(Parameter<const molecule *> &param, const char *token, std::string description)
-{
-  queryMolecule(param, token, description);
-}
-
-template <> void Dialog::query< std::vector<const molecule *> >(Parameter<std::vector<const molecule *> > &param, const char *token, std::string description)
-{
-  queryMolecules(param, token, description);
-}
-
-template <> void Dialog::query<Vector>(Parameter<Vector> &param, const char *token, std::string description)
-{
-  queryVector(param, token, false, description);
-}
-
-template <> void Dialog::query< std::vector<Vector> >(Parameter<std::vector<Vector> > &param, const char *token, std::string description)
-{
-  queryVectors(param, token, false, description);
-}
-
-template <> void Dialog::query<BoxVector>(Parameter<BoxVector> &param, const char *token, std::string description)
-{
-  ASSERT(0, "TODO: query<BoxVector>");
-  //queryVector(param, token, true, description);
-}
-
-template <> void Dialog::query< std::vector<BoxVector> >(Parameter<std::vector<BoxVector> > &param, const char *token, std::string description)
-{
-  ASSERT(0, "TODO: query<vector<BoxVector> >");
-  //queryVectors(param, token, true, description);
-}
-
-template <> void Dialog::query<RealSpaceMatrix>(Parameter<RealSpaceMatrix> &param, const char *token, std::string description)
-{
-  queryRealSpaceMatrix(param, token, description);
-}
-
-template <> void Dialog::query<const element *>(Parameter<const element *> &param, const char *token, std::string description)
-{
-  queryElement(param, token, description);
-}
-
-template <> void Dialog::query< std::vector<const element *> >(Parameter<std::vector<const element *> > &param, const char *token, std::string description)
-{
-  queryElements(param, token, description);
-}
-
-template <> void Dialog::query< boost::filesystem::path >(Parameter<boost::filesystem::path> &param, const char *token, std::string description)
-{
-  queryFile(param, token, description);
-}
-
-template <> void Dialog::query< RandomNumberDistribution_Parameters >(Parameter<RandomNumberDistribution_Parameters> &param, const char *token, std::string description)
-{
-  queryRandomNumberDistribution_Parameters(param, token, description);
+template <> void Dialog::query<bool>(const char *token, std::string description)
+{
+  queryBoolean(token, description);
+}
+
+template <> void Dialog::query<int>(const char *token, std::string description)
+{
+  queryInt(token, description);
+}
+
+template <> void Dialog::query< std::vector<int> >(const char *token, std::string description)
+{
+  queryInts(token, description);
+}
+
+template <> void Dialog::query<unsigned int>(const char *token, std::string description)
+{
+  queryUnsignedInt(token, description);
+}
+
+template <> void Dialog::query< std::vector<unsigned int> >(const char *token, std::string description)
+{
+  queryUnsignedInts(token, description);
+}
+
+template <> void Dialog::query<double>(const char *token, std::string description)
+{
+  queryDouble(token, description);
+}
+
+template <> void Dialog::query< std::vector<double> >(const char *token, std::string description)
+{
+  queryDoubles(token, description);
+}
+
+template <> void Dialog::query<std::string>(const char *token, std::string description)
+{
+  queryString(token, description);
+}
+
+template <> void Dialog::query< std::vector<std::string> >(const char *token, std::string description)
+{
+  queryStrings(token, description);
+}
+
+template <> void Dialog::query<const atom *>(const char *token, std::string description)
+{
+  queryAtom(token, description);
+}
+
+template <> void Dialog::query< std::vector<const atom *> >(const char *token, std::string description)
+{
+  queryAtoms(token, description);
+}
+
+template <> void Dialog::query<const molecule *>(const char *token, std::string description)
+{
+  queryMolecule(token, description);
+}
+
+template <> void Dialog::query< std::vector<const molecule *> >(const char *token, std::string description)
+{
+  queryMolecules(token, description);
+}
+
+template <> void Dialog::query<Vector>(const char *token, std::string description)
+{
+  queryVector(token, false, description);
+}
+
+template <> void Dialog::query< std::vector<Vector> >(const char *token, std::string description)
+{
+  queryVectors(token, false, description);
+}
+
+template <> void Dialog::query<BoxVector>(const char *token, std::string description)
+{
+  queryVector(token, true, description);
+}
+
+template <> void Dialog::query< std::vector<BoxVector> >(const char *token, std::string description)
+{
+  queryVectors(token, true, description);
+}
+
+template <> void Dialog::query<Box>(const char *token, std::string description)
+{
+  queryBox(token, description);
+}
+
+template <> void Dialog::query<const element *>(const char *token, std::string description)
+{
+  queryElement(token, description);
+}
+
+template <> void Dialog::query< std::vector<const element *> >(const char *token, std::string description)
+{
+  queryElements(token, description);
+}
+
+template <> void Dialog::query< boost::filesystem::path >(const char *token, std::string description)
+{
+  queryFile(token, description);
+}
+
+template <> void Dialog::query< std::vector<boost::filesystem::path> >(const char *token, std::string description)
+{
+  queryFiles(token, description);
+}
+
+template <> void Dialog::query< RandomNumberDistribution_Parameters >(const char *token, std::string description)
+{
+  queryRandomNumberDistribution_Parameters(token, description);
 }