Changeset 1c55b8 for src/UIElements/CommandLineUI/Query

Timestamp:

Aug 27, 2012, 11:36:59 AM (12 years ago)

Author:

Michael Ankele <ankele@…>

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:

852ea3

Parents:

a55e6f

git-author:

Michael Ankele <ankele@…> (08/14/12 14:52:25)

git-committer:

Michael Ankele <ankele@…> (08/27/12 11:36:59)

Message:

combined Query super classes into template

Location:

src/UIElements/CommandLineUI/Query

Files:

• AtomCommandLineQuery.cpp (modified) (1 diff)
• AtomsCommandLineQuery.cpp (modified) (2 diffs)
• BooleanCommandLineQuery.cpp (modified) (1 diff)
• CommandLineQuery.hpp (modified) (21 diffs)
• DoubleCommandLineQuery.cpp (modified) (1 diff)
• DoublesCommandLineQuery.cpp (modified) (1 diff)
• ElementCommandLineQuery.cpp (modified) (1 diff)
• ElementsCommandLineQuery.cpp (modified) (2 diffs)
• FileCommandLineQuery.cpp (modified) (1 diff)
• FilesCommandLineQuery.cpp (modified) (1 diff)
• IntCommandLineQuery.cpp (modified) (1 diff)
• IntsCommandLineQuery.cpp (modified) (1 diff)
• MoleculeCommandLineQuery.cpp (modified) (1 diff)
• MoleculesCommandLineQuery.cpp (modified) (2 diffs)
• RandomNumberDistribution_ParametersCommandLineQuery.cpp (modified) (1 diff)
• RealSpaceMatrixCommandLineQuery.cpp (modified) (1 diff)
• StringCommandLineQuery.cpp (modified) (1 diff)
• StringsCommandLineQuery.cpp (modified) (1 diff)
• UnsignedIntCommandLineQuery.cpp (modified) (1 diff)
• UnsignedIntsCommandLineQuery.cpp (modified) (1 diff)
• VectorCommandLineQuery.cpp (modified) (1 diff)
• VectorsCommandLineQuery.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/Query/AtomCommandLineQuery.cpp

@@ -34 +34 @@
 
 CommandLineDialog::AtomCommandLineQuery::AtomCommandLineQuery(Parameter<const atom *> &_param, std::string title, std::string _description) :
-    Dialog::AtomQuery(_param, title, _description)
+    Dialog::TQuery<const atom*>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/AtomsCommandLineQuery.cpp

@@ -29 +29 @@
 
 CommandLineDialog::AtomsCommandLineQuery::AtomsCommandLineQuery(Parameter<std::vector<const atom *> > &_param, std::string title, std::string _description) :
-    Dialog::AtomsQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<const atom *> >(_param, title, _description)
 {}
 
@@ -38 +38 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     IdxOfAtom = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<int> >();
+    const atom *temp_element;
     for (std::vector<int>::iterator iter = IdxOfAtom.begin(); iter != IdxOfAtom.end(); ++iter) {
       temp_element = World::getInstance().getAtom(AtomById(*iter));

src/UIElements/CommandLineUI/Query/BooleanCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(Parameter<bool> &_param, std::string title, std::string _description) :
-    Dialog::BooleanQuery(_param, title, _description)
+    Dialog::TQuery<bool>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

@@ -24 +24 @@
 };
 
