Changeset 7cd6e7 for src/UIElements/Dialog.hpp

Timestamp:

Jul 25, 2010, 3:07:42 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:

e2f3114

Parents:

0ff6b5

Message:

Add all possible versions of queries where the user is asked for multiples of the same.

• Note that these are correctly implemented in TextUI and CommandLineUI, but not yet in QT4.

File:

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

src/UIElements/Dialog.hpp

@@ -13 +13 @@
 #include<vector>
 
+#include "vector.hpp"
+
 class atom;
 class Box;
 class element;
 class molecule;
-class Vector;
 
 
@@ -39 +40 @@
   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 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 bool display();
@@ -110 +117 @@
   };
 
+  class IntsQuery : public Query {
+  public:
+    IntsQuery(std::string title, std::string _description = "");
+    virtual ~IntsQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    int temp;
+    std::vector<int> tmp;
+  };
+
   class DoubleQuery : public Query {
   public:
@@ -120 +138 @@
   };
 
+  class DoublesQuery : public Query {
+  public:
+    DoublesQuery(std::string title, std::string _description = "");
+    virtual ~DoublesQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    double temp;
+    std::vector<double> tmp;
+  };
+
   class StringQuery : public Query {
   public:
@@ -151 +180 @@
   };
 
+  class MoleculesQuery : public Query {
+  public:
+    MoleculesQuery(std::string title, std::string _description = "");
+    virtual ~MoleculesQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    molecule * temp;
+    std::vector<molecule *> tmp;
+  };
+
   class AtomQuery : public Query {
   public:
@@ -159 +199 @@
   protected:
     atom *tmp;
+  };
+
+  class AtomsQuery : public Query {
+  public:
+    AtomsQuery(std::string title, std::string _description = "");
+    virtual ~AtomsQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    atom *temp;
+    std::vector<atom *> tmp;
   };
 
@@ -168 +219 @@
       virtual void setResult();
     protected:
-      Vector *tmp;
+      Vector tmp;
+      bool check;
+  };
+
+  class VectorsQuery : public Query {
+  public:
+      VectorsQuery(std::string title,bool _check, std::string _description = "");
+      virtual ~VectorsQuery();
+      virtual bool handle()=0;
+      virtual void setResult();
+    protected:
+      Vector temp;
+      std::vector<Vector> tmp;
       bool check;
   };
@@ -189 +252 @@
     virtual void setResult();
   protected:
+    element * tmp;
+  };
+
+  class ElementsQuery : public Query {
+  public:
+    ElementsQuery(std::string title, std::string _description = "");
+    virtual ~ElementsQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    element *temp;
     std::vector<element *> tmp;
   };