Changes in src/UIElements/TextUI/TextDialog.cpp [84c494:cd8e55]

File:

• src/UIElements/TextUI/TextDialog.cpp (modified) (6 diffs)

src/UIElements/TextUI/TextDialog.cpp

@@ -25 +25 @@
 #include "molecule.hpp"
 #include "vector.hpp"
-#include "Matrix.hpp"
-#include "Box.hpp"
 
 using namespace std;
@@ -60 +58 @@
 }
 
+void TextDialog::queryStrings(const char* title, vector<string>* target, string description){
+  registerQuery(new StringsTextQuery(title,target,description));
+}
+
 void TextDialog::queryAtom(const char* title, atom **target, string description) {
   registerQuery(new AtomTextQuery(title,target,description));
@@ -68 +70 @@
 }
 
-void TextDialog::queryVector(const char* title, Vector *target, bool check, string description) {
-  registerQuery(new VectorTextQuery(title,target,check,description));
-}
-
-void TextDialog::queryBox(const char* title,Box* cellSize, string 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));
 }
@@ -158 +160 @@
 }
 
+TextDialog::StringsTextQuery::StringsTextQuery(string title,vector<string> *_target, std::string _description) :
+    Dialog::StringsQuery(title,_target,_description)
+{}
+
+TextDialog::StringsTextQuery::~StringsTextQuery() {}
+
+bool TextDialog::StringsTextQuery::handle() {
+  Log() << Verbose(0) << getTitle();
+  getline(cin,temp);
+  // dissect by ","
+  string::iterator olditer = temp.begin();
+  for(string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
+    if (*iter == ' ') {
+      tmp.push_back(string(iter, olditer));
+      olditer = iter;
+    }
+  }
+  if (olditer != temp.begin())  // insert last part also
+    tmp.push_back(string(olditer, temp.end()));
+
+  return true;
+}
+
 TextDialog::DoubleTextQuery::DoubleTextQuery(string title,double *_target, std::string _description) :
     Dialog::DoubleQuery(title,_target,_description)
@@ -245 +270 @@
 }
 
-TextDialog::VectorTextQuery::VectorTextQuery(std::string title, Vector *_target, bool _check, std::string _description) :
-    Dialog::VectorQuery(title,_target,_check,_description)
+TextDialog::VectorTextQuery::VectorTextQuery(std::string title, Vector *_target, const double *const _cellSize, bool _check, std::string _description) :
+    Dialog::VectorQuery(title,_target,_cellSize,_check,_description)
 {}
 
@@ -255 +280 @@
   Log() << Verbose(0) << getTitle();
 
-  const Matrix &M = World::getInstance().getDomain().getM();
   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.." << M.at(i,i) << "]: ";
+      Log() << Verbose(0) << coords[i] << "[0.." << cellSize[j] << "]: ";
       cin >> (*tmp)[i];
-    } while ((((*tmp)[i] < 0) || ((*tmp)[i] >= M.at(i,i))) && (check));
+    } while ((((*tmp)[i] < 0) || ((*tmp)[i] >= cellSize[j])) && (check));
   }
   return true;
 }
 
-TextDialog::BoxTextQuery::BoxTextQuery(std::string title, Box* _cellSize, std::string _description) :
+TextDialog::BoxTextQuery::BoxTextQuery(std::string title, double ** const _cellSize, std::string _description) :
     Dialog::BoxQuery(title,_cellSize,_description)
 {}