Changes in src/UIElements/TextDialog.cpp [97ebf8:8de8f7]

File:

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

src/UIElements/TextDialog.cpp

@@ -8 +8 @@
 #include <iostream>
 
-#include <Descriptors/AtomDescriptor.hpp>
-#include <Descriptors/AtomIdDescriptor.hpp>
-#include <Descriptors/MoleculeDescriptor.hpp>
-#include <Descriptors/MoleculeIdDescriptor.hpp>
 #include "UIElements/TextDialog.hpp"
 
 #include "World.hpp"
 #include "periodentafel.hpp"
+#include "atom.hpp"
+#include "molecule.hpp"
 #include "log.hpp"
 #include "verbose.hpp"
 
-#include "atom.hpp"
-#include "element.hpp"
-#include "molecule.hpp"
-#include "vector.hpp"
-
 using namespace std;
 
@@ -36 +29 @@
 
 
-void TextDialog::queryEmpty(const char* title, string description){
-  registerQuery(new EmptyTextQuery(title,description));
-}
-
-void TextDialog::queryBoolean(const char* title, bool* target, string description){
-  registerQuery(new BooleanTextQuery(title,target,description));
-}
-
-void TextDialog::queryInt(const char* title, int* target, string description){
-  registerQuery(new IntTextQuery(title,target,description));
-}
-
-void TextDialog::queryDouble(const char* title, double* target, string description){
-  registerQuery(new DoubleTextQuery(title,target,description));
-}
-
-void TextDialog::queryString(const char* title, string* target, string description){
-  registerQuery(new StringTextQuery(title,target,description));
-}
-
-void TextDialog::queryAtom(const char* title, atom **target, string description) {
-  registerQuery(new AtomTextQuery(title,target,description));
-}
-
-void TextDialog::queryMolecule(const char* title, molecule **target, string description) {
-  registerQuery(new MoleculeTextQuery(title,target,description));
-}
-
-void TextDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check, string description) {
-  registerQuery(new VectorTextQuery(title,target,cellSize,check,description));
-}
-
-void TextDialog::queryBox(const char* title,double ** const cellSize, string description) {
-  registerQuery(new BoxTextQuery(title,cellSize,description));
-}
-
-void TextDialog::queryElement(const char* title, const element **target, string description){
-  registerQuery(new ElementTextQuery(title,target,description));
+void TextDialog::queryInt(const char* title, int* target){
+  registerQuery(new IntTextQuery(title,target));
+}
+
+void TextDialog::queryDouble(const char* title, double* target){
+  registerQuery(new DoubleTextQuery(title,target));
+}
+
+void TextDialog::queryString(const char* title, string* target){
+  registerQuery(new StringTextQuery(title,target));
+}
+
+void TextDialog::queryMolecule(const char* title, molecule **target, MoleculeListClass *molecules) {
+  registerQuery(new MoleculeTextQuery(title,target,molecules));
+}
+
+void TextDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check) {
+  registerQuery(new VectorTextQuery(title,target,cellSize,check));
+}
+
+void TextDialog::queryElement(const char* title, const element **target){
+  registerQuery(new ElementTextQuery(title,target));
 }
 
 /************************** Query Infrastructure ************************/
 
-TextDialog::EmptyTextQuery::EmptyTextQuery(string title, std::string _description) :
-    Dialog::EmptyQuery(title,_description)
-{}
-
-TextDialog::EmptyTextQuery::~EmptyTextQuery() {}
-
-bool TextDialog::EmptyTextQuery::handle() {
-  cout << "Message of " << getTitle() << ":\n" << getDescription() << "\n";
-  return true;
-}
-
-TextDialog::IntTextQuery::IntTextQuery(string title, int * _target, std::string _description) :
-    Dialog::IntQuery(title,_target,_description)
+TextDialog::IntTextQuery::IntTextQuery(string title,int *_target) :
+    Dialog::IntQuery(title,_target)
 {}
 
@@ -113 +79 @@
 }
 
-TextDialog::BooleanTextQuery::BooleanTextQuery(string title, bool * _target, std::string _description) :
-    Dialog::BooleanQuery(title,_target,_description)
-{}
-
-TextDialog::BooleanTextQuery::~BooleanTextQuery() {}
-
-bool TextDialog::BooleanTextQuery::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;
-}
-
-TextDialog::StringTextQuery::StringTextQuery(string title,string *_target, std::string _description) :
-    Dialog::StringQuery(title,_target,_description)
+TextDialog::StringTextQuery::StringTextQuery(string title,string *_target) :
+    Dialog::StringQuery(title,_target)
 {}
 
