Changeset 75dc28 for src/UIElements

Timestamp:

Jul 22, 2010, 7:37:46 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

ca1ba5

Parents:

d02e07

git-author:

Frederik Heber <heber@…> (07/22/10 19:36:18)

git-committer:

Frederik Heber <heber@…> (07/22/10 19:37:46)

Message:

Dialog->query...() don't need a _target anymore,

• new class ValueStorage servers as a mediator to MapOfActions to relax inter-dependencies.
• setResult() now puts the value as string into ValueStorage.
• all class Dialog and derivatives don't have a _target in their functions and bodies anymore.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineDialog.cpp (modified) (11 diffs)
• CommandLineUI/CommandLineDialog.hpp (modified) (11 diffs)
• Dialog.cpp (modified) (13 diffs)
• Dialog.hpp (modified) (12 diffs)
• Makefile.am (modified) (2 diffs)
• TextUI/TextDialog.cpp (modified) (11 diffs)
• TextUI/TextDialog.hpp (modified) (11 diffs)
• ValueStorage.cpp (added)
• ValueStorage.hpp (added)

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -50 +50 @@
 }
 
-void CommandLineDialog::queryInt(const char* title, int* target, string _description){
-  registerQuery(new IntCommandLineQuery(title,target, _description));
-}
-
-void CommandLineDialog::queryBoolean(const char* title, bool* target, string _description){
-  registerQuery(new BooleanCommandLineQuery(title,target, _description));
-}
-
-void CommandLineDialog::queryDouble(const char* title, double* target, string _description){
-  registerQuery(new DoubleCommandLineQuery(title,target, _description));
-}
-
-void CommandLineDialog::queryString(const char* title, string* target, string _description){
-  registerQuery(new StringCommandLineQuery(title,target, _description));
-}
-
-void CommandLineDialog::queryStrings(const char* title, vector<string> * target, string _description){
-  registerQuery(new StringsCommandLineQuery(title,target, _description));
-}
-
-void CommandLineDialog::queryAtom(const char* title, atom **target, string _description) {
-  registerQuery(new AtomCommandLineQuery(title,target, _description));
-}
-
-void CommandLineDialog::queryMolecule(const char* title, molecule **target, string _description) {
-  registerQuery(new MoleculeCommandLineQuery(title,target, _description));
-}
-
-void CommandLineDialog::queryVector(const char* title, Vector *target, bool check, string _description) {
-  registerQuery(new VectorCommandLineQuery(title,target,check, _description));
-}
-
-void CommandLineDialog::queryBox(const char* title, Box* cellSize, string _description) {
-  registerQuery(new BoxCommandLineQuery(title,cellSize,_description));
-}
-
-void CommandLineDialog::queryElement(const char* title, std::vector<element *> *target, string _description){
-  registerQuery(new ElementCommandLineQuery(title,target, _description));
+void CommandLineDialog::queryInt(const char* title, string _description){
+  registerQuery(new IntCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryBoolean(const char* title, string _description){
+  registerQuery(new BooleanCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryDouble(const char* title, string _description){
+  registerQuery(new DoubleCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryString(const char* title, string _description){
+  registerQuery(new StringCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryStrings(const char* title, string _description){
+  registerQuery(new StringsCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryAtom(const char* title, string _description) {
+  registerQuery(new AtomCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryMolecule(const char* title, string _description) {
+  registerQuery(new MoleculeCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryVector(const char* title, bool check, string _description) {
+  registerQuery(new VectorCommandLineQuery(title,check, _description));
+}
+
+void CommandLineDialog::queryBox(const char* title, string _description) {
+  registerQuery(new BoxCommandLineQuery(title,_description));
+}
+
+void CommandLineDialog::queryElement(const char* title, string _description){
+  registerQuery(new ElementCommandLineQuery(title, _description));
 }
 
@@ -103 +103 @@
 }
 
-CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(string title,int *_target, string _description) :
-    Dialog::IntQuery(title,_target, _description)
+CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(string title, string _description) :
+    Dialog::IntQuery(title, _description)
 {}
 
@@ -119 +119 @@
 }
 
-CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(string title,bool *_target, string _description) :
-    Dialog::BooleanQuery(title,_target, _description)
+CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(string title, string _description) :
+    Dialog::BooleanQuery(title, _description)
 {}
 
@@ -135 +135 @@
 }
 
-CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title,string *_target, string _description) :
-    Dialog::StringQuery(title,_target, _description)
+CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title, string _description) :
+    Dialog::StringQuery(title, _description)
 {}
 
@@ -151 +151 @@
 }
 
-CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(string title,vector<string> *_target, string _description) :
-    Dialog::StringsQuery(title,_target, _description)
+CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(string title, string _description) :
+    Dialog::StringsQuery(title, _description)
 {}
 
@@ -167 +167 @@
 }
 
-CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(string title,double *_target, string _description) :
-    Dialog::DoubleQuery(title,_target, _description)
+CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(string title, string _description) :
+    Dialog::DoubleQuery(title, _description)
 {}
 
@@ -183 +183 @@
 }
 
-CommandLineDialog::AtomCommandLineQuery::AtomCommandLineQuery(string title, atom **_target, string _description) :
-    Dialog::AtomQuery(title,_target, _description)
+CommandLineDialog::AtomCommandLineQuery::AtomCommandLineQuery(string title, string _description) :
+    Dialog::AtomQuery(title, _description)
 {}
 
@@ -201 +201 @@
 }
 
-CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, molecule **_target, string _description) :
-    Dialog::MoleculeQuery(title,_target, _description)
+CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, string _description) :
+    Dialog::MoleculeQuery(title, _description)
 {}
 
@@ -223 +223 @@
 }
 
-CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, Vector *_target, bool _check, string _description) :
-    Dialog::VectorQuery(title,_target,_check, _description)
+CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, bool _check, string _description) :
+    Dialog::VectorQuery(title,_check, _description)
 {}
 
@@ -245 +245 @@
 
 
-CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, Box* _cellSize, string _description) :
-    Dialog::BoxQuery(title,_cellSize, _description)
+CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, string _description) :
+    Dialog::BoxQuery(title, _description)
 {}
 
