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

File:

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

src/UIElements/TextUI/TextDialog.cpp

@@ -25 +25 @@
 #include "molecule.hpp"
 #include "vector.hpp"
+#include "Matrix.hpp"
+#include "Box.hpp"
 
 using namespace std;
@@ -66 +68 @@
 }
 
-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) {
+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) {
   registerQuery(new BoxTextQuery(title,cellSize,description));
 }
 
-void TextDialog::queryElement(const char* title, const element **target, string description){
+void TextDialog::queryElement(const char* title, std::vector<element *> *target, string description){
   registerQuery(new ElementTextQuery(title,target,description));
 }
@@ -243 +245 @@
 }
 
-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, bool _check, std::string _description) :
+    Dialog::VectorQuery(title,_target,_check,_description)
 {}
 
@@ -253 +255 @@
   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.." << cellSize[j] << "]: ";
+      Log() << Verbose(0) << coords[i] << "[0.." << M.at(i,i) << "]: ";
       cin >> (*tmp)[i];
-    } while ((((*tmp)[i] < 0) || ((*tmp)[i] >= cellSize[j])) && (check));
+    } while ((((*tmp)[i] < 0) || ((*tmp)[i] >= M.at(i,i))) && (check));
   }
   return true;
 }
 
-TextDialog::BoxTextQuery::BoxTextQuery(std::string title, double ** const _cellSize, std::string _description) :
+TextDialog::BoxTextQuery::BoxTextQuery(std::string title, Box* _cellSize, std::string _description) :
     Dialog::BoxQuery(title,_cellSize,_description)
 {}
@@ -283 +284 @@
 }
 
-TextDialog::ElementTextQuery::ElementTextQuery(std::string title, const element **target, std::string _description) :
-    Dialog::ElementQuery(title,target,_description)
+TextDialog::ElementTextQuery::ElementTextQuery(std::string title, std::vector<element *> *_target, std::string _description) :
+    Dialog::ElementQuery(title,_target,_description)
 {}
 
@@ -293 +294 @@
   bool badInput=false;
   bool aborted = false;
+  element * tmp = NULL;
   do{
     badInput = false;
@@ -309 +311 @@
           Log() << Verbose(0) << "No element with this atomic number!" << endl;
           badInput = true;
+        } else {
+          elements.push_back(tmp);
         }
       }
@@ -331 +335 @@
           Log() << Verbose(0) << "No element with this shorthand!" << endl;
           badInput = true;
+        } else {
+          elements.push_back(tmp);
         }
       }