Changeset 1c55b8 for src/UIElements/TextUI

Timestamp:

Aug 27, 2012, 11:36:59 AM (13 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/TextUI/Query

Files:

• AtomTextQuery.cpp (modified) (1 diff)
• AtomsTextQuery.cpp (modified) (2 diffs)
• BooleanTextQuery.cpp (modified) (1 diff)
• DoubleTextQuery.cpp (modified) (1 diff)
• DoublesTextQuery.cpp (modified) (2 diffs)
• ElementTextQuery.cpp (modified) (1 diff)
• ElementsTextQuery.cpp (modified) (2 diffs)
• FileTextQuery.cpp (modified) (1 diff)
• FilesTextQuery.cpp (modified) (1 diff)
• IntTextQuery.cpp (modified) (1 diff)
• IntsTextQuery.cpp (modified) (2 diffs)
• MoleculeTextQuery.cpp (modified) (1 diff)
• MoleculesTextQuery.cpp (modified) (2 diffs)
• RandomNumberDistribution_ParametersTextQuery.cpp (modified) (1 diff)
• RealSpaceMatrixTextQuery.cpp (modified) (1 diff)
• StringTextQuery.cpp (modified) (1 diff)
• StringsTextQuery.cpp (modified) (2 diffs)
• TextQuery.hpp (modified) (21 diffs)
• UnsignedIntTextQuery.cpp (modified) (1 diff)
• UnsignedIntsTextQuery.cpp (modified) (2 diffs)
• VectorTextQuery.cpp (modified) (1 diff)
• VectorsTextQuery.cpp (modified) (2 diffs)

src/UIElements/TextUI/Query/AtomTextQuery.cpp

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

src/UIElements/TextUI/Query/AtomsTextQuery.cpp

@@ -32 +32 @@
 
 TextDialog::AtomsTextQuery::AtomsTextQuery(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)
 {}
 
@@ -43 +43 @@
   getline(std::cin,line);
   // dissect by " "
+  const atom *temp_element;
   std::string::iterator olditer = line.begin();
   for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {

src/UIElements/TextUI/Query/BooleanTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::BooleanTextQuery::BooleanTextQuery(Parameter<bool> &_param, std::string title, std::string _description) :
-    Dialog::BooleanQuery(_param, title,_description)
+    Dialog::TQuery<bool>(_param, title,_description)
 {}
 

src/UIElements/TextUI/Query/DoubleTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::DoubleTextQuery::DoubleTextQuery(Parameter<double> &_param, std::string title, std::string _description) :
-    Dialog::DoubleQuery(_param, title,_description)
+    Dialog::TQuery<double>(_param, title,_description)
 {}
 

src/UIElements/TextUI/Query/DoublesTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::DoublesTextQuery::DoublesTextQuery(Parameter<std::vector<double> > &_param, std::string title, std::string _description) :
-    Dialog::DoublesQuery(_param, title,_description)
+    Dialog::TQuery<std::vector<double> >(_param, title,_description)
 {}
 
@@ -39 +39 @@
   getline(std::cin,line);
   // dissect by " "
+  double temp_element;
   std::string::iterator olditer = line.begin();
   for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {

src/UIElements/TextUI/Query/ElementTextQuery.cpp

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

src/UIElements/TextUI/Query/ElementsTextQuery.cpp

@@ -36 +36 @@
 
 TextDialog::ElementsTextQuery::ElementsTextQuery(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)
 {}
 
@@ -49 +49 @@
   getline(std::cin,line);
   // dissect by " "
+  const element *temp_element;
   std::string::iterator olditer = line.begin();
   for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {

src/UIElements/TextUI/Query/FileTextQuery.cpp

@@ -32 +32 @@
 
 TextDialog::FileTextQuery::FileTextQuery(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/TextUI/Query/FilesTextQuery.cpp

@@ -32 +32 @@
 
 TextDialog::FilesTextQuery::FilesTextQuery(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/TextUI/Query/IntTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::IntTextQuery::IntTextQuery(Parameter<int> &_param, std::string title, std::string _description) :
-    Dialog::IntQuery(_param, title,_description)
+    Dialog::TQuery<int>(_param, title,_description)
 {}
 

src/UIElements/TextUI/Query/IntsTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::IntsTextQuery::IntsTextQuery(Parameter<std::vector<int> > &_param, std::string title, std::string _description) :
-    Dialog::IntsQuery(_param, title,_description)
+    Dialog::TQuery<std::vector<int> >(_param, title,_description)
 {}
 
@@ -39 +39 @@
   getline(std::cin,line);
   // dissect by " "
+  int temp_element;
   std::string::iterator olditer = line.begin();
   for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {

src/UIElements/TextUI/Query/MoleculeTextQuery.cpp

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

src/UIElements/TextUI/Query/MoleculesTextQuery.cpp

@@ -32 +32 @@
 
 TextDialog::MoleculesTextQuery::MoleculesTextQuery(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)
 {}
 
@@ -43 +43 @@
   getline(std::cin,line);
   // dissect by " "
+  const molecule *temp_element;
   std::string::iterator olditer = line.begin();
   for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {

src/UIElements/TextUI/Query/RandomNumberDistribution_ParametersTextQuery.cpp

@@ -31 +31 @@
 
 TextDialog::RandomNumberDistribution_ParametersTextQuery::RandomNumberDistribution_ParametersTextQuery(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/TextUI/Query/RealSpaceMatrixTextQuery.cpp

@@ -30 +30 @@
 
 TextDialog::RealSpaceMatrixTextQuery::RealSpaceMatrixTextQuery(Parameter<RealSpaceMatrix> &_param, std::string title, std::string _description) :
-    Dialog::RealSpaceMatrixQuery(_param, title,_description)
+    Dialog::TQuery<RealSpaceMatrix>(_param, title,_description)
 {}
 

src/UIElements/TextUI/Query/StringTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::StringTextQuery::StringTextQuery(Parameter<std::string> &_param, std::string title, std::string _description) :
-    Dialog::StringQuery(_param, title,_description)
+    Dialog::TQuery<std::string>(_param, title,_description)
 {}
 

src/UIElements/TextUI/Query/StringsTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::StringsTextQuery::StringsTextQuery(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)
 {}
 
@@ -36 +36 @@
 bool TextDialog::StringsTextQuery::handle() {
   std::cout << getDescription() << ": ";
+  std::string temp_element;
   getline(std::cin,temp_element);
   // dissect by " "

src/UIElements/TextUI/Query/TextQuery.hpp

@@ -17 +17 @@
 #include "TextUI/TextDialog.hpp"
 
-class TextDialog::AtomTextQuery : public Dialog::AtomQuery {
+class TextDialog::AtomTextQuery : public Dialog::TQuery<const atom *> {
 public:
   AtomTextQuery(Parameter<const atom *> &, std::string title, std::string _description = NULL);
@@ -24 +24 @@
 };
 
-class TextDialog::AtomsTextQuery : public Dialog::AtomsQuery {
+class TextDialog::AtomsTextQuery : public Dialog::TQuery<std::vector<const atom *> > {
 public:
   AtomsTextQuery(Parameter<std::vector<const atom *> > &, std::string title, std::string _description = NULL);
@@ -31 +31 @@
 };
 
-class TextDialog::BooleanTextQuery : public Dialog::BooleanQuery {
+class TextDialog::BooleanTextQuery : public Dialog::TQuery<bool> {
 public:
   BooleanTextQuery(Parameter<bool> &, std::string title, std::string _description = NULL);
@@ -38 +38 @@
 };
 
-class TextDialog::RealSpaceMatrixTextQuery : public Dialog::RealSpaceMatrixQuery {
+class TextDialog::RealSpaceMatrixTextQuery : public Dialog::TQuery<RealSpaceMatrix> {
 public:
   RealSpaceMatrixTextQuery(Parameter<RealSpaceMatrix> &, std::string title, std::string _description = NULL);
@@ -45 +45 @@
 };
 
-class TextDialog::DoubleTextQuery : public Dialog::DoubleQuery {
+class TextDialog::DoubleTextQuery : public Dialog::TQuery<double> {
 public:
   DoubleTextQuery(Parameter<double> &, std::string title, std::string _description = NULL);
@@ -52 +52 @@
 };
 
-class TextDialog::DoublesTextQuery : public Dialog::DoublesQuery {
+class TextDialog::DoublesTextQuery : public Dialog::TQuery<std::vector<double> > {
 public:
   DoublesTextQuery(Parameter<std::vector<double> > &, std::string title, std::string _description = NULL);
@@ -59 +59 @@
 };
 
-class TextDialog::ElementTextQuery : public Dialog::ElementQuery {
+class TextDialog::ElementTextQuery : public Dialog::TQuery<const element *> {
 public:
   ElementTextQuery(Parameter<const element *> &, std::string title, std::string _description = NULL);
@@ -66 +66 @@
 };
 
-class TextDialog::ElementsTextQuery : public Dialog::ElementsQuery {
+class TextDialog::ElementsTextQuery : public Dialog::TQuery<std::vector<const element *> > {
 public:
   ElementsTextQuery(Parameter<std::vector<const element *> > &, std::string title, std::string _description = NULL);
@@ -80 +80 @@
 };
 
-class TextDialog::FileTextQuery : public Dialog::FileQuery {
+class TextDialog::FileTextQuery : public Dialog::TQuery<boost::filesystem::path> {
 public:
   FileTextQuery(Parameter<boost::filesystem::path> &, std::string title, std::string _description = NULL);
@@ -87 +87 @@
 };
 
-class TextDialog::FilesTextQuery : public Dialog::FilesQuery {
+class TextDialog::FilesTextQuery : public Dialog::TQuery<std::vector<boost::filesystem::path> > {
 public:
   FilesTextQuery(Parameter<std::vector< boost::filesystem::path> > &param, std::string title, std::string _description = NULL);
@@ -94 +94 @@
 };
 
-class TextDialog::IntTextQuery : public Dialog::IntQuery {
+class TextDialog::IntTextQuery : public Dialog::TQuery<int> {
 public:
   IntTextQuery(Parameter<int> &, std::string title, std::string _description = NULL);
@@ -101 +101 @@
 };
 
-class TextDialog::IntsTextQuery : public Dialog::IntsQuery {
+class TextDialog::IntsTextQuery : public Dialog::TQuery<std::vector<int> > {
 public:
   IntsTextQuery(Parameter<std::vector<int> > &, std::string title, std::string _description = NULL);
@@ -108 +108 @@
 };
 
-class TextDialog::MoleculeTextQuery : public Dialog::MoleculeQuery {
+class TextDialog::MoleculeTextQuery : public Dialog::TQuery<const molecule *> {
 public:
   MoleculeTextQuery(Parameter<const molecule *> &, std::string title, std::string _description = NULL);
@@ -115 +115 @@
 };
 
-class TextDialog::MoleculesTextQuery : public Dialog::MoleculesQuery {
+class TextDialog::MoleculesTextQuery : public Dialog::TQuery<std::vector<const molecule *> > {
 public:
   MoleculesTextQuery(Parameter<std::vector<const molecule *> > &, std::string title, std::string _description = NULL);
@@ -122 +122 @@
 };
 
-class TextDialog::StringTextQuery : public Dialog::StringQuery {
+class TextDialog::StringTextQuery : public Dialog::TQuery<std::string> {
 public:
   StringTextQuery(Parameter<std::string> &, std::string title, std::string _description = NULL);
@@ -129 +129 @@
 };
 
-class TextDialog::StringsTextQuery : public Dialog::StringsQuery {
+class TextDialog::StringsTextQuery : public Dialog::TQuery<std::vector<std::string> > {
 public:
   StringsTextQuery(Parameter<std::vector<std::string> > &, std::string title, std::string _description = NULL);
@@ -136 +136 @@
 };
 
-class TextDialog::UnsignedIntTextQuery : public Dialog::UnsignedIntQuery {
+class TextDialog::UnsignedIntTextQuery : public Dialog::TQuery<unsigned int> {
 public:
   UnsignedIntTextQuery(Parameter<unsigned int> &, std::string title, std::string _description = NULL);
@@ -143 +143 @@
 };
 
-class TextDialog::UnsignedIntsTextQuery : public Dialog::UnsignedIntsQuery {
+class TextDialog::UnsignedIntsTextQuery : public Dialog::TQuery<std::vector<unsigned int> > {
 public:
   UnsignedIntsTextQuery(Parameter<std::vector<unsigned int> > &, std::string title, std::string _description = NULL);
@@ -150 +150 @@
 };
 
-class TextDialog::VectorTextQuery : public Dialog::VectorQuery {
+class TextDialog::VectorTextQuery : public Dialog::TQuery<Vector> {
 public:
   VectorTextQuery(Parameter<Vector> &, std::string title, std::string _description = NULL);
@@ -157 +157 @@
 };
 
-class TextDialog::VectorsTextQuery : public Dialog::VectorsQuery {
+class TextDialog::VectorsTextQuery : public Dialog::TQuery<std::vector<Vector> > {
 public:
   VectorsTextQuery(Parameter<std::vector<Vector> > &, std::string title, std::string _description = NULL);
@@ -164 +164 @@
 };
 
-class TextDialog::RandomNumberDistribution_ParametersTextQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
+class TextDialog::RandomNumberDistribution_ParametersTextQuery : public Dialog::TQuery<RandomNumberDistribution_Parameters> {
 public:
   RandomNumberDistribution_ParametersTextQuery(Parameter<RandomNumberDistribution_Parameters> &, std::string title, std::string _description = NULL);

src/UIElements/TextUI/Query/UnsignedIntTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::UnsignedIntTextQuery::UnsignedIntTextQuery(Parameter<unsigned int> &_param, std::string title, std::string _description) :
-    Dialog::UnsignedIntQuery(_param, title,_description)
+    Dialog::TQuery<unsigned int>(_param, title,_description)
 {}
 

src/UIElements/TextUI/Query/UnsignedIntsTextQuery.cpp

@@ -29 +29 @@
 
 TextDialog::UnsignedIntsTextQuery::UnsignedIntsTextQuery(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)
 {}
 
@@ -39 +39 @@
   getline(std::cin,line);
   // dissect by " "
+  unsigned int temp_element;
   std::string::iterator olditer = line.begin();
   for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {

src/UIElements/TextUI/Query/VectorTextQuery.cpp

@@ -32 +32 @@
 
 TextDialog::VectorTextQuery::VectorTextQuery(Parameter<Vector> &_param, std::string title, std::string _description) :
-    Dialog::VectorQuery(_param, title,_description)
+    Dialog::TQuery<Vector>(_param, title,_description)
 {}
 

src/UIElements/TextUI/Query/VectorsTextQuery.cpp

@@ -32 +32 @@
 
 TextDialog::VectorsTextQuery::VectorsTextQuery(Parameter<std::vector<Vector> > &_param, std::string title, std::string _description) :
-    Dialog::VectorsQuery(_param, title,_description)
+    Dialog::TQuery<std::vector<Vector> >(_param, title,_description)
 {}
 
@@ -53 +53 @@
   std::string::iterator olditercomma = line.begin();
   int counter = 0;
+  Vector temp_element;
   for(std::string::iterator vectoriter = line.begin(); vectoriter != line.end(); ++vectoriter) {
     if (*vectoriter == ',')