Changes in src/UIElements/Dialog.hpp [7d9416:2c5765]

File:

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

src/UIElements/Dialog.hpp

@@ -20 +20 @@
 
 #include <boost/filesystem.hpp>
-#include "LinearAlgebra/RealSpaceMatrix.hpp"
+#include "Box.hpp"
 #include "LinearAlgebra/Vector.hpp"
 #include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
-#include "Parameters/Parameter.hpp"
 
 class atom;
-class RealSpaceMatrix;
+class Box;
 class element;
 class molecule;
@@ -156 +155 @@
   virtual ~Dialog();
 
-  template <class T> void query(Parameter<T> &, const char *, std::string = "");
+  template <class T> void query(const char *, std::string = "");
 
   virtual void queryEmpty(const char *, std::string = "")=0;
-  virtual void queryBoolean(Parameter<bool> &, const char *, std::string = "")=0;
-  virtual void queryInt(Parameter<int> &, const char *, std::string = "")=0;
-  virtual void queryInts(Parameter<std::vector<int> > &, const char *, std::string = "")=0;
-  virtual void queryUnsignedInt(Parameter<unsigned int> &, const char *, std::string = "")=0;
-  virtual void queryUnsignedInts(Parameter<std::vector<unsigned int> > &, const char *, std::string = "")=0;
-  virtual void queryDouble(Parameter<double> &, const char*, std::string = "")=0;
-  virtual void queryDoubles(Parameter<std::vector<double> > &, const char*, std::string = "")=0;
-  virtual void queryString(Parameter<std::string> &, const char*, std::string = "")=0;
-  virtual void queryStrings(Parameter<std::vector<std::string> > &, const char*, std::string = "")=0;
-  virtual void queryAtom(Parameter<const atom *> &, const char*,std::string = "")=0;
-  virtual void queryAtoms(Parameter<std::vector<const atom *> > &, const char*,std::string = "")=0;
-  virtual void queryMolecule(Parameter<const molecule *> &, const char*, std::string = "")=0;
-  virtual void queryMolecules(Parameter<std::vector<const molecule *> > &, const char*, std::string = "")=0;
-  virtual void queryVector(Parameter<Vector> &, const char*,bool, std::string = "")=0;
-  virtual void queryVectors(Parameter<std::vector<Vector> > &, const char*,bool, std::string = "")=0;
-  virtual void queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &, const char*, std::string = "")=0;
-  virtual void queryElement(Parameter<const element *> &, const char*, std::string = "")=0;
-  virtual void queryElements(Parameter<std::vector<const element *> > &, const char*, std::string = "")=0;
-  virtual void queryFile(Parameter<boost::filesystem::path> &, const char*, std::string = "")=0;
-  virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const char*, std::string = "")=0;
+  virtual void queryBoolean(const char *, std::string = "")=0;
+  virtual void queryInt(const char *, std::string = "")=0;
+  virtual void queryInts(const char *, std::string = "")=0;
+  virtual void queryUnsignedInt(const char *, std::string = "")=0;
+  virtual void queryUnsignedInts(const char *, std::string = "")=0;
+  virtual void queryDouble(const char*, std::string = "")=0;
+  virtual void queryDoubles(const char*, std::string = "")=0;
+  virtual void queryString(const char*, std::string = "")=0;
+  virtual void queryStrings(const char*, std::string = "")=0;
+  virtual void queryAtom(const char*,std::string = "")=0;
+  virtual void queryAtoms(const char*,std::string = "")=0;
+  virtual void queryMolecule(const char*, std::string = "")=0;
+  virtual void queryMolecules(const char*, std::string = "")=0;
+  virtual void queryVector(const char*,bool, std::string = "")=0;
+  virtual void queryVectors(const char*,bool, std::string = "")=0;
+  virtual void queryBox(const char*, std::string = "")=0;
+  virtual void queryElement(const char*, std::string = "")=0;
+  virtual void queryElements(const char*, std::string = "")=0;
+  virtual void queryFile(const char*, std::string = "")=0;
+  virtual void queryFiles(const char*, std::string = "")=0;
+  virtual void queryRandomNumberDistribution_Parameters(const char*, std::string = "")=0;
 
   virtual bool display();