@@ -269 +269 @@
 }
 
-CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, std::vector<element *> *target, string _description) :
+CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, string _description) :
     Dialog::ElementQuery(title,target, _description)
 {}

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -28 +28 @@
 
   virtual void queryEmpty(const char *, std::string = "");
-  virtual void queryInt(const char *, int *, std::string = "");
-  virtual void queryBoolean(const char *, bool *, std::string = "");
-  virtual void queryString(const char*, std::string *, std::string = "");
-  virtual void queryStrings(const char*, std::vector<std::string> *, std::string = "");
-  virtual void queryDouble(const char*, double*, std::string = "");
-  virtual void queryAtom(const char*,atom**, std::string = "");
-  virtual void queryMolecule(const char*,molecule**,std::string = "");
-  virtual void queryVector(const char*,Vector *,bool, std::string = "");
-  virtual void queryBox(const char*,Box *, std::string = "");
-  virtual void queryElement(const char*, std::vector<element *> *, std::string = "");
+  virtual void queryInt(const char *, std::string = "");
+  virtual void queryBoolean(const char *, std::string = "");
+  virtual void queryString(const char*, std::string = "");
+  virtual void queryStrings(const char*, std::string = "");
+  virtual void queryDouble(const char*, std::string = "");
+  virtual void queryAtom(const char*, std::string = "");
+  virtual void queryMolecule(const char*, std::string = "");
+  virtual void queryVector(const char*, bool, std::string = "");
+  virtual void queryBox(const char*, std::string = "");
+  virtual void queryElement(const char*, std::string = "");
 
 protected:
