Changeset d754bb for src/UIElements/TextUI/Query/ElementTextQuery.cpp

Timestamp:

Dec 4, 2010, 11:44:19 PM (14 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:

5d4b73, d2b28f

Parents:

5eebbc

git-author:

Frederik Heber <heber@…> (11/09/10 15:03:10)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:44:19)

Message:

All TextQuery now show getDescription()+": " on handle() call.

• getTitle() is only a token ... not a description

File:

• src/UIElements/TextUI/Query/ElementTextQuery.cpp (modified) (6 diffs)

src/UIElements/TextUI/Query/ElementTextQuery.cpp

@@ -44 +44 @@
   do{
     badInput = false;
-    Log() << Verbose(0) << getTitle();
+    std::cout << getDescription() << ": ";
 
     // try to read as Atomic number
     int Z;
-    cin >> Z;
-    if(!cin.fail()){
+    std::cin >> Z;
+    if(!std::cin.fail()){
       if(Z==-1){
         aborted = true;
@@ -56 +56 @@
         temp = World::getInstance().getPeriode()->FindElement(Z);
         if(!temp){
-          Log() << Verbose(0) << "No element with this atomic number!" << endl;
+          std::cout << "No element with this atomic number!" << std::endl;
           badInput = true;
         }
@@ -63 +63 @@
     }
     else{
-      cin.clear();
+      std::cin.clear();
     }
 
@@ -70 +70 @@
     // same thing again, this time as a std::string
     std::string shorthand;
-    cin >> shorthand;
-    if(!cin.fail()){
+    std::cin >> shorthand;
+    if(!std::cin.fail()){
       if(shorthand.empty()){
         aborted = true;
@@ -78 +78 @@
         temp = World::getInstance().getPeriode()->FindElement(shorthand.c_str());
         if(!temp){
-          Log() << Verbose(0) << "No element with this shorthand!" << endl;
+          std::cout << "No element with this shorthand!" << std::endl;
           badInput = true;
         }
@@ -84 +84 @@
     }
     else{
-      Log() << Verbose(0) << "Could not read input. Try Again." << endl;
-      cin.clear();
-      cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+      std::cout << "Could not read input. Try Again." << std::endl;
+      std::cin.clear();
+      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
       badInput = true;
     }
 
   }while(badInput);
-  cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
   return !aborted;
 }