@@ -265 +265 @@
   class BooleanQuery : public Query {
   public:
-    BooleanQuery(Parameter<bool> &param, std::string title, std::string _description = "");
+    BooleanQuery(std::string title, std::string _description = "");
     virtual ~BooleanQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<bool> &tmp;
+    bool tmp;
   };
 
   class IntQuery : public Query {
   public:
-    IntQuery(Parameter<int> &param, std::string title, std::string _description = "");
+    IntQuery(std::string title, std::string _description = "");
     virtual ~IntQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<int> &tmp;
+    int tmp;
   };
 
   class IntsQuery : public Query {
   public:
-    IntsQuery(Parameter<std::vector<int> > &, std::string title, std::string _description = "");
+    IntsQuery(std::string title, std::string _description = "");
     virtual ~IntsQuery();
     virtual bool handle()=0;
@@ -291 +291 @@
   protected:
     int temp;
-    Parameter<std::vector<int> > &tmp;
+    std::vector<int> tmp;
   };
 
   class UnsignedIntQuery : public Query {
   public:
-    UnsignedIntQuery(Parameter<unsigned int> &, std::string title, std::string _description = "");
+    UnsignedIntQuery(std::string title, std::string _description = "");
     virtual ~UnsignedIntQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<unsigned int> &tmp;
+    unsigned int tmp;
   };
 
   class UnsignedIntsQuery : public Query {
   public:
-    UnsignedIntsQuery(Parameter<std::vector<unsigned int> > &, std::string title, std::string _description = "");
+    UnsignedIntsQuery(std::string title, std::string _description = "");
     virtual ~UnsignedIntsQuery();
     virtual bool handle()=0;
@@ -312 +312 @@
   protected:
     unsigned int temp;
-    Parameter<std::vector<unsigned int> > &tmp;
+    std::vector<unsigned int> tmp;
   };
 
   class DoubleQuery : public Query {
   public:
-    DoubleQuery(Parameter<double> &, std::string title, std::string _description = "");
+    DoubleQuery(std::string title, std::string _description = "");
     virtual ~DoubleQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<double> &tmp;
+    double tmp;
   };
 
   class DoublesQuery : public Query {
   public:
-    DoublesQuery(Parameter<std::vector<double> > &, std::string title, std::string _description = "");
+    DoublesQuery(std::string title, std::string _description = "");
     virtual ~DoublesQuery();
     virtual bool handle()=0;
@@ -333 +333 @@
   protected:
     double temp;
-    Parameter<std::vector<double> > &tmp;
+    std::vector<double> tmp;
   };
 
   class StringQuery : public Query {
   public:
-    StringQuery(Parameter<std::string> &param, std::string title, std::string _description = "");
+    StringQuery(std::string title, std::string _description = "");
     virtual ~StringQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<std::string> &tmp;
+    std::string tmp;
   };
 
   class StringsQuery : public Query {
   public:
-    StringsQuery(Parameter<std::vector<std::string> > &param, std::string title, std::string _description = "");
+    StringsQuery(std::string title, std::string _description = "");
     virtual ~StringsQuery();
     virtual bool handle()=0;
@@ -354 +354 @@
   protected:
     std::string temp;
-    Parameter<std::vector<std::string> > &tmp;
+    std::vector<std::string> tmp;
   };
 
   class MoleculeQuery : public Query {
   public:
-    MoleculeQuery(Parameter<const molecule *> &param, std::string title, std::string _description = "");
+    MoleculeQuery(std::string title, std::string _description = "");
     virtual ~MoleculeQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<const molecule *> &tmp;
+    const molecule *tmp;
   };
 
   class MoleculesQuery : public Query {
   public:
-    MoleculesQuery(Parameter<std::vector<const molecule *> > &param, std::string title, std::string _description = "");
+    MoleculesQuery(std::string title, std::string _description = "");
     virtual ~MoleculesQuery();
     virtual bool handle()=0;
@@ -375 +375 @@
   protected:
     const molecule * temp;
-    Parameter<std::vector<const molecule *> > &tmp;
+    std::vector<const molecule *> tmp;
   };
 
   class AtomQuery : public Query {
   public:
-    AtomQuery(Parameter<const atom *> &param, std::string title, std::string _description = "");
+    AtomQuery(std::string title, std::string _description = "");
     virtual ~AtomQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<const atom *> &tmp;
+    const atom *tmp;
   };
 
   class AtomsQuery : public Query {
   public:
-    AtomsQuery(Parameter<std::vector<const atom *> > &param, std::string title, std::string _description = "");
+    AtomsQuery(std::string title, std::string _description = "");
     virtual ~AtomsQuery();
     virtual bool handle()=0;
@@ -396 +396 @@
   protected:
     const atom *temp;
-    Parameter<std::vector<const atom *> > &tmp;
+    std::vector<const atom *> tmp;
   };
 
   class VectorQuery : public Query {
   public:
-      VectorQuery(Parameter<Vector> &param, std::string title,bool _check, std::string _description = "");
+      VectorQuery(std::string title,bool _check, std::string _description = "");
       virtual ~VectorQuery();
       virtual bool handle()=0;
       virtual void setResult();
     protected:
-      Parameter<Vector> &tmp;
+      Vector tmp;
       bool check;
   };
