Changeset 73faf4 for src/UIElements/CommandLineUI/Query

Timestamp:

May 8, 2017, 2:00:47 PM (9 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

c8165c

Parents:

ce254c (diff), cb6357 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GeometryObjects' into Candidate_v1.6.1

Location:

src/UIElements/CommandLineUI/Query

Files:

• CommandLineQuery.hpp (modified) (1 diff)
• VectorCommandLineQuery.cpp (modified) (1 diff)
• VectorsCommandLineQuery.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

@@ -24 +24 @@
 };
 
+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();
+};
+
   /** With the following boost::preprocessor code we generate forward declarations
    * of query class for all desired query types in the Qt specialization class of

src/UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp

@@ -53 +53 @@
 
 bool CommandLineDialog::VectorCommandLineQuery::handle() {
-  VectorValue _temp;
+  VectorValue temporary;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    try {
-      _temp = CommandLineParser::getInstance().vm[getTitle()].as< VectorValue >();
-    } catch(boost::bad_any_cast &e) {
-      for (size_t i=0;i<NDIM;++i)
-        _temp.vector[i] = 0.;
-      return false;
-    }
-    temp = _temp.toVector();
+    temporary = CommandLineParser::getInstance().vm[getTitle()].as< VectorValue >();
+    temp = temporary.vectorstring;
     return true;
   }

src/UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp

@@ -46 +46 @@
 
 CommandLineDialog::VectorsCommandLineQuery::VectorsCommandLineQuery(Parameter<std::vector<Vector> > &_param, const std::string &_title, const std::string &_description) :
-    Dialog::TQuery<std::vector<Vector> >(_param, _title, _description)
+    Dialog::TQuery< std::vector<Vector> >(_param, _title, _description)
 {}
 
@@ -53 +53 @@
 
 bool CommandLineDialog::VectorsCommandLineQuery::handle() {
-  std::vector<VectorValue> temporary;
+  std::vector<std::string> temporary;
+  std::stringstream output;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    try {
-      temporary = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<VectorValue> >();
-    } catch(boost::bad_any_cast &e) {
-      temporary.clear();
-      return false;
-    }
-    for(std::vector<VectorValue>::iterator iter = temporary.begin(); iter != temporary.end(); ++iter) {
-      Vector temp_element = (*iter).toVector();
-      temp.push_back(temp_element);
-    }
+    temp = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<std::string> >();
     return true;
   }