@@ -50 +50 @@
   class IntCommandLineQuery : public Dialog::IntQuery {
   public:
-    IntCommandLineQuery(std::string title, int *_target, std::string _description = "");
+    IntCommandLineQuery(std::string title, std::string _description = "");
     virtual ~IntCommandLineQuery();
     virtual bool handle();
@@ -57 +57 @@
   class BooleanCommandLineQuery : public Dialog::BooleanQuery {
   public:
-    BooleanCommandLineQuery(std::string title, bool *_target, std::string _description = "");
+    BooleanCommandLineQuery(std::string title, std::string _description = "");
     virtual ~BooleanCommandLineQuery();
     virtual bool handle();
@@ -64 +64 @@
   class DoubleCommandLineQuery : public Dialog::DoubleQuery {
   public:
-    DoubleCommandLineQuery(std::string title, double *_target, std::string _description = "");
+    DoubleCommandLineQuery(std::string title, std::string _description = "");
     virtual ~DoubleCommandLineQuery();
     virtual bool handle();
@@ -71 +71 @@
   class StringCommandLineQuery : public Dialog::StringQuery {
   public:
-    StringCommandLineQuery(std::string title, std::string *_target, std::string _description = "");
+    StringCommandLineQuery(std::string title, std::string _description = "");
     virtual ~StringCommandLineQuery();
     virtual bool handle();
@@ -78 +78 @@
   class StringsCommandLineQuery : public Dialog::StringsQuery {
   public:
-    StringsCommandLineQuery(std::string title, std::vector<std::string> *_target, std::string _description = "");
+    StringsCommandLineQuery(std::string title, std::string _description = "");
     virtual ~StringsCommandLineQuery();
     virtual bool handle();
@@ -85 +85 @@
   class AtomCommandLineQuery : public Dialog::AtomQuery {
   public:
-    AtomCommandLineQuery(std::string title, atom **_target, std::string _description = "");
+    AtomCommandLineQuery(std::string title, std::string _description = "");
     virtual ~AtomCommandLineQuery();
     virtual bool handle();
@@ -92 +92 @@
   class MoleculeCommandLineQuery : public Dialog::MoleculeQuery {
   public:
-    MoleculeCommandLineQuery(std::string title, molecule **_target, std::string _description = "");
+    MoleculeCommandLineQuery(std::string title, std::string _description = "");
     virtual ~MoleculeCommandLineQuery();
     virtual bool handle();
@@ -99 +99 @@
   class VectorCommandLineQuery : public Dialog::VectorQuery {
   public:
-    VectorCommandLineQuery(std::string title,Vector *_target,bool _check, std::string _description = "");
+    VectorCommandLineQuery(std::string title,bool _check, std::string _description = "");
     virtual ~VectorCommandLineQuery();
     virtual bool handle();
@@ -106 +106 @@
   class BoxCommandLineQuery : public Dialog::BoxQuery {
   public:
-    BoxCommandLineQuery(std::string title,Box* _cellSize, std::string _description = "");
+    BoxCommandLineQuery(std::string title, std::string _description = "");
     virtual ~BoxCommandLineQuery();
     virtual bool handle();
@@ -113 +113 @@
   class ElementCommandLineQuery : public Dialog::ElementQuery {
   public:
-    ElementCommandLineQuery(std::string title, std::vector<element *> *_target, std::string _description = "");
+    ElementCommandLineQuery(std::string title, std::string _description = "");
     virtual ~ElementCommandLineQuery();
     virtual bool handle();

src/UIElements/Dialog.cpp

@@ -9 +9 @@
 
 #include "Dialog.hpp"
+#include "ValueStorage.hpp"
 
 #include "verbose.hpp"
@@ -97 +98 @@
 // 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)
 {}
 
@@ -104 +105 @@
 
 void Dialog::IntQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title, tmp);
 }
 
 // Int Queries
 
-Dialog::BooleanQuery::BooleanQuery(string title,bool *_target, std::string description) :
-    Query(title, description), target(_target)
+Dialog::BooleanQuery::BooleanQuery(string title,std::string description) :
+    Query(title, description)
 {}
 
@@ -116 +117 @@
 
 void Dialog::BooleanQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title, 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)
 {}
 
@@ -128 +129 @@
 
 void Dialog::StringQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title, tmp);
 }
 
 // Strings Queries
 
-Dialog::StringsQuery::StringsQuery(string title,vector<string> *_target, std::string _description) :
-    Query(title, _description), target(_target)
+Dialog::StringsQuery::StringsQuery(string title,std::string _description) :
+    Query(title, _description)
 {}
 
@@ -140 +141 @@
 
 void Dialog::StringsQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title, 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)
 {}
 
@@ -152 +153 @@
 
 void Dialog::DoubleQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title, tmp);
 }
 
@@ -158 +159 @@
 // 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)
 {}
 
@@ -168 +167 @@
 
 void Dialog::AtomQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title, 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)
 {}
 
@@ -183 +180 @@
 
 void Dialog::MoleculeQuery::setResult() {
-  *target = tmp;
+  ValueStorage::getInstance().setCurrentValue(title, tmp);
 }
 
 // Vector Queries
 
-Dialog::VectorQuery::VectorQuery(std::string title,Vector *_target,bool _check, std::string _description) :
+Dialog::VectorQuery::VectorQuery(std::string title,bool _check, std::string _description) :
   Query(title, _description),
-  check(_check),
-  target(_target)
+  check(_check)
 {
   tmp = new Vector();
@@ -202 +198 @@
 
 void Dialog::VectorQuery::setResult() {
-  *target = *tmp;
+  ValueStorage::getInstance().setCurrentValue(title, tmp);
 }
 
 // Box Queries
 
-Dialog::BoxQuery::BoxQuery(std::string title, Box* _cellSize, std::string _description) :
-  Query(title, _description),
-  target(_cellSize)
+Dialog::BoxQuery::BoxQuery(std::string title, std::string _description) :
+  Query(title, _description)
 {
     tmp = new double[6];
@@ -220 +215 @@
 
 void Dialog::BoxQuery::setResult() {
-  (*target)= ReturnFullMatrixforSymmetric(tmp);
+  ValueStorage::getInstance().setCurrentValue(title, tmp);
 }
 
 // Element Queries
-Dialog::ElementQuery::ElementQuery(std::string title, std::vector<element *> *_target, std::string _description) :
-  Query(title, _description),
-  target(_target)
+Dialog::ElementQuery::ElementQuery(std::string title, std::string _description) :
+  Query(title, _description)
   {}
 
@@ -232 +226 @@
 
 void Dialog::ElementQuery::setResult(){
-  *target=elements;
-}
+  ValueStorage::getInstance().setCurrentValue(title, tmp);
+}

src/UIElements/Dialog.hpp

@@ -37 +37 @@
 
   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 queryStrings(const char*, std::vector<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 *,bool, std::string = "")=0;
-  virtual void queryBox(const char*,Box*, std::string = "")=0;
-  virtual void queryElement(const char*, std::vector<element *> *, std::string = "")=0;
+  virtual void queryBoolean(const char *, std::string = "")=0;
+  virtual void queryInt(const char *, std::string = "")=0;
+  virtual void queryDouble(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 queryMolecule(const char*, std::string = "")=0;
+  virtual void queryVector(const char*,bool, std::string = "")=0;
+  virtual void queryBox(const char*, std::string = "")=0;
+  virtual void queryElement(const char*, std::string = "")=0;
 
   virtual bool display();
@@ -92 +92 @@
   class BooleanQuery : public Query {
   public:
-    BooleanQuery(std::string title,bool *_target, std::string _description = "");
+    BooleanQuery(std::string title, std::string _description = "");
     virtual ~BooleanQuery();
     virtual bool handle()=0;
@@ -98 +98 @@
   protected:
     bool tmp;
-  private:
-    bool *target;
   };
 
   class IntQuery : public Query {
   public:
-    IntQuery(std::string title,int *_target, std::string _description = "");
+    IntQuery(std::string title, std::string _description = "");
     virtual ~IntQuery();
     virtual bool handle()=0;
@@ -110 +108 @@
   protected:
     int tmp;
-  private:
-    int *target;
   };
 
   class DoubleQuery : public Query {
   public:
-    DoubleQuery(std::string title,double *_target, std::string _description = "");
+    DoubleQuery(std::string title, std::string _description = "");
     virtual ~DoubleQuery();
     virtual bool handle()=0;
@@ -122 +118 @@
   protected:
     double tmp;
-  private:
-    double *target;
   };
 
   class StringQuery : public Query {
   public:
-    StringQuery(std::string title,std::string *_target, std::string _description = "");
+    StringQuery(std::string title, std::string _description = "");
     virtual ~StringQuery();
     virtual bool handle()=0;
@@ -134 +128 @@
   protected:
     std::string tmp;
-  private:
-    std::string *target;
   };
 
   class StringsQuery : public Query {
   public:
-    StringsQuery(std::string title,std::vector<std::string> *_target, std::string _description = "");
+    StringsQuery(std::string title, std::string _description = "");
     virtual ~StringsQuery();
     virtual bool handle()=0;
@@ -147 +139 @@
     std::string temp;
     std::vector<std::string> tmp;
-  private:
-    std::vector<std::string> *target;
   };
 
   class MoleculeQuery : public Query {
   public:
-    MoleculeQuery(std::string title, molecule **_target, std::string _description = "");
+    MoleculeQuery(std::string title, std::string _description = "");
     virtual ~MoleculeQuery();
     virtual bool handle()=0;
@@ -159 +149 @@
   protected:
     molecule *tmp;
-  private:
-    molecule **target;
   };
 
   class AtomQuery : public Query {
   public:
-    AtomQuery(std::string title, atom **_target, std::string _description = "");
+    AtomQuery(std::string title, std::string _description = "");
     virtual ~AtomQuery();
     virtual bool handle()=0;
@@ -171 +159 @@
   protected:
     atom *tmp;
-  private:
-    atom **target;
   };
 
   class VectorQuery : public Query {
   public:
-      VectorQuery(std::string title,Vector *_target,bool _check, std::string _description = "");
+      VectorQuery(std::string title,bool _check, std::string _description = "");
       virtual ~VectorQuery();
       virtual bool handle()=0;
@@ -184 +170 @@
       Vector *tmp;
       bool check;
-    private:
-      Vector *target;
   };
 
   class BoxQuery : public Query {
   public:
-      BoxQuery(std::string title,Box *_cellSize, std::string _description = "");
+      BoxQuery(std::string title, std::string _description = "");
       virtual ~BoxQuery();
       virtual bool handle()=0;
@@ -196 +180 @@
     protected:
       double* tmp;
-    private:
-      Box* target;
   };
 
   class ElementQuery : public Query {
   public:
-    ElementQuery(std::string title, std::vector<element *> *_target, std::string _description = "");
+    ElementQuery(std::string title, std::string _description = "");
     virtual ~ElementQuery();
     virtual bool handle()=0;
@@ -208 +190 @@
   protected:
     std::vector<element *> elements;
-  private:
-    std::vector<element *> * const target;
   };
 

src/UIElements/Makefile.am

@@ -46 +46 @@
   Dialog.cpp \
   MainWindow.cpp \
-  UIFactory.cpp
+  UIFactory.cpp \
+  ValueStorage.cpp
   
 UIHEADER = \
@@ -56 +57 @@
   Dialog.hpp \
   MainWindow.hpp \
-  UIFactory.hpp
+  UIFactory.hpp \
+  ValueStorage.hpp
 
 TEXTUISOURCE = \

src/UIElements/TextUI/TextDialog.cpp

@@ -44 +44 @@
 }
 
-void TextDialog::queryBoolean(const char* title, bool* target, string description){
-  registerQuery(new BooleanTextQuery(title,target,description));
-}
-
-void TextDialog::queryInt(const char* title, int* target, string description){
-  registerQuery(new IntTextQuery(title,target,description));
-}
-
-void TextDialog::queryDouble(const char* title, double* target, string description){
-  registerQuery(new DoubleTextQuery(title,target,description));
-}
-
-void TextDialog::queryString(const char* title, string* target, string description){
-  registerQuery(new StringTextQuery(title,target,description));
-}
-
-void TextDialog::queryStrings(const char* title, vector<string>* target, string description){
-  registerQuery(new StringsTextQuery(title,target,description));
-}
-
-void TextDialog::queryAtom(const char* title, atom **target, string description) {
-  registerQuery(new AtomTextQuery(title,target,description));
-}
-
-void TextDialog::queryMolecule(const char* title, molecule **target, string description) {
-  registerQuery(new MoleculeTextQuery(title,target,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, std::vector<element *> *target, string description){
-  registerQuery(new ElementTextQuery(title,target,description));
+void TextDialog::queryBoolean(const char* title, string description){
+  registerQuery(new BooleanTextQuery(title,description));
+}
+
+void TextDialog::queryInt(const char* title, string description){
+  registerQuery(new IntTextQuery(title,description));
+}
+
+void TextDialog::queryDouble(const char* title, string description){
+  registerQuery(new DoubleTextQuery(title,description));
+}
+
+void TextDialog::queryString(const char* title, string description){
+  registerQuery(new StringTextQuery(title,description));
+}
+
+void TextDialog::queryStrings(const char* title, string description){
+  registerQuery(new StringsTextQuery(title,description));
+}
+
+void TextDialog::queryAtom(const char* title, string description) {
+  registerQuery(new AtomTextQuery(title,description));
+}
+
+void TextDialog::queryMolecule(const char* title, string description) {
+  registerQuery(new MoleculeTextQuery(title,description));
+}
+
+void TextDialog::queryVector(const char* title, bool check, string description) {
+  registerQuery(new VectorTextQuery(title,check,description));
+}
+
+void TextDialog::queryBox(const char* title, string description) {
+  registerQuery(new BoxTextQuery(title,description));
+}
+
+void TextDialog::queryElement(const char* title, string description){
+  registerQuery(new ElementTextQuery(title,description));
 }
 
@@ -97 +97 @@
 }
 
-TextDialog::IntTextQuery::IntTextQuery(string title, int * _target, std::string _description) :
-    Dialog::IntQuery(title,_target,_description)
+TextDialog::IntTextQuery::IntTextQuery(string title, std::string _description) :
+    Dialog::IntQuery(title,_description)
 {}
 
@@ -121 +121 @@
 }
 
-TextDialog::BooleanTextQuery::BooleanTextQuery(string title, bool * _target, std::string _description) :
-    Dialog::BooleanQuery(title,_target,_description)
+TextDialog::BooleanTextQuery::BooleanTextQuery(string title, std::string _description) :
+    Dialog::BooleanQuery(title,_description)
 {}
 
@@ -150 +150 @@
 }
 
-TextDialog::StringTextQuery::StringTextQuery(string title,string *_target, std::string _description) :
-    Dialog::StringQuery(title,_target,_description)
+TextDialog::StringTextQuery::StringTextQuery(string title, std::string _description) :
+    Dialog::StringQuery(title,_description)
 {}
 
@@ -162 +162 @@
 }
 
-TextDialog::StringsTextQuery::StringsTextQuery(string title,vector<string> *_target, std::string _description) :
-    Dialog::StringsQuery(title,_target,_description)
+TextDialog::StringsTextQuery::StringsTextQuery(string title, std::string _description) :
+    Dialog::StringsQuery(title,_description)
 {}
 
@@ -185 +185 @@
 }
 
