Changeset 8f113e

Timestamp:

Dec 29, 2009, 12:20:20 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

1020f0

Parents:

77675f

Message:

Added possibility to add default Items to textMenus

Location:

src/Menu

Files:

• DisplayMenuItem.cpp (modified) (1 diff)
• DisplayMenuItem.hpp (modified) (1 diff)
• MenuItem.cpp (modified) (1 diff)
• MenuItem.hpp (modified) (1 diff)
• SeperatorItem.cpp (modified) (1 diff)
• SeperatorItem.hpp (modified) (1 diff)
• TextMenu.cpp (modified) (3 diffs)
• TextMenu.hpp (modified) (2 diffs)

src/Menu/DisplayMenuItem.cpp

@@ -36 +36 @@
 
 void DisplayMenuItem::doTrigger(){}
-void DisplayMenuItem::checkTrigger(char c){}
+bool DisplayMenuItem::checkTrigger(char c){
+  return false;
+}
 
 const string DisplayMenuItem::formatEntry(){

src/Menu/DisplayMenuItem.hpp

@@ -28 +28 @@
 
   virtual void doTrigger();
-  virtual void checkTrigger(char);
+  virtual bool checkTrigger(char);
 
   virtual const string formatEntry();

src/Menu/MenuItem.cpp

@@ -33 +33 @@
  * check if the trigger matches and call doTrigger if it does.
  */
-void MenuItem::checkTrigger(char key) {
-  if(key == trigger)
+bool MenuItem::checkTrigger(char key) {
+  if(key == trigger) {
     doTrigger();
+    return true;
+  }
+  else
+    return false;
+
 }
 

src/Menu/MenuItem.hpp

@@ -31 +31 @@
 
   virtual void doTrigger()=0;
-  virtual void checkTrigger(char);
+  virtual bool checkTrigger(char);
 
   virtual const string formatEntry();

src/Menu/SeperatorItem.cpp

@@ -38 +38 @@
 
 void SeperatorItem::doTrigger(){}
-void SeperatorItem::checkTrigger(char){}
+bool SeperatorItem::checkTrigger(char){
+  return false;
+}
 
 const string SeperatorItem::getDescription() {

src/Menu/SeperatorItem.hpp

@@ -24 +24 @@
 
   virtual void doTrigger();
-  virtual void checkTrigger(char);
+  virtual bool checkTrigger(char);
 
   virtual const string getDescription();

src/Menu/TextMenu.cpp

@@ -22 +22 @@
 spacer(_spacer),
 length(_length),
-quit(false)
+quit(false),
+defaultItem(0)
 {
 }
@@ -55 +56 @@
 void TextMenu::display() {
   char choice;
+  bool somethingChosen = false;
   do {
     int pre = floor((length - title.length()) /2.0);
@@ -69 +71 @@
     cin >> choice;
 
-    for_each(items.begin(), items.end(), boost::bind(&MenuItem::checkTrigger,_1,choice));
+    list<MenuItem*>::iterator iter;
+    for(iter = items.begin(); iter!=items.end();iter++){
+      somethingChosen |= (*iter)->checkTrigger(choice);
+    }
+    // see if something was chosen and call default Item if not
+    if(!somethingChosen) {
+      if(defaultItem){
+        defaultItem->doTrigger();
+      }
+      else{
+        outputter << "Invalid Choice!" <<  endl;
+      }
+    }
   }while (!hasQuit());
 }
+
+void TextMenu::addDefault(MenuItem* _defaultItem) {
+  defaultItem = _defaultItem;
+}

src/Menu/TextMenu.hpp

@@ -38 +38 @@
   virtual void doQuit();
   /**
-   * Check wether someone has chosen to quit
+   * Check whether someone has chosen to quit
    */
   virtual bool hasQuit();
+
+  virtual void addDefault(MenuItem*);
 
 protected:
@@ -47 +49 @@
 private:
   list<MenuItem*> items;
+
+  MenuItem* defaultItem;
+
   ostream& outputter;
   string title;