Changes in src/UIElements/CommandLineDialog.cpp [97ebf8:86466e]

File:

• src/UIElements/CommandLineDialog.cpp (modified) (8 diffs)

src/UIElements/CommandLineDialog.cpp ¶

@@ -10 +10 @@
 #include <iostream>
 
-#include <Descriptors/AtomDescriptor.hpp>
-#include <Descriptors/AtomIdDescriptor.hpp>
 #include <Descriptors/MoleculeDescriptor.hpp>
 #include <Descriptors/MoleculeIdDescriptor.hpp>
 #include "UIElements/CommandLineDialog.hpp"
 
-#include "element.hpp"
 #include "periodentafel.hpp"
+#include "atom.hpp"
 #include "CommandLineParser.hpp"
 #include "defs.hpp"
+#include "molecule.hpp"
 #include "log.hpp"
-#include "periodentafel.hpp"
 #include "verbose.hpp"
 #include "World.hpp"
-
-#include "atom.hpp"
-#include "element.hpp"
-#include "molecule.hpp"
-#include "vector.hpp"
 
 using namespace std;
@@ -50 +43 @@
 }
 
-void CommandLineDialog::queryBoolean(const char* title, bool* target, string _description){
-  registerQuery(new BooleanCommandLineQuery(title,target, _description));
-}
-
 void CommandLineDialog::queryDouble(const char* title, double* target, string _description){
   registerQuery(new DoubleCommandLineQuery(title,target, _description));
@@ -62 +51 @@
 }
 
-void CommandLineDialog::queryAtom(const char* title, atom **target, string _description) {
-  registerQuery(new AtomCommandLineQuery(title,target, _description));
-}
-
-void CommandLineDialog::queryMolecule(const char* title, molecule **target, string _description) {
-  registerQuery(new MoleculeCommandLineQuery(title,target, _description));
+void CommandLineDialog::queryMolecule(const char* title, molecule **target, MoleculeListClass *molecules, string _description) {
+  registerQuery(new MoleculeCommandLineQuery(title,target,molecules, _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));
 }
 
@@ -109 +90 @@
 }
 
-CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(string title,bool *_target, string _description) :
-    Dialog::BooleanQuery(title,_target, _description)
-{}
-
-CommandLineDialog::BooleanCommandLineQuery::~BooleanCommandLineQuery() {}
-
-bool CommandLineDialog::BooleanCommandLineQuery::handle() {
-  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;
-}
-
 CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title,string *_target, string _description) :
     Dialog::StringQuery(title,_target, _description)
@@ -166 +118 @@
 }
 
-CommandLineDialog::AtomCommandLineQuery::AtomCommandLineQuery(string title, atom **_target, string _description) :
-    Dialog::AtomQuery(title,_target, _description)
-{}
-
-CommandLineDialog::AtomCommandLineQuery::~AtomCommandLineQuery() {}
-
-bool CommandLineDialog::AtomCommandLineQuery::handle() {
-  int IdxOfAtom = -1;
-  if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    IdxOfAtom = CommandLineParser::getInstance().vm[getTitle()].as<int>();
-    tmp = World::getInstance().getAtom(AtomById(IdxOfAtom));
-    return true;
-  } else
-    return false;
-}
-
-CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, molecule **_target, string _description) :
-    Dialog::MoleculeQuery(title,_target, _description)
+CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, molecule **_target, MoleculeListClass *_molecules, string _description) :
+    Dialog::MoleculeQuery(title,_target,_molecules, _description)
 {}
 
@@ -210 +146 @@
     temp = CommandLineParser::getInstance().vm[getTitle()].as<vector<double> >();
     assert((temp.size() == 3) && "Vector from command line does not have three components.");
+    tmp = new Vector;
     for (int i=0;i<NDIM;i++)
       tmp->at(i) = temp[i];
@@ -217 +154 @@
 }
 
-
-CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, double ** const _cellSize, string _description) :
-    Dialog::BoxQuery(title,_cellSize, _description)
-{}
-
-CommandLineDialog::BoxCommandLineQuery::~BoxCommandLineQuery()
-{}
-
-bool CommandLineDialog::BoxCommandLineQuery::handle() {
-  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) :
@@ -245 +163 @@
 
 bool CommandLineDialog::ElementCommandLineQuery::handle() {
-  // TODO: vector of ints and removing first is not correctly implemented yet. How to remove from a vector?
-  int Z;
+  int Z = -1;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    vector<int> AllElements = CommandLineParser::getInstance().vm[getTitle()].as< vector<int> >();
-    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);
+    Z = CommandLineParser::getInstance().vm[getTitle()].as<int>();
     tmp = World::getInstance().getPeriode()->FindElement(Z);
     return true;