-class CommandLineDialog::IntCommandLineQuery : public Dialog::IntQuery {
+class CommandLineDialog::IntCommandLineQuery : public Dialog::TQuery<int> {
 public:
   IntCommandLineQuery(Parameter<int> &_param, std::string title, std::string _description = "");
@@ -31 +31 @@
 };
 
-class CommandLineDialog::IntsCommandLineQuery : public Dialog::IntsQuery {
+class CommandLineDialog::IntsCommandLineQuery : public Dialog::TQuery<std::vector<int> > {
 public:
   IntsCommandLineQuery(Parameter<std::vector<int> > &_param, std::string title, std::string _description = "");
@@ -38 +38 @@
 };
 
-class CommandLineDialog::UnsignedIntCommandLineQuery : public Dialog::UnsignedIntQuery {
+class CommandLineDialog::UnsignedIntCommandLineQuery : public Dialog::TQuery<unsigned int> {
 public:
   UnsignedIntCommandLineQuery(Parameter<unsigned int> &_param, std::string title, std::string _description = "");
@@ -45 +45 @@
 };
 
-class CommandLineDialog::UnsignedIntsCommandLineQuery : public Dialog::UnsignedIntsQuery {
+class CommandLineDialog::UnsignedIntsCommandLineQuery : public Dialog::TQuery<std::vector<unsigned int> > {
 public:
   UnsignedIntsCommandLineQuery(Parameter<std::vector<unsigned int> > &_param, std::string title, std::string _description = "");
@@ -52 +52 @@
 };
 
-class CommandLineDialog::BooleanCommandLineQuery : public Dialog::BooleanQuery {
+class CommandLineDialog::BooleanCommandLineQuery : public Dialog::TQuery<bool> {
 public:
   BooleanCommandLineQuery(Parameter<bool> &_param, std::string title, std::string _description = "");
@@ -59 +59 @@
 };
 
-class CommandLineDialog::DoubleCommandLineQuery : public Dialog::DoubleQuery {
+class CommandLineDialog::DoubleCommandLineQuery : public Dialog::TQuery<double> {
 public:
   DoubleCommandLineQuery(Parameter<double> &_param, std::string title, std::string _description = "");
@@ -66 +66 @@
 };
 
-class CommandLineDialog::DoublesCommandLineQuery : public Dialog::DoublesQuery {
+class CommandLineDialog::DoublesCommandLineQuery : public Dialog::TQuery<std::vector<double> > {
 public:
   DoublesCommandLineQuery(Parameter<std::vector<double> > &_param, std::string title, std::string _description = "");
@@ -73 +73 @@
 };
 
-class CommandLineDialog::StringCommandLineQuery : public Dialog::StringQuery {
+class CommandLineDialog::StringCommandLineQuery : public Dialog::TQuery<std::string> {
 public:
   StringCommandLineQuery(Parameter<std::string> &_param, std::string title, std::string _description = "");
@@ -80 +80 @@
 };
 
-class CommandLineDialog::StringsCommandLineQuery : public Dialog::StringsQuery {
+class CommandLineDialog::StringsCommandLineQuery : public Dialog::TQuery<std::vector<std::string> > {
 public:
   StringsCommandLineQuery(Parameter<std::vector<std::string> > &_param, std::string title, std::string _description = "");
@@ -87 +87 @@
 };
 
-class CommandLineDialog::AtomCommandLineQuery : public Dialog::AtomQuery {
+class CommandLineDialog::AtomCommandLineQuery : public Dialog::TQuery<const atom *> {
 public:
   AtomCommandLineQuery(Parameter<const atom *> &_param, std::string title, std::string _description = "");
@@ -94 +94 @@
 };
 
-class CommandLineDialog::AtomsCommandLineQuery : public Dialog::AtomsQuery {
+class CommandLineDialog::AtomsCommandLineQuery : public Dialog::TQuery<std::vector<const atom*> > {
 public:
   AtomsCommandLineQuery(Parameter<std::vector<const atom *> > &_param, std::string title, std::string _description = "");
@@ -101 +101 @@
 };
 
-class CommandLineDialog::MoleculeCommandLineQuery : public Dialog::MoleculeQuery {
+class CommandLineDialog::MoleculeCommandLineQuery : public Dialog::TQuery<const molecule *> {
 public:
   MoleculeCommandLineQuery(Parameter<const molecule *> &_param, std::string title, std::string _description = "");
@@ -108 +108 @@
 };
 
-class CommandLineDialog::MoleculesCommandLineQuery : public Dialog::MoleculesQuery {
+class CommandLineDialog::MoleculesCommandLineQuery : public Dialog::TQuery<std::vector<const molecule*> > {
 public:
   MoleculesCommandLineQuery(Parameter<std::vector<const molecule *> > &_param, std::string title, std::string _description = "");
@@ -115 +115 @@
 };
 
-class CommandLineDialog::VectorCommandLineQuery : public Dialog::VectorQuery {
+class CommandLineDialog::VectorCommandLineQuery : public Dialog::TQuery<Vector> {
 public:
   VectorCommandLineQuery(Parameter<Vector> &_param, std::string title, std::string _description = "");
@@ -122 +122 @@
 };
 
-class CommandLineDialog::VectorsCommandLineQuery : public Dialog::VectorsQuery {
+class CommandLineDialog::VectorsCommandLineQuery : public Dialog::TQuery<std::vector<Vector> > {
 public:
   VectorsCommandLineQuery(Parameter<std::vector<Vector> > &_param, std::string title, std::string _description = "");
@@ -129 +129 @@
 };
 
-class CommandLineDialog::RealSpaceMatrixCommandLineQuery : public Dialog::RealSpaceMatrixQuery {
+class CommandLineDialog::RealSpaceMatrixCommandLineQuery : public Dialog::TQuery<RealSpaceMatrix> {
 public:
   RealSpaceMatrixCommandLineQuery(Parameter<RealSpaceMatrix> &_param, std::string title, std::string _description = "");
@@ -136 +136 @@
 };
 
-class CommandLineDialog::ElementCommandLineQuery : public Dialog::ElementQuery {
+class CommandLineDialog::ElementCommandLineQuery : public Dialog::TQuery<const element *> {
 public:
   ElementCommandLineQuery(Parameter<const element *> &_param, std::string title, std::string _description = "");
@@ -143 +143 @@
 };
 
-class CommandLineDialog::ElementsCommandLineQuery : public Dialog::ElementsQuery {
+class CommandLineDialog::ElementsCommandLineQuery : public Dialog::TQuery<std::vector<const element *> > {
 public:
   ElementsCommandLineQuery(Parameter<std::vector<const element *> > &_param, std::string title, std::string _description = "");
@@ -150 +150 @@
 };
 
-class CommandLineDialog::FileCommandLineQuery : public Dialog::FileQuery {
+class CommandLineDialog::FileCommandLineQuery : public Dialog::TQuery<boost::filesystem::path> {
 public:
   FileCommandLineQuery(Parameter<boost::filesystem::path> &_param, std::string title, std::string _description = "");
@@ -157 +157 @@
 };
 
-class CommandLineDialog::FilesCommandLineQuery : public Dialog::FilesQuery {
+class CommandLineDialog::FilesCommandLineQuery : public Dialog::TQuery<std::vector<boost::filesystem::path> > {
 public:
   FilesCommandLineQuery(Parameter<std::vector< boost::filesystem::path> > &param, std::string title, std::string _description = "");
@@ -164 +164 @@
 };
 
-class CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
+class CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery : public Dialog::TQuery<RandomNumberDistribution_Parameters> {
 public:
   RandomNumberDistribution_ParametersCommandLineQuery(Parameter<RandomNumberDistribution_Parameters> &_param, std::string title, std::string _description = "");

src/UIElements/CommandLineUI/Query/DoubleCommandLineQuery.cpp

@@ -27 +27 @@
 
 CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(Parameter<double> &_param, std::string title, std::string _description) :
-    Dialog::DoubleQuery(_param, title, _description)
+    Dialog::TQuery<double>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/DoublesCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::DoublesCommandLineQuery::DoublesCommandLineQuery(Parameter<std::vector<double> > &_param, std::string title, std::string _description) :
-    Dialog::DoublesQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<double> >(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp

@@ -29 +29 @@
 
 CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(Parameter<const element*> &_param, std::string title, std::string _description) :
-    Dialog::ElementQuery(_param, title, _description)
+    Dialog::TQuery<const element *>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp

@@ -29 +29 @@
 
 CommandLineDialog::ElementsCommandLineQuery::ElementsCommandLineQuery(Parameter<std::vector<const element*> > &_param, std::string title, std::string _description) :
-    Dialog::ElementsQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<const element *> >(_param, title, _description)
 {}
 
@@ -40 +40 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     vector<int> AllElements = CommandLineParser::getInstance().vm[getTitle()].as< vector<int> >();
+    const element *temp_element;
     for (vector<int>::iterator ZRunner = AllElements.begin(); ZRunner != AllElements.end(); ++ZRunner) {
       temp_element = periode->FindElement(*ZRunner);

src/UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::FileCommandLineQuery::FileCommandLineQuery(Parameter<boost::filesystem::path> &_param, std::string title, std::string _description) :
-    Dialog::FileQuery(_param, title, _description)
+    Dialog::TQuery<boost::filesystem::path>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/FilesCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::FilesCommandLineQuery::FilesCommandLineQuery(Parameter<std::vector< boost::filesystem::path> > &_param, std::string title, std::string _description) :
-    Dialog::FilesQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<boost::filesystem::path> >(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(Parameter<int> &_param, std::string title, std::string _description) :
-    Dialog::IntQuery(_param, title, _description)
+    Dialog::TQuery<int>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::IntsCommandLineQuery::IntsCommandLineQuery(Parameter<std::vector<int> > &_param, std::string title, std::string _description) :
-    Dialog::IntsQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<int> >(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/MoleculeCommandLineQuery.cpp

@@ -29 +29 @@
 
 CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(Parameter<const molecule *> &_param, std::string title, std::string _description) :
-    Dialog::MoleculeQuery(_param, title, _description)
+    Dialog::TQuery<const molecule *>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp

@@ -30 +30 @@
 
 CommandLineDialog::MoleculesCommandLineQuery::MoleculesCommandLineQuery(Parameter<std::vector<const molecule *> > &_param, std::string title, std::string _description) :
-    Dialog::MoleculesQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<const molecule *> >(_param, title, _description)
 {}
 
@@ -40 +40 @@
     IdxOfMol = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<int> >();
     for (std::vector<int>::iterator iter = IdxOfMol.begin(); iter != IdxOfMol.end(); ++iter) {
-      temp_element = World::getInstance().getMolecule(MoleculeById(*iter));
+      const molecule *temp_element = World::getInstance().getMolecule(MoleculeById(*iter));
       if (temp_element)
         temp.push_back(temp_element);

src/UIElements/CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp

@@ -32 +32 @@
 
 CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery::RandomNumberDistribution_ParametersCommandLineQuery(Parameter<RandomNumberDistribution_Parameters> &_param, std::string title, std::string _description) :
-    Dialog::RandomNumberDistribution_ParametersQuery(_param, title, _description)
+    Dialog::TQuery<RandomNumberDistribution_Parameters>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/RealSpaceMatrixCommandLineQuery.cpp

@@ -28 +28 @@
 
 CommandLineDialog::RealSpaceMatrixCommandLineQuery::RealSpaceMatrixCommandLineQuery(Parameter<RealSpaceMatrix> &_param, std::string title, std::string _description) :
-    Dialog::RealSpaceMatrixQuery(_param, title, _description)
+    Dialog::TQuery<RealSpaceMatrix>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/StringCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(Parameter<std::string> &_param, std::string title, std::string _description) :
-    Dialog::StringQuery(_param, title, _description)
+    Dialog::TQuery<std::string>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(Parameter<std::vector<std::string> > &_param, std::string title, std::string _description) :
-    Dialog::StringsQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<std::string> >(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/UnsignedIntCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::UnsignedIntCommandLineQuery::UnsignedIntCommandLineQuery(Parameter<unsigned int> &_param, std::string title, std::string _description) :
-    Dialog::UnsignedIntQuery(_param, title, _description)
+    Dialog::TQuery<unsigned int>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/UnsignedIntsCommandLineQuery.cpp

@@ -26 +26 @@
 
 CommandLineDialog::UnsignedIntsCommandLineQuery::UnsignedIntsCommandLineQuery(Parameter<std::vector<unsigned int> > &_param, std::string title, std::string _description) :
-    Dialog::UnsignedIntsQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<unsigned int> >(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp

@@ -30 +30 @@
 
 CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(Parameter<Vector> &_param, std::string title, std::string _description) :
-    Dialog::VectorQuery(_param, title, _description)
+    Dialog::TQuery<Vector>(_param, title, _description)
 {}
 

src/UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp

@@ -30 +30 @@
 
 CommandLineDialog::VectorsCommandLineQuery::VectorsCommandLineQuery(Parameter<std::vector<Vector> > &_param, std::string title, std::string _description) :
-    Dialog::VectorsQuery(_param, title, _description)
+    Dialog::TQuery<std::vector<Vector> >(_param, title, _description)
 {}
 
@@ -41 +41 @@
     temporary = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<VectorValue> >();
     for(std::vector<VectorValue>::iterator iter = temporary.begin(); iter != temporary.end(); ++iter) {
-      temp_element = (*iter).toVector();
+      Vector temp_element = (*iter).toVector();
       temp.push_back(temp_element);
     }