Changes in src/UIElements/CommandLineUI/CommandLineDialog.cpp [0286bc:5079a0]

File:

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

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -15 +15 @@
 #include <Descriptors/MoleculeIdDescriptor.hpp>
 #include "CommandLineUI/CommandLineDialog.hpp"
-
-#include "Actions/Values.hpp"
 
 #include "element.hpp"
@@ -118 +116 @@
 
 bool CommandLineDialog::BooleanCommandLineQuery::handle() {
-  if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    tmp = CommandLineParser::getInstance().vm[getTitle()].as<bool>();
-    return true;
-  } else
-    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;
 }
 
@@ -179 +192 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     IdxOfMol = CommandLineParser::getInstance().vm[getTitle()].as<int>();
-    cout << "IdxOfMol " << IdxOfMol << endl;
-    if (IdxOfMol >= 0)
-      tmp = World::getInstance().getMolecule(MoleculeById(IdxOfMol));
-    else
-      tmp = NULL;
+    tmp = World::getInstance().getMolecule(MoleculeById(IdxOfMol));
     return true;
   } else
@@ -197 +206 @@
 
 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;
+  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
@@ -217 +226 @@
 
 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;
+  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