-TextDialog::DoubleTextQuery::DoubleTextQuery(string title,double *_target, std::string _description) :
-    Dialog::DoubleQuery(title,_target,_description)
+TextDialog::DoubleTextQuery::DoubleTextQuery(string title, std::string _description) :
+    Dialog::DoubleQuery(title,_description)
 {}
 
@@ -208 +208 @@
 }
 
-TextDialog::AtomTextQuery::AtomTextQuery(string title, atom **_target, std::string _description) :
-    Dialog::AtomQuery(title,_target,_description)
+TextDialog::AtomTextQuery::AtomTextQuery(string title, std::string _description) :
+    Dialog::AtomQuery(title,_description)
 {}
 
@@ -240 +240 @@
 }
 
-TextDialog::MoleculeTextQuery::MoleculeTextQuery(string title, molecule **_target, std::string _description) :
-    Dialog::MoleculeQuery(title,_target,_description)
+TextDialog::MoleculeTextQuery::MoleculeTextQuery(string title, std::string _description) :
+    Dialog::MoleculeQuery(title,_description)
 {}
 
@@ -272 +272 @@
 }
 
-TextDialog::VectorTextQuery::VectorTextQuery(std::string title, Vector *_target, bool _check, std::string _description) :
-    Dialog::VectorQuery(title,_target,_check,_description)
+TextDialog::VectorTextQuery::VectorTextQuery(std::string title, bool _check, std::string _description) :
+    Dialog::VectorQuery(title,_check,_description)
 {}
 
