Changeset 852ea3 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:

7e6a1b

Parents:

1c55b8

git-author:

Michael Ankele <ankele@…> (08/16/12 15:38:10)

git-committer:

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

Message:

further query merging (QtQuery added, handle() won't use param.set())

Location:

src/UIElements/CommandLineUI/Query

Files:

• AtomCommandLineQuery.cpp (modified) (1 diff)
• AtomsCommandLineQuery.cpp (modified) (1 diff)
• BooleanCommandLineQuery.cpp (modified) (1 diff)
• DoubleCommandLineQuery.cpp (modified) (1 diff)
• DoublesCommandLineQuery.cpp (modified) (1 diff)
• ElementCommandLineQuery.cpp (modified) (1 diff)
• ElementsCommandLineQuery.cpp (modified) (1 diff)
• 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) (1 diff)
• 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) (1 diff)

src/UIElements/CommandLineUI/Query/AtomCommandLineQuery.cpp

@@ -43 +43 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     IdxOfAtom = CommandLineParser::getInstance().vm[getTitle()].as<int>();
-    param.set(World::getInstance().getAtom(AtomById(IdxOfAtom)));
+    temp = World::getInstance().getAtom(AtomById(IdxOfAtom));
     return true;
   } else {

src/UIElements/CommandLineUI/Query/AtomsCommandLineQuery.cpp

@@ -44 +44 @@
         temp.push_back(temp_element);
     }
-    param.set(temp);
     return true;
   } else {

src/UIElements/CommandLineUI/Query/BooleanCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::BooleanCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as<bool>());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as<bool>();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/DoubleCommandLineQuery.cpp

@@ -34 +34 @@
 bool CommandLineDialog::DoubleCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as<double>());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as<double>();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/DoublesCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::DoublesCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as< std::vector<double> >());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<double> >();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp

@@ -40 +40 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     int Z = CommandLineParser::getInstance().vm[getTitle()].as< int >();
-    param.set(periode->FindElement(Z));
-    ASSERT(param.get() != NULL, "Invalid element specified in ElementCommandLineQuery");
+    temp = periode->FindElement(Z);
+    ASSERT(temp != NULL, "Invalid element specified in ElementCommandLineQuery");
     return true;
   } else {

src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp

@@ -46 +46 @@
       temp.push_back(temp_element);
     }
-    param.set(temp);
     return true;
   } else {

src/UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::FileCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as< boost::filesystem::path >());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as< boost::filesystem::path >();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/FilesCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::FilesCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as< std::vector<boost::filesystem::path> >());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<boost::filesystem::path> >();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::IntCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as<int>());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as<int>();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::IntsCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as< std::vector<int> >());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<int> >();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/MoleculeCommandLineQuery.cpp

@@ -38 +38 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     IdxOfMol = CommandLineParser::getInstance().vm[getTitle()].as<int>();
-    param.set(World::getInstance().getMolecule(MoleculeById(IdxOfMol)));
+    temp = World::getInstance().getMolecule(MoleculeById(IdxOfMol));
     return true;
   } else {

src/UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp

@@ -44 +44 @@
         temp.push_back(temp_element);
     }
-    param.set(temp);
     return true;
   } else {

src/UIElements/CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp

@@ -43 +43 @@
 //    LOG(1, "INFO: Parameter set from CommandLine is '" << text.str() << "'");
     text >> temp;
-    param.set(temp);
     return true;
   } else {

src/UIElements/CommandLineUI/Query/RealSpaceMatrixCommandLineQuery.cpp

@@ -38 +38 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     _temp = CommandLineParser::getInstance().vm[getTitle()].as< RealSpaceMatrixValue >();
-    param.set(_temp.toRealSpaceMatrix());
+    temp = _temp.toRealSpaceMatrix();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/StringCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::StringCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as<string>());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as<string>();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::StringsCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as< std::vector<std::string> >());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<std::string> >();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/UnsignedIntCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::UnsignedIntCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as<unsigned int>());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as<unsigned int>();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/UnsignedIntsCommandLineQuery.cpp

@@ -33 +33 @@
 bool CommandLineDialog::UnsignedIntsCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    param.set(CommandLineParser::getInstance().vm[getTitle()].as< std::vector<unsigned int> >());
+    temp = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<unsigned int> >();
     return true;
   } else {

src/UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp

@@ -41 +41 @@
     _temp = CommandLineParser::getInstance().vm[getTitle()].as< VectorValue >();
     temp = _temp.toVector();
-    param.set(temp);
     return true;
   } else {

src/UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp

@@ -44 +44 @@
       temp.push_back(temp_element);
     }
-    param.set(temp);
     return true;
   } else {