Changeset f10b0c for src/UIElements/Query

Timestamp:

Jun 11, 2012, 9:53:19 AM (13 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:

95f965

Parents:

b9c69d

git-author:

Michael Ankele <ankele@…> (04/24/12 13:55:16)

git-committer:

Frederik Heber <heber@…> (06/11/12 09:53:19)

Message:

disastrously big and ugly commit

• using new Parameter<T> classes:
  • Actions
  • Queries (all UIs)

• TODO:
  • actions crash cause Value is unset
  • no query<BoxVector>

Location:

src/UIElements/Query

Files:

• AtomQuery.cpp (modified) (2 diffs)
• AtomsQuery.cpp (modified) (2 diffs)
• BooleanQuery.cpp (modified) (2 diffs)
• BoxQuery.cpp (modified) (2 diffs)
• DoubleQuery.cpp (modified) (2 diffs)
• DoublesQuery.cpp (modified) (2 diffs)
• ElementQuery.cpp (modified) (2 diffs)
• ElementsQuery.cpp (modified) (2 diffs)
• FileQuery.cpp (modified) (2 diffs)
• IntQuery.cpp (modified) (2 diffs)
• IntsQuery.cpp (modified) (2 diffs)
• MoleculeQuery.cpp (modified) (2 diffs)
• MoleculesQuery.cpp (modified) (2 diffs)
• RandomNumberDistribution_ParametersQuery.cpp (modified) (2 diffs)
• StringQuery.cpp (modified) (2 diffs)
• StringsQuery.cpp (modified) (2 diffs)
• UnsignedIntQuery.cpp (modified) (2 diffs)
• UnsignedIntsQuery.cpp (modified) (2 diffs)
• VectorQuery.cpp (modified) (2 diffs)
• VectorsQuery.cpp (modified) (2 diffs)

src/UIElements/Query/AtomQuery.cpp

@@ -23 +23 @@
 
 // Atom Queries
-Dialog::AtomQuery::AtomQuery(std::string title, std::string _description) :
+Dialog::AtomQuery::AtomQuery(Parameter<const atom *> &param, std::string title, std::string _description) :
     Query(title, _description),
-    tmp(0)
+    tmp(param)
 {}
 
@@ -31 +31 @@
 
 void Dialog::AtomQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/AtomsQuery.cpp

@@ -24 +24 @@
 
 // Atoms Queries
-Dialog::AtomsQuery::AtomsQuery(std::string title, std::string _description) :
+Dialog::AtomsQuery::AtomsQuery(Parameter<std::vector<const atom *> > &param, std::string title, std::string _description) :
     Query(title, _description),
-    tmp(0)
+    tmp(param)
 {}
 
@@ -32 +32 @@
 
 void Dialog::AtomsQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/BooleanQuery.cpp

@@ -24 +24 @@
 
 // Bool Queries
-Dialog::BooleanQuery::BooleanQuery(std::string title,std::string description) :
+Dialog::BooleanQuery::BooleanQuery(Parameter<bool> &param, std::string title,std::string description) :
     Query(title, description),
-    tmp(false)
+    tmp(param)
 {}
 
@@ -32 +32 @@
 
 void Dialog::BooleanQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/BoxQuery.cpp

@@ -24 +24 @@
 
 // Box Queries
-Dialog::BoxQuery::BoxQuery(std::string title, std::string _description) :
-  Query(title, _description)
+Dialog::BoxQuery::BoxQuery(Parameter<Box> &param, std::string title, std::string _description) :
+  Query(title, _description),
+  tmp(param)
 {}
 
@@ -32 +33 @@
 
 void Dialog::BoxQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/DoubleQuery.cpp

@@ -24 +24 @@
 
 // Double Queries
-Dialog::DoubleQuery::DoubleQuery(std::string title, std::string _description) :
+Dialog::DoubleQuery::DoubleQuery(Parameter<double> &param, std::string title, std::string _description) :
     Query(title, _description),
-    tmp(0)
+    tmp(param)
 {}
 
@@ -32 +32 @@
 
 void Dialog::DoubleQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/DoublesQuery.cpp

@@ -24 +24 @@
 
 // Doubles Queries
-Dialog::DoublesQuery::DoublesQuery(std::string title, std::string _description) :
-    Query(title, _description)
+Dialog::DoublesQuery::DoublesQuery(Parameter<std::vector<double> > &param, std::string title, std::string _description) :
+    Query(title, _description),
+    tmp(param)
 {}
 
@@ -31 +32 @@
 
 void Dialog::DoublesQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/ElementQuery.cpp

@@ -24 +24 @@
 
 // Element Queries
-Dialog::ElementQuery::ElementQuery(std::string title, std::string _description) :
-  Query(title, _description)
+Dialog::ElementQuery::ElementQuery(Parameter<const element *> &param, std::string title, std::string _description) :
+  Query(title, _description),
+  tmp(param)
   {}
 
@@ -31 +32 @@
 
 void Dialog::ElementQuery::setResult(){
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/ElementsQuery.cpp

@@ -24 +24 @@
 
 // Elements Queries
-Dialog::ElementsQuery::ElementsQuery(std::string title, std::string _description) :
-  Query(title, _description)
+Dialog::ElementsQuery::ElementsQuery(Parameter<std::vector<const element *> > &param, std::string title, std::string _description) :
+  Query(title, _description),
+  tmp(param)
   {}
 
@@ -31 +32 @@
 
 void Dialog::ElementsQuery::setResult(){
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/FileQuery.cpp

@@ -24 +24 @@
 
 // File Queries
-Dialog::FileQuery::FileQuery(std::string title, std::string _description) :
-  Query(title, _description)
+Dialog::FileQuery::FileQuery(Parameter<boost::filesystem::path> &param, std::string title, std::string _description) :
+  Query(title, _description),
+  tmp(param)
   {}
 
@@ -31 +32 @@
 
 void Dialog::FileQuery::setResult(){
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/IntQuery.cpp

@@ -24 +24 @@
 
 // Int Queries
-Dialog::IntQuery::IntQuery(std::string title, std::string description) :
+Dialog::IntQuery::IntQuery(Parameter<int> &param, std::string title, std::string description) :
     Query(title, description),
-    tmp(0)
+    tmp(param)
 {}
 
@@ -32 +32 @@
 
 void Dialog::IntQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/IntsQuery.cpp

@@ -24 +24 @@
 
 // Ints Queries
-Dialog::IntsQuery::IntsQuery(std::string title, std::string description) :
-    Query(title, description)
+Dialog::IntsQuery::IntsQuery(Parameter<std::vector<int> > &param, std::string title, std::string description) :
+    Query(title, description),
+    tmp(param)
 {}
 
@@ -31 +32 @@
 
 void Dialog::IntsQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/MoleculeQuery.cpp

@@ -24 +24 @@
 
 // Molecule Queries
-Dialog::MoleculeQuery::MoleculeQuery(std::string title, std::string _description) :
+Dialog::MoleculeQuery::MoleculeQuery(Parameter<const molecule *> &param, std::string title, std::string _description) :
     Query(title, _description),
-    tmp(0)
+    tmp(param)
 {}
 
@@ -32 +32 @@
 
 void Dialog::MoleculeQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/MoleculesQuery.cpp

@@ -24 +24 @@
 
 // Molecules Queries
-Dialog::MoleculesQuery::MoleculesQuery(std::string title, std::string _description) :
+Dialog::MoleculesQuery::MoleculesQuery(Parameter<std::vector<const molecule *> > &param, std::string title, std::string _description) :
     Query(title, _description),
-    tmp(0)
+    tmp(param)
 {}
 
@@ -32 +32 @@
 
 void Dialog::MoleculesQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/RandomNumberDistribution_ParametersQuery.cpp

@@ -23 +23 @@
 
 // RandomNumberDistribution_Parameters Queries
-Dialog::RandomNumberDistribution_ParametersQuery::RandomNumberDistribution_ParametersQuery(std::string title, std::string _description) :
-    Query(title, _description)
+Dialog::RandomNumberDistribution_ParametersQuery::RandomNumberDistribution_ParametersQuery(Parameter<RandomNumberDistribution_Parameters> &param, std::string title, std::string _description) :
+    Query(title, _description),
+    tmp(param)
 {}
 
@@ -30 +31 @@
 
 void Dialog::RandomNumberDistribution_ParametersQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/StringQuery.cpp

@@ -24 +24 @@
 
 // String Queries
-Dialog::StringQuery::StringQuery(std::string title,std::string _description) :
-    Query(title, _description)
+Dialog::StringQuery::StringQuery(Parameter<std::string> &param, std::string title,std::string _description) :
+    Query(title, _description),
+    tmp(param)
 {}
 
@@ -31 +32 @@
 
 void Dialog::StringQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/StringsQuery.cpp

@@ -24 +24 @@
 
 // Strings Queries
-Dialog::StringsQuery::StringsQuery(std::string title,std::string _description) :
-    Query(title, _description)
+Dialog::StringsQuery::StringsQuery(Parameter<std::vector<std::string> > &param, std::string title,std::string _description) :
+    Query(title, _description),
+    tmp(param)
 {}
 
@@ -31 +32 @@
 
 void Dialog::StringsQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/UnsignedIntQuery.cpp

@@ -24 +24 @@
 
 // UnsignedInt Queries
-Dialog::UnsignedIntQuery::UnsignedIntQuery(std::string title, std::string description) :
+Dialog::UnsignedIntQuery::UnsignedIntQuery(Parameter<unsigned int> &param, std::string title, std::string description) :
     Query(title, description),
-    tmp(0)
+    tmp(param)
 {}
 
@@ -32 +32 @@
 
 void Dialog::UnsignedIntQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/UnsignedIntsQuery.cpp

@@ -24 +24 @@
 
 // UnsignedInts Queries
-Dialog::UnsignedIntsQuery::UnsignedIntsQuery(std::string title, std::string description) :
-    Query(title, description)
+Dialog::UnsignedIntsQuery::UnsignedIntsQuery(Parameter<std::vector<unsigned int> > &param, std::string title, std::string description) :
+    Query(title, description),
+    tmp(param)
 {}
 
@@ -31 +32 @@
 
 void Dialog::UnsignedIntsQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/VectorQuery.cpp

@@ -24 +24 @@
 
 // Vector Queries
-Dialog::VectorQuery::VectorQuery(std::string title,bool _check, std::string _description) :
+Dialog::VectorQuery::VectorQuery(Parameter<Vector> &param, std::string title,bool _check, std::string _description) :
   Query(title, _description),
+  tmp(param),
   check(_check)
 {}
@@ -33 +34 @@
 
 void Dialog::VectorQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
 

src/UIElements/Query/VectorsQuery.cpp

@@ -24 +24 @@
 
 // Vectors Queries
-Dialog::VectorsQuery::VectorsQuery(std::string title,bool _check, std::string _description) :
+Dialog::VectorsQuery::VectorsQuery(Parameter<std::vector<Vector> > &param, std::string title,bool _check, std::string _description) :
   Query(title, _description),
+  tmp(param),
   check(_check)
 {}
@@ -33 +34 @@
 
 void Dialog::VectorsQuery::setResult() {
-  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+  //ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }