Changes in src/UIElements/CommandLineUI/CommandLineDialog.cpp [84c494:b9c847]

File:

• src/UIElements/CommandLineUI/CommandLineDialog.cpp (modified) (6 diffs)

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -27 +27 @@
 #include "verbose.hpp"
 #include "World.hpp"
-#include "Box.hpp"
 
 #include "atom.hpp"
@@ -66 +65 @@
 }
 
+void CommandLineDialog::queryStrings(const char* title, vector<string> * target, string _description){
+  registerQuery(new StringsCommandLineQuery(title,target, _description));
+}
+
 void CommandLineDialog::queryAtom(const char* title, atom **target, string _description) {
   registerQuery(new AtomCommandLineQuery(title,target, _description));
@@ -74 +77 @@
 }
 
-void CommandLineDialog::queryVector(const char* title, Vector *target, bool check, string _description) {
-  registerQuery(new VectorCommandLineQuery(title,target,check, _description));
-}
-
-void CommandLineDialog::queryBox(const char* title, Box* cellSize, string _description) {
+void CommandLineDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check, string _description) {
+  registerQuery(new VectorCommandLineQuery(title,target,cellSize,check, _description));
+}
+
+void CommandLineDialog::queryBox(const char* title, double ** const cellSize, string _description) {
   registerQuery(new BoxCommandLineQuery(title,cellSize,_description));
 }
@@ -140 +143 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     tmp = CommandLineParser::getInstance().vm[getTitle()].as<string>();
+    return true;
+  } else {
+    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing string for " << getTitle() << "." << endl);
+    return false;
+  }
+}
+
+CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(string title,vector<string> *_target, string _description) :
+    Dialog::StringsQuery(title,_target, _description)
+{}
+
+CommandLineDialog::StringsCommandLineQuery::~StringsCommandLineQuery() {}
+
+bool CommandLineDialog::StringsCommandLineQuery::handle() {
+  if (CommandLineParser::getInstance().vm.count(getTitle())) {
+    tmp = CommandLineParser::getInstance().vm[getTitle()].as< vector<string> >();
     return true;
   } else {
@@ -203 +222 @@
 }
 
-CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, Vector *_target, bool _check, string _description) :
-    Dialog::VectorQuery(title,_target,_check, _description)
+CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, Vector *_target, const double *const _cellSize, bool _check, string _description) :
+    Dialog::VectorQuery(title,_target,_cellSize,_check, _description)
 {}
 
@@ -225 +244 @@
 
 
-CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, Box* _cellSize, string _description) :
+CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, double ** const _cellSize, string _description) :
     Dialog::BoxQuery(title,_cellSize, _description)
 {}