Changes in src/UIElements/Dialog.cpp [112b09:c508ef5]

File:

• src/UIElements/Dialog.cpp (modified) (12 diffs)

src/UIElements/Dialog.cpp

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
-#include <cassert>
-
 #include "Dialog.hpp"
-
+#include "ValueStorage.hpp"
+
+#include "verbose.hpp"
 #include "atom.hpp"
 #include "element.hpp"
 #include "molecule.hpp"
 #include "vector.hpp"
+#include "Matrix.hpp"
+#include "Box.hpp"
 
 using namespace std;
@@ -36 +38 @@
 
 bool Dialog::display(){
+  if(checkAll()){
+    setAll();
+    return true;
+  }
+  else{
+    return false;
+  }
+}
+
+bool Dialog::checkAll(){
   list<Query*>::iterator iter;
   bool retval = true;
@@ -41 +53 @@
     retval &= (*iter)->handle();
     // if any query fails (is canceled), we can end the handling process
-    if(!retval)
+    if(!retval) {
+      DoeLog(1) && (eLog() << Verbose(1) << "The following query failed: " << (**iter).getTitle() << "." << endl);
       break;
-  }
-  if (retval){
-    // if all queries succeeded we can set the targets to appropriate values
-    for(iter=queries.begin(); iter!=queries.end(); iter++) {
-      (*iter)->setResult();
     }
   }
   return retval;
+}
+
+void Dialog::setAll(){
+  list<Query*>::iterator iter;
+  for(iter=queries.begin(); iter!=queries.end(); iter++) {
+    (*iter)->setResult();
+  }
+}
+
+bool Dialog::hasQueries(){
+  return queries.size();
 }
 
@@ -83 +102 @@
 // Int Queries
 
-Dialog::IntQuery::IntQuery(string title,int *_target, std::string description) :
-    Query(title, description), target(_target)
+Dialog::IntQuery::IntQuery(string title, std::string description) :
+    Query(title, description)
 {}
 
@@ -90 +109 @@
 
 void Dialog::IntQuery::setResult() {
-  *target = tmp;
-}
-
-// Int Queries
-
-Dialog::BooleanQuery::BooleanQuery(string title,bool *_target, std::string description) :
-    Query(title, description), target(_target)
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}
+
+// Ints Queries
+
+Dialog::IntsQuery::IntsQuery(string title, std::string description) :
+    Query(title, description)
+{}
+
+Dialog::IntsQuery::~IntsQuery() {}
+
+void Dialog::IntsQuery::setResult() {
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}
+
+// Bool Queries
+
+Dialog::BooleanQuery::BooleanQuery(string title,std::string description) :
+    Query(title, description)
 {}
 
@@ -102 +133 @@
 
 void Dialog::BooleanQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 
 // String Queries
 
-Dialog::StringQuery::StringQuery(string title,string *_target, std::string _description) :
-    Query(title, _description), target(_target)
+Dialog::StringQuery::StringQuery(string title,std::string _description) :
+    Query(title, _description)
 {}
 
@@ -114 +145 @@
 
 void Dialog::StringQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}
+
+// Strings Queries
+
+Dialog::StringsQuery::StringsQuery(string title,std::string _description) :
+    Query(title, _description)
+{}
+
+Dialog::StringsQuery::~StringsQuery() {};
+
+void Dialog::StringsQuery::setResult() {
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 
 // Double Queries
 
-Dialog::DoubleQuery::DoubleQuery(string title,double *_target, std::string _description) :
-    Query(title, _description), target(_target)
+Dialog::DoubleQuery::DoubleQuery(string title, std::string _description) :
+    Query(title, _description)
 {}
 
@@ -126 +169 @@
 
 void Dialog::DoubleQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}
