Changes in src/UIElements/Dialog.cpp [5605032:6d574a]

File:

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

src/UIElements/Dialog.cpp

@@ -6 +6 @@
  */
 
-#include <cassert>
-
-#include "UIElements/Dialog.hpp"
-
+#include "Helpers/MemDebug.hpp"
+
+#include "Dialog.hpp"
+
+#include "atom.hpp"
+#include "element.hpp"
+#include "molecule.hpp"
 #include "vector.hpp"
 
@@ -36 +39 @@
     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){
@@ -51 +56 @@
 
 // Base class
-Dialog::Query::Query(string _title) :
-    title(_title)
+Dialog::Query::Query(string _title, string _description) :
+    title(_title),
+    description(_description)
 {}
 
@@ -61 +67 @@
 }
 
+const std::string Dialog::Query::getDescription() const{
+  return description;
+}
+// empty Queries
+
+Dialog::EmptyQuery::EmptyQuery(string title, std::string description) :
+    Query(title, description)
+{}
+
+Dialog::EmptyQuery::~EmptyQuery() {}
+
+void Dialog::EmptyQuery::setResult() {
+}
+
 // Int Queries
 
-Dialog::IntQuery::IntQuery(string title,int *_target) :
-    Query(title), target(_target)
+Dialog::IntQuery::IntQuery(string title,int *_target, std::string description) :
+    Query(title, description), target(_target)
 {}
 
@@ -73 +93 @@
 }
 
+// Int Queries
+
+Dialog::BooleanQuery::BooleanQuery(string title,bool *_target, std::string description) :
+    Query(title, description), target(_target)
+{}
+
+Dialog::BooleanQuery::~BooleanQuery() {}
+
+void Dialog::BooleanQuery::setResult() {
+  *target = tmp;
+}
+
 // String Queries
 
-Dialog::StringQuery::StringQuery(string title,string *_target) :
-    Query(title), target(_target)
+Dialog::StringQuery::StringQuery(string title,string *_target, std::string _description) :
+    Query(title, _description), target(_target)
 {}
 
@@ -87 +119 @@
 // Double Queries
 
-Dialog::DoubleQuery::DoubleQuery(string title,double *_target) :
-    Query(title), target(_target)
+Dialog::DoubleQuery::DoubleQuery(string title,double *_target, std::string _description) :
+    Query(title, _description), target(_target)
 {}
 
@@ -98 +130 @@
 
 
+// Atom Queries
+
+Dialog::AtomQuery::AtomQuery(string title, atom **_target, std::string _description) :
+    Query(title, _description),
+    tmp(0),
+    target(_target)
+
+{}
+
+Dialog::AtomQuery::~AtomQuery() {}
+
+void Dialog::AtomQuery::setResult() {
+  *target = tmp;
+}
+
 // Molecule Queries
 
-Dialog::MoleculeQuery::MoleculeQuery(string title, molecule **_target, MoleculeListClass *_molecules) :
-    Query(title),
+Dialog::MoleculeQuery::MoleculeQuery(string title, molecule **_target, std::string _description) :
+    Query(title, _description),
     tmp(0),
-    molecules(_molecules),
     target(_target)
 
@@ -116 +162 @@
 // Vector Queries
 
-Dialog::VectorQuery::VectorQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check) :
-  Query(title),
+Dialog::VectorQuery::VectorQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check, std::string _description) :
+  Query(title, _description),
   cellSize(_cellSize),
   check(_check),
   target(_target)
 {
-tmp = new Vector();
+  tmp = new Vector();
 }
 
@@ -134 +180 @@
 }
 
+// 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()
+{
+  delete[] tmp;
+}
+
+void Dialog::BoxQuery::setResult() {
+  for (int i=0;i<6;i++) {
+    (*target)[i] = tmp[i];
+  }
+}
+
 // Element Queries
-Dialog::ElementQuery::ElementQuery(std::string title, const element **_target) :
-  Query(title),
-  tmp(0),
+Dialog::ElementQuery::ElementQuery(std::string title, std::vector<element *> *_target, std::string _description) :
+  Query(title, _description),
   target(_target)
   {}
@@ -144 +209 @@
 
 void Dialog::ElementQuery::setResult(){
-  *target=tmp;
-}
+  *target=elements;
+}