@@ -412 +412 @@
   class VectorsQuery : public Query {
   public:
-      VectorsQuery(Parameter<std::vector<Vector> > &param, std::string title,bool _check, std::string _description = "");
+      VectorsQuery(std::string title,bool _check, std::string _description = "");
       virtual ~VectorsQuery();
       virtual bool handle()=0;
@@ -418 +418 @@
     protected:
       Vector temp;
-      Parameter<std::vector<Vector> > &tmp;
+      std::vector<Vector> tmp;
       bool check;
   };
 
-  class RealSpaceMatrixQuery : public Query {
-  public:
-      RealSpaceMatrixQuery(Parameter<RealSpaceMatrix> &param, std::string title, std::string _description = "");
-      virtual ~RealSpaceMatrixQuery();
+  class BoxQuery : public Query {
+  public:
+      BoxQuery(std::string title, std::string _description = "");
+      virtual ~BoxQuery();
       virtual bool handle()=0;
       virtual void setResult();
     protected:
-      Parameter<RealSpaceMatrix> &tmp;
+      Box tmp;
   };
 
   class ElementQuery : public Query {
   public:
-    ElementQuery(Parameter<const element*> &param, std::string title, std::string _description = "");
+    ElementQuery(std::string title, std::string _description = "");
     virtual ~ElementQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<const element *> &tmp;
+    const element * tmp;
   };
 
   class ElementsQuery : public Query {
   public:
-    ElementsQuery(Parameter<std::vector<const element *> > &param, std::string title, std::string _description = "");
+    ElementsQuery(std::string title, std::string _description = "");
     virtual ~ElementsQuery();
     virtual bool handle()=0;
@@ -450 +450 @@
   protected:
     const element *temp;
-    Parameter<std::vector<const element *> > &tmp;
+    std::vector<const element *> tmp;
   };
 
   class FileQuery : public Query {
   public:
-    FileQuery(Parameter<boost::filesystem::path> &param, std::string title, std::string _description = "");
+    FileQuery(std::string title, std::string _description = "");
     virtual ~FileQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<boost::filesystem::path> &tmp;
+    boost::filesystem::path tmp;
+  };
+
+  class FilesQuery : public Query {
+  public:
+    FilesQuery(std::string title, std::string _description = "");
+    virtual ~FilesQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    std::vector<boost::filesystem::path> tmp;
   };
 
   class RandomNumberDistribution_ParametersQuery : public Query {
   public:
-    RandomNumberDistribution_ParametersQuery(Parameter<RandomNumberDistribution_Parameters> &param, std::string title, std::string _description = "");
+    RandomNumberDistribution_ParametersQuery(std::string title, std::string _description = "");
     virtual ~RandomNumberDistribution_ParametersQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    Parameter<RandomNumberDistribution_Parameters> &tmp;
+    RandomNumberDistribution_Parameters tmp;
   };