+
+// Doubles Queries
+
+Dialog::DoublesQuery::DoublesQuery(string title, std::string _description) :
+    Query(title, _description)
+{}
+
+Dialog::DoublesQuery::~DoublesQuery() {};
+
+void Dialog::DoublesQuery::setResult() {
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 
@@ -132 +187 @@
 // Atom Queries
 
-Dialog::AtomQuery::AtomQuery(string title, atom **_target, std::string _description) :
+Dialog::AtomQuery::AtomQuery(string title, std::string _description) :
     Query(title, _description),
-    tmp(0),
-    target(_target)
-
+    tmp(0)
 {}
 
@@ -142 +195 @@
 
 void Dialog::AtomQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}
+
+// Atoms Queries
+
+Dialog::AtomsQuery::AtomsQuery(string title, std::string _description) :
+    Query(title, _description),
+    tmp(0)
+{}
+
+Dialog::AtomsQuery::~AtomsQuery() {}
+
+void Dialog::AtomsQuery::setResult() {
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 
 // Molecule Queries
 
-Dialog::MoleculeQuery::MoleculeQuery(string title, molecule **_target, std::string _description) :
+Dialog::MoleculeQuery::MoleculeQuery(string title, std::string _description) :
     Query(title, _description),
-    tmp(0),
-    target(_target)
-
+    tmp(0)
 {}
 
@@ -157 +221 @@
 
 void Dialog::MoleculeQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}
+
+// Molecules Queries
+
+Dialog::MoleculesQuery::MoleculesQuery(string title, std::string _description) :
+    Query(title, _description),
+    tmp(0)
+{}
+
+Dialog::MoleculesQuery::~MoleculesQuery() {}
+
+void Dialog::MoleculesQuery::setResult() {
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 
 // Vector Queries
 
-Dialog::VectorQuery::VectorQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check, std::string _description) :
+Dialog::VectorQuery::VectorQuery(std::string title,bool _check, std::string _description) :
   Query(title, _description),
-  cellSize(_cellSize),
-  check(_check),
-  target(_target)
-{
-  tmp = new Vector();
-}
+  check(_check)
+{}
 
 Dialog::VectorQuery::~VectorQuery()
-{
-  delete tmp;
-}
+{}
 
 void Dialog::VectorQuery::setResult() {
-  *target = *tmp;
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}
+
+// Vectors Queries
+
+Dialog::VectorsQuery::VectorsQuery(std::string title,bool _check, std::string _description) :
+  Query(title, _description),
+  check(_check)
+{}
+
+Dialog::VectorsQuery::~VectorsQuery()
+{}
+
+void Dialog::VectorsQuery::setResult() {
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 
 // Box Queries
 
-Dialog::BoxQuery::BoxQuery(std::string title, double ** const _cellSize, std::string _description) :
-  Query(title, _description),
-  target(_cellSize)
-{
-    tmp = new double[6];
-}
+Dialog::BoxQuery::BoxQuery(std::string title, std::string _description) :
+  Query(title, _description)
+{}
 
 Dialog::BoxQuery::~BoxQuery()
-{
-  delete[] tmp;
-}
+{}
 
 void Dialog::BoxQuery::setResult() {
-  for (int i=0;i<6;i++) {
-    (*target)[i] = tmp[i];
-  }
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 
 // Element Queries
-Dialog::ElementQuery::ElementQuery(std::string title, const element **_target, std::string _description) :
-  Query(title, _description),
-  tmp(0),
-  target(_target)
+Dialog::ElementQuery::ElementQuery(std::string title, std::string _description) :
+  Query(title, _description)
   {}
 
@@ -210 +286 @@
 
 void Dialog::ElementQuery::setResult(){
-  *target=tmp;
-}
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}
+
+// Elements Queries
+Dialog::ElementsQuery::ElementsQuery(std::string title, std::string _description) :
+  Query(title, _description)
+  {}
+
+Dialog::ElementsQuery::~ElementsQuery(){}
+
+void Dialog::ElementsQuery::setResult(){
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}