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

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/TextUI/Query

Files:

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

src/UIElements/TextUI/Query/AtomTextQuery.cpp

@@ -55 +55 @@
       std::cout << "Invalid Atom Index" << idxOfAtom << std::endl;
       badInput = true;
-    }else
-      param.set(temp);
+    }
 
   } while(badInput);

src/UIElements/TextUI/Query/AtomsTextQuery.cpp

@@ -67 +67 @@
     }
   }
-  param.set(temp);
 
   return (idxOfAtom!=-1);

src/UIElements/TextUI/Query/BooleanTextQuery.cpp

@@ -42 +42 @@
     std::cin >> input;
     if ((input == 'y' ) || (input == 'Y')) {
-      param.set(true);
+      temp = true;
     } else if ((input == 'n' ) || (input == 'N')) {
-      param.set(false);
+      temp = false;
     } else {
       badInput=true;

src/UIElements/TextUI/Query/DoubleTextQuery.cpp

@@ -45 +45 @@
       std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
       std::cout << "Input was not a number!" << std::endl;
-    }else
-      param.set(temp);
+    }
   }while(badInput);
   std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');

src/UIElements/TextUI/Query/DoublesTextQuery.cpp

@@ -54 +54 @@
     temp.push_back(temp_element);
   }
-  param.set(temp);
 
   return true;

src/UIElements/TextUI/Query/ElementsTextQuery.cpp

@@ -83 +83 @@
     }
   }
-  param.set(temp);
 
   return (Z!=-1);

src/UIElements/TextUI/Query/FileTextQuery.cpp

@@ -52 +52 @@
   } while(badInput);
   std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
-  param.set(temp);
   return true;
 }

src/UIElements/TextUI/Query/FilesTextQuery.cpp

@@ -38 +38 @@
 
 bool TextDialog::FilesTextQuery::handle() {
-  std::vector<boost::filesystem::path> tempfiles;
   bool badInput = false;
   bool continueflag = true;
@@ -61 +60 @@
     if (tempstring != "y")
       continueflag = false;
-    tempfiles.push_back(tempfile);
+    temp.push_back(tempfile);
   } while(continueflag);
   std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
-  param.set(tempfiles);
   return true;
 }

src/UIElements/TextUI/Query/IntTextQuery.cpp

@@ -45 +45 @@
       std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
       std::cout << "Input was not a number!" << std::endl;
-    }else
-      param.set(temp);
+    }
   } while(badInput);
   // clear the input buffer of anything still in the line

src/UIElements/TextUI/Query/IntsTextQuery.cpp

@@ -54 +54 @@
     temp.push_back(temp_element);
   }
-  param.set(temp);
 
   return true;

src/UIElements/TextUI/Query/MoleculeTextQuery.cpp

@@ -57 +57 @@
       badInput = true;
     }
-    param.set(temp);
 
   } while(badInput);

src/UIElements/TextUI/Query/MoleculesTextQuery.cpp

@@ -67 +67 @@
     }
   }
-  param.set(temp);
 
   return (idxOfMol!=-1);

src/UIElements/TextUI/Query/RandomNumberDistribution_ParametersTextQuery.cpp

@@ -51 +51 @@
       continue;
     }
-    param.set(temp);
 
   } while(badInput);

src/UIElements/TextUI/Query/RealSpaceMatrixTextQuery.cpp

@@ -55 +55 @@
   temp.set(2,1, dtemp[4]);
   temp.set(2,2, dtemp[5]);
-  param.set(temp);
   return true;
 }

src/UIElements/TextUI/Query/StringTextQuery.cpp

@@ -37 +37 @@
   std::cout << getDescription() << ": ";
   getline(std::cin,temp);
-  param.set(temp);
   return true;
 }

src/UIElements/TextUI/Query/StringsTextQuery.cpp

@@ -48 +48 @@
   if (olditer != temp_element.begin())  // insert last part also
     temp.push_back(std::string(olditer, temp_element.end()));
-  param.set(temp);
 
   return true;

src/UIElements/TextUI/Query/UnsignedIntTextQuery.cpp

@@ -45 +45 @@
       std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
       std::cout << "Input was not a number!" << std::endl;
-    }else
-      param.set(temp);
+    }
   } while(badInput);
   // clear the input buffer of anything still in the line

src/UIElements/TextUI/Query/UnsignedIntsTextQuery.cpp

@@ -54 +54 @@
     temp.push_back(temp_element);
   }
-  param.set(temp);
 
   return true;

src/UIElements/TextUI/Query/VectorTextQuery.cpp

@@ -54 +54 @@
   for(std::string::iterator iter = line.begin(); (iter != line.end()) && (counter != 3); ++iter) {
     if (*iter == ',') {
-      std::istringstream stream(std::string(iter, olditer));
+      iter++;
+      std::istringstream stream(std::string(olditer, iter));
       stream >> coord;
       temp[counter++] = coord;
@@ -65 +66 @@
     temp[counter++] = coord;
   }
-  param.set(temp);
 
   // check vector

src/UIElements/TextUI/Query/VectorsTextQuery.cpp

@@ -77 +77 @@
     }
   }
-  param.set(temp);
 
   return true;