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

File:

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

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
+#include <cassert>
 #include <iostream>
-#include <vector>
 
 #include <Descriptors/AtomDescriptor.hpp>
@@ -16 +16 @@
 #include <Descriptors/MoleculeIdDescriptor.hpp>
 #include "CommandLineUI/CommandLineDialog.hpp"
-
-#include "Actions/Values.hpp"
 
 #include "element.hpp"
@@ -27 +25 @@
 #include "verbose.hpp"
 #include "World.hpp"
-#include "Box.hpp"
 
 #include "atom.hpp"
@@ -74 +71 @@
 }
 
-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));
 }
 
-void CommandLineDialog::queryElement(const char* title, std::vector<element *> *target, string _description){
+void CommandLineDialog::queryElement(const char* title, const element **target, string _description){
   registerQuery(new ElementCommandLineQuery(title,target, _description));
 }
@@ -109 +106 @@
     tmp = CommandLineParser::getInstance().vm[getTitle()].as<int>();
     return true;
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing integer for " << getTitle() << "." << endl);
-    return false;
-  }
+  } else
+    return false;
 }
 
@@ -122 +117 @@
 
 bool CommandLineDialog::BooleanCommandLineQuery::handle() {
-  if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    tmp = CommandLineParser::getInstance().vm[getTitle()].as<bool>();
-    return true;
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing boolean for " << getTitle() << "." << endl);
-    return false;
-  }
+  bool badInput = false;
+  char input = ' ';
+  do{
+    badInput = false;
+    Log() << Verbose(0) << getTitle();
+    cin >> input;
+    if ((input == 'y' ) || (input == 'Y')) {
+      tmp = true;
+    } else if ((input == 'n' ) || (input == 'N')) {
+      tmp = false;
+    } else {
+      badInput=true;
+      cin.clear();
+      cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+      Log() << Verbose(0) << "Input was not of [yYnN]!" << endl;
+    }
+  } while(badInput);
+  // clear the input buffer of anything still in the line
+  cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+  return true;
 }
 
@@ -141 +149 @@
     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;
-  }
+  } else
+    return false;
 }
 
@@ -157 +163 @@
     tmp = CommandLineParser::getInstance().vm[getTitle()].as<double>();
     return true;
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing double for " << getTitle() << "." << endl);
-    return false;
-  }
+  } else
+    return false;
 }
 
@@ -175 +179 @@
     tmp = World::getInstance().getAtom(AtomById(IdxOfAtom));
     return true;
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing atom for " << getTitle() << "." << endl);
-    return false;
-  }
+  } else
+    return false;
 }
 
@@ -197 +199 @@
       tmp = NULL;
     return true;
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing molecule for " << getTitle() << "." << endl);
-    return false;
-  }
-}
-
-CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, Vector *_target, bool _check, string _description) :
-    Dialog::VectorQuery(title,_target,_check, _description)
+  } else
+    return false;
+}
+
+CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, Vector *_target, const double *const _cellSize, bool _check, string _description) :
+    Dialog::VectorQuery(title,_target,_cellSize,_check, _description)
 {}
 
@@ -211 +211 @@
 
 bool CommandLineDialog::VectorCommandLineQuery::handle() {
-  VectorValue temp;
-  if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    temp = CommandLineParser::getInstance().vm[getTitle()].as< VectorValue >();
-    tmp->at(0) = temp.x;
-    tmp->at(1) = temp.y;
-    tmp->at(2) = temp.z;
-    return true;
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing vector for " << getTitle() << "." << endl);
-    return false;
-  }
-}
-
-
-CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, Box* _cellSize, string _description) :
+  vector<double> temp;
+  if (CommandLineParser::getInstance().vm.count(getTitle())) {
+    temp = CommandLineParser::getInstance().vm[getTitle()].as<vector<double> >();
+    assert((temp.size() == 3) && "Vector from command line does not have three components.");
+    for (int i=0;i<NDIM;i++)
+      tmp->at(i) = temp[i];
+    return true;
+  } else
+    return false;
+}
+
+
+CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, double ** const _cellSize, string _description) :
     Dialog::BoxQuery(title,_cellSize, _description)
 {}
@@ -233 +231 @@
 
 bool CommandLineDialog::BoxCommandLineQuery::handle() {
-  BoxValue temp;
-  if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    temp = CommandLineParser::getInstance().vm[getTitle()].as< BoxValue >();
-    tmp[0] = temp.xx;
-    tmp[1] = temp.xy;
-    tmp[2] = temp.xz;
-    tmp[3] = temp.yy;
-    tmp[4] = temp.yz;
-    tmp[5] = temp.zz;
-    return true;
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing symmetric box matrix for " << getTitle() << "." << endl);
-    return false;
-  }
-}
-
-CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, std::vector<element *> *target, string _description) :
+  vector<double> temp;
+  if (CommandLineParser::getInstance().vm.count(getTitle())) {
+    temp = CommandLineParser::getInstance().vm[getTitle()].as<vector<double> >();
+    assert((temp.size() == 6) && "Symmetric box matrix from command line does not have six components.");
+    for (int i=0;i<6;i++) {
+      tmp[i] = temp[i];
+    }
+    return true;
+  } else
+    return false;
+}
+
+CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, const element **target, string _description) :
     Dialog::ElementQuery(title,target, _description)
 {}
@@ -258 +252 @@
 bool CommandLineDialog::ElementCommandLineQuery::handle() {
   // TODO: vector of ints and removing first is not correctly implemented yet. How to remove from a vector?
-  periodentafel *periode = World::getInstance().getPeriode();
-  element *elemental = NULL;
+  int Z;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     vector<int> AllElements = CommandLineParser::getInstance().vm[getTitle()].as< vector<int> >();
-    for (vector<int>::iterator ZRunner = AllElements.begin(); ZRunner != AllElements.end(); ++ZRunner) {
-      elemental = periode->FindElement(*ZRunner);
-      ASSERT(elemental != NULL, "Invalid element specified in ElementCommandLineQuery");
-      elements.push_back(elemental);
-    }
-    return true;
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing element for " << getTitle() << "." << endl);
-    return false;
-  }
-}
+    vector<int>::iterator ElementRunner = AllElements.begin();
+    Z = *ElementRunner;
+    // TODO: So far, this does not really erase the element in the parsed list.
+    AllElements.erase(ElementRunner);
+    tmp = World::getInstance().getPeriode()->FindElement(Z);
+    return true;
+  } else
+    return false;
+}