Changes in src/UIElements/Dialog.hpp [94d131:5605032]

File:

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

src/UIElements/Dialog.hpp

@@ -11 +11 @@
 #include<string>
 #include<list>
-#include<vector>
 
-class atom;
-class element;
+class MoleculeListClass;
 class molecule;
 class Vector;
+class element;
 
 class Dialog
@@ -24 +23 @@
   virtual ~Dialog();
 
-  virtual void queryEmpty(const char *, std::string = "")=0;
-  virtual void queryBoolean(const char *, bool *, std::string = "")=0;
-  virtual void queryInt(const char *, int *, std::string = "")=0;
-  virtual void queryDouble(const char*,double *, std::string = "")=0;
-  virtual void queryString(const char*, std::string *, std::string = "")=0;
-  virtual void queryAtom(const char*,atom**,std::string = "")=0;
-  virtual void queryMolecule(const char*,molecule**, std::string = "")=0;
-  virtual void queryVector(const char*,Vector *,const double *const,bool, std::string = "")=0;
-  virtual void queryBox(const char*,double ** const, std::string = "")=0;
-  virtual void queryElement(const char*, std::vector<element *> *, std::string = "")=0;
+  virtual void queryInt(const char *, int *)=0;
+  virtual void queryDouble(const char*,double *)=0;
+  virtual void queryString(const char*, std::string *)=0;
+  virtual void queryMolecule(const char*,molecule**,MoleculeListClass*)=0;
+  virtual void queryVector(const char*,Vector *,const double *const,bool)=0;
+  virtual void queryElement(const char*,const element **)=0;
 
   virtual bool display();
@@ -50 +45 @@
   //base class for all queries
   class Query {
-    friend class Dialog;
   public:
-    Query(std::string _title, std::string _description = "");
+    Query(std::string _title);
     virtual ~Query();
     virtual bool handle()=0;
@@ -58 +52 @@
   protected:
     const std::string getTitle() const;
-    const std::string getDescription() const;
   private:
-    std::string title;  //!< short title of the query
-    std::string description; //!< longer description for tooltips or for help
-  };
-
-  // Empty Query is just meant for showing text, such as version, help, initial message or alike
-  class EmptyQuery : public Query {
-  public:
-    EmptyQuery(std::string title, std::string _description = "");
-    virtual ~EmptyQuery();
-    virtual bool handle()=0;
-    virtual void setResult();
+    std::string title;
   };
 
   //Specialized classes for certain types. GUI-Types are not specialized at this time
-  class BooleanQuery : public Query {
-  public:
-    BooleanQuery(std::string title,bool *_target, std::string _description = "");
-    virtual ~BooleanQuery();
-    virtual bool handle()=0;
-    virtual void setResult();
-  protected:
-    bool tmp;
-  private:
-    bool *target;
-  };
-
   class IntQuery : public Query {
   public:
-    IntQuery(std::string title,int *_target, std::string _description = "");
+    IntQuery(std::string title,int *_target);
     virtual ~IntQuery();
     virtual bool handle()=0;
@@ -100 +71 @@
   class DoubleQuery : public Query {
   public:
-    DoubleQuery(std::string title,double *_target, std::string _description = "");
+    DoubleQuery(std::string title,double *_target);
     virtual ~DoubleQuery();
     virtual bool handle()=0;
@@ -112 +83 @@
   class StringQuery : public Query {
   public:
-    StringQuery(std::string title,std::string *_target, std::string _description = "");
+    StringQuery(std::string title,std::string *_target);
     virtual ~StringQuery();
     virtual bool handle()=0;
@@ -122 +93 @@
   };
 
+
   class MoleculeQuery : public Query {
   public:
-    MoleculeQuery(std::string title, molecule **_target, std::string _description = "");
+    MoleculeQuery(std::string title, molecule **_target, MoleculeListClass *_molecules);
     virtual ~MoleculeQuery();
     virtual bool handle()=0;
@@ -130 +102 @@
   protected:
     molecule *tmp;
+    MoleculeListClass *molecules;
   private:
     molecule **target;
   };
 
-  class AtomQuery : public Query {
-  public:
-    AtomQuery(std::string title, atom **_target, std::string _description = "");
-    virtual ~AtomQuery();
-    virtual bool handle()=0;
-    virtual void setResult();
-  protected:
-    atom *tmp;
-  private:
-    atom **target;
-  };
-
   class VectorQuery : public Query {
   public:
-      VectorQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check, std::string _description = "");
+      VectorQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check);
       virtual ~VectorQuery();
       virtual bool handle()=0;
@@ -160 +121 @@
   };
 
-  class BoxQuery : public Query {
-  public:
-      BoxQuery(std::string title,double ** const _cellSize, std::string _description = "");
-      virtual ~BoxQuery();
-      virtual bool handle()=0;
-      virtual void setResult();
-    protected:
-      double *tmp;
-    private:
-      double **target;
-  };
-
   class ElementQuery : public Query {
   public:
-    ElementQuery(std::string title, std::vector<element *> *_target, std::string _description = "");
+    ElementQuery(std::string title, const element**_target);
     virtual ~ElementQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    std::vector<element *> elements;
+    const element *tmp;
   private:
-    std::vector<element *> * const target;
+    const element **target;
   };
 
@@ -191 +140 @@
 };
 
-
 #endif /* DIALOG_HPP_ */