@@ -154 +91 @@
 }
 
-TextDialog::DoubleTextQuery::DoubleTextQuery(string title,double *_target, std::string _description) :
-    Dialog::DoubleQuery(title,_target,_description)
+TextDialog::DoubleTextQuery::DoubleTextQuery(string title,double *_target) :
+    Dialog::DoubleQuery(title,_target)
 {}
 
@@ -177 +114 @@
 }
 
-TextDialog::AtomTextQuery::AtomTextQuery(string title, atom **_target, std::string _description) :
-    Dialog::AtomQuery(title,_target,_description)
-{}
-
-TextDialog::AtomTextQuery::~AtomTextQuery() {}
-
-bool TextDialog::AtomTextQuery::handle() {
-  int idxOfAtom=0;
-  bool badInput = false;
-  do{
-    badInput = false;
-    Log() << Verbose(0) << getTitle();
-    cin >> idxOfAtom;
-    if(cin.fail()){
-      badInput = true;
-      cin.clear();
-      cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
-      Log() << Verbose(0) << "Input was not a number!" << endl;
-      continue;
-    }
-
-    tmp = World::getInstance().getAtom(AtomById(idxOfAtom));
-    if(!tmp && idxOfAtom!=-1){
-      Log() << Verbose(0) << "Invalid Atom Index" << endl;
-      badInput = true;
-    }
-
-  } while(badInput);
-  cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
-  return (idxOfAtom!=-1);
-}
-
-TextDialog::MoleculeTextQuery::MoleculeTextQuery(string title, molecule **_target, std::string _description) :
-    Dialog::MoleculeQuery(title,_target,_description)
+TextDialog::MoleculeTextQuery::MoleculeTextQuery(string title, molecule **_target, MoleculeListClass *_molecules) :
+    Dialog::MoleculeQuery(title,_target,_molecules)
 {}
 
@@ -230 +135 @@
     }
 
-    tmp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
+    tmp = molecules->ReturnIndex(idxOfMol);
     if(!tmp && idxOfMol!=-1){
       Log() << Verbose(0) << "Invalid Molecule Index" << endl;
@@ -241 +146 @@
 }
 
-TextDialog::VectorTextQuery::VectorTextQuery(std::string title, Vector *_target, const double *const _cellSize, bool _check, std::string _description) :
-    Dialog::VectorQuery(title,_target,_cellSize,_check,_description)
+TextDialog::VectorTextQuery::VectorTextQuery(std::string title, Vector *_target, const double *const _cellSize, bool _check) :
+    Dialog::VectorQuery(title,_target,_cellSize,_check)
 {}
 
@@ -249 +154 @@
 
 bool TextDialog::VectorTextQuery::handle() {
-  Log() << Verbose(0) << getTitle();
-
-  char coords[3] = {'x','y','z'};
-  int j = -1;
-  for (int i=0;i<3;i++) {
-    j += i+1;
-    do {
-      Log() << Verbose(0) << coords[i] << "[0.." << cellSize[j] << "]: ";
-      cin >> (*tmp)[i];
-    } while ((((*tmp)[i] < 0) || ((*tmp)[i] >= cellSize[j])) && (check));
-  }
-  return true;
-}
-
-TextDialog::BoxTextQuery::BoxTextQuery(std::string title, double ** const _cellSize, std::string _description) :
-    Dialog::BoxQuery(title,_cellSize,_description)
-{}
-
-TextDialog::BoxTextQuery::~BoxTextQuery()
-{}
-
-bool TextDialog::BoxTextQuery::handle() {
-  Log() << Verbose(0) << getTitle();
-
-  std::string coords[6] = {"xx","xy","xz", "yy", "yz", "zz"};
-  for (int i=0;i<6;i++) {
-    Log() << Verbose(0) << coords[i] << ": ";
-    cin >> tmp[i];
-  }
-  return true;
-}
-
-TextDialog::ElementTextQuery::ElementTextQuery(std::string title, const element **target, std::string _description) :
-    Dialog::ElementQuery(title,target,_description)
+ Log() << Verbose(0) << getTitle();
+ tmp->AskPosition(cellSize,check);
+ return true;
+}
+
+
+TextDialog::ElementTextQuery::ElementTextQuery(std::string title, const element **target) :
+    Dialog::ElementQuery(title,target)
 {}