@@ -293 +293 @@
 }
 
-TextDialog::BoxTextQuery::BoxTextQuery(std::string title, Box* _cellSize, std::string _description) :
-    Dialog::BoxQuery(title,_cellSize,_description)
+TextDialog::BoxTextQuery::BoxTextQuery(std::string title, std::string _description) :
+    Dialog::BoxQuery(title,_description)
 {}
 
@@ -311 +311 @@
 }
 
-TextDialog::ElementTextQuery::ElementTextQuery(std::string title, std::vector<element *> *_target, std::string _description) :
-    Dialog::ElementQuery(title,_target,_description)
+TextDialog::ElementTextQuery::ElementTextQuery(std::string title, std::string _description) :
+    Dialog::ElementQuery(title,_description)
 {}
 

src/UIElements/TextUI/TextDialog.hpp

@@ -25 +25 @@
 
   virtual void queryEmpty(const char *, std::string = "");
-  virtual void queryBoolean(const char *, bool *, std::string = "");
-  virtual void queryInt(const char *, int *, std::string = "");
-  virtual void queryString(const char*, std::string *, std::string = "");
-  virtual void queryStrings(const char*, std::vector<std::string> *, std::string = "");
-  virtual void queryDouble(const char*, double*, std::string = "");
-  virtual void queryAtom(const char*,atom**,std::string = "");
-  virtual void queryMolecule(const char*,molecule**,std::string = "");
-  virtual void queryVector(const char*,Vector *,bool, std::string = "");
-  virtual void queryBox(const char*,Box*, std::string = "");
-  virtual void queryElement(const char*, std::vector<element *> *, std::string = "");
+  virtual void queryBoolean(const char *, std::string = "");
+  virtual void queryInt(const char *, std::string = "");
+  virtual void queryString(const char*, std::string = "");
+  virtual void queryStrings(const char*, std::string = "");
+  virtual void queryDouble(const char*, std::string = "");
+  virtual void queryAtom(const char*,std::string = "");
+  virtual void queryMolecule(const char*,std::string = "");
+  virtual void queryVector(const char*,bool, std::string = "");
+  virtual void queryBox(const char*, std::string = "");
+  virtual void queryElement(const char*, std::string = "");
 
 protected:
@@ -47 +47 @@
   class BooleanTextQuery : public Dialog::BooleanQuery {
   public:
-    BooleanTextQuery(std::string title, bool *_target, std::string _description = NULL);
+    BooleanTextQuery(std::string title, std::string _description = NULL);
     virtual ~BooleanTextQuery();
     virtual bool handle();
@@ -54 +54 @@
   class IntTextQuery : public Dialog::IntQuery {
   public:
-    IntTextQuery(std::string title, int *_target, std::string _description = NULL);
+    IntTextQuery(std::string title, std::string _description = NULL);
     virtual ~IntTextQuery();
     virtual bool handle();
@@ -61 +61 @@
   class DoubleTextQuery : public Dialog::DoubleQuery {
   public:
-    DoubleTextQuery(std::string title, double *_target, std::string _description = NULL);
+    DoubleTextQuery(std::string title, std::string _description = NULL);
     virtual ~DoubleTextQuery();
     virtual bool handle();
@@ -68 +68 @@
   class StringTextQuery : public Dialog::StringQuery {
   public:
-    StringTextQuery(std::string title, std::string *_target, std::string _description = NULL);
+    StringTextQuery(std::string title, std::string _description = NULL);
     virtual ~StringTextQuery();
     virtual bool handle();
@@ -75 +75 @@
   class StringsTextQuery : public Dialog::StringsQuery {
   public:
-    StringsTextQuery(std::string title, std::vector<std::string> *_target, std::string _description = NULL);
+    StringsTextQuery(std::string title, std::string _description = NULL);
     virtual ~StringsTextQuery();
     virtual bool handle();
@@ -82 +82 @@
   class AtomTextQuery : public Dialog::AtomQuery {
   public:
-    AtomTextQuery(std::string title, atom **_target, std::string _description = NULL);
+    AtomTextQuery(std::string title, std::string _description = NULL);
     virtual ~AtomTextQuery();
     virtual bool handle();
@@ -89 +89 @@
   class MoleculeTextQuery : public Dialog::MoleculeQuery {
   public:
-    MoleculeTextQuery(std::string title, molecule **_target, std::string _description = NULL);
+    MoleculeTextQuery(std::string title, std::string _description = NULL);
     virtual ~MoleculeTextQuery();
     virtual bool handle();
@@ -96 +96 @@
   class VectorTextQuery : public Dialog::VectorQuery {
   public:
-    VectorTextQuery(std::string title,Vector *_target,bool _check, std::string _description = NULL);
+    VectorTextQuery(std::string title,bool _check, std::string _description = NULL);
     virtual ~VectorTextQuery();
     virtual bool handle();
@@ -103 +103 @@
   class BoxTextQuery : public Dialog::BoxQuery {
   public:
-    BoxTextQuery(std::string title,Box* _cellSize, std::string _description = NULL);
+    BoxTextQuery(std::string title, std::string _description = NULL);
     virtual ~BoxTextQuery();
     virtual bool handle();
@@ -110 +110 @@
   class ElementTextQuery : public Dialog::ElementQuery {
   public:
-    ElementTextQuery(std::string title, std::vector<element *> *_target, std::string _description = NULL);
+    ElementTextQuery(std::string title, std::string _description = NULL);
     virtual ~ElementTextQuery();
     virtual bool handle();