Changeset 5b9bba

Timestamp:

Dec 16, 2009, 12:30:16 PM (15 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:

9d8609

Parents:

f767d4

git-author:

Tillmann Crueger <crueger@…> (12/14/09 10:31:58)

git-committer:

Frederik Heber <heber@…> (12/16/09 12:30:16)

Message:

Changed formating of menus and added protection to keep MenuItems from being added twice. Signed-off-by: Tillmann Crueger <crueger@…>

Location:

src

Files:

• Menu/MenuItem.cpp (modified) (2 diffs)
• Menu/MenuItem.hpp (modified) (2 diffs)
• Menu/SeperatorItem.cpp (modified) (2 diffs)
• Menu/SeperatorItem.hpp (modified) (2 diffs)
• Menu/SubMenuItem.cpp (modified) (1 diff)
• Menu/SubMenuItem.hpp (modified) (1 diff)
• Menu/TextMenu.cpp (modified) (2 diffs)
• Menu/TextMenu.hpp (modified) (2 diffs)
• defs.hpp (modified) (1 diff)

src/Menu/MenuItem.cpp

@@ -16 +16 @@
 {
   description = new string(_description);
-  menu->addItem(this);
+  add_to_menu(menu);
 }
 
@@ -43 +43 @@
   return s.str();
 }
+
+void MenuItem::add_to_menu(Menu* menu) {
+  if(!wasAdded()) {
+    menu->addItem(this);
+    added=true;
+  }
+}
+
+bool MenuItem::wasAdded(){
+  return added;
+}

src/Menu/MenuItem.hpp

@@ -19 +19 @@
   char trigger;
   string *description;
+  bool added;
 
 public:
@@ -32 +33 @@
   char getTrigger();
 
+  void add_to_menu(Menu*);
+  bool wasAdded();
+
 protected:
   void setDescription(string);

src/Menu/SeperatorItem.cpp

@@ -5 +5 @@
  *      Author: crueger
  */
+#include <string>
+#include <sstream>
 
 #include "Menu/SeperatorItem.hpp"
 #include "Menu/Menu.hpp"
-#include <string>
+#include "defs.hpp"
+
 
 SeperatorItem::SeperatorItem(Menu* menu):
-MenuItem('\0',"",menu)
+MenuItem('\0',"",menu),
+spacer(STD_SEPERATOR_SPACER),
+length(STD_MENU_LENGTH)
+{
+  // TODO Auto-generated constructor stub
+
+}
+
+SeperatorItem::SeperatorItem(Menu* menu,char _spacer, int _length):
+MenuItem('\0',"",menu),
+spacer(_spacer),
+length(_length)
 {
   // TODO Auto-generated constructor stub
@@ -31 +45 @@
 
 const string SeperatorItem::formatEntry(){
-  return string ("---------------------------------------------------");
+  stringstream s;
+  for(int i=0; i<length;i++)
+    s << spacer;
+  return s.str();
 }

src/Menu/SeperatorItem.hpp

@@ -15 +15 @@
 public:
   SeperatorItem(Menu*);
+  SeperatorItem(Menu*,char,int);
   virtual ~SeperatorItem();
 
@@ -23 +24 @@
 
   virtual const string formatEntry();
+private:
+  char spacer;
+  int length;
 };
 

src/Menu/SubMenuItem.cpp

@@ -8 +8 @@
 #include "SubMenuItem.hpp"
 
-SubMenuItem::SubMenuItem(char _trigger,const char* _description,Menu* _menu,ostream& _outputter,string _title) :
+SubMenuItem::SubMenuItem(char _trigger,const char* _description,Menu* _menu,
+                         ostream& _outputter,string _title,char _spacer, int _length) :
+MenuItem(_trigger,_description,_menu),
+TextMenu(_outputter,_title,_spacer,_length)
+{
+}
+
+SubMenuItem::SubMenuItem(char _trigger,const char* _description,Menu* _menu,
+                         ostream& _outputter,string _title) :
 MenuItem(_trigger,_description,_menu),
 TextMenu(_outputter,_title)

src/Menu/SubMenuItem.hpp

@@ -10 +10 @@
 {
 public:
+  SubMenuItem(char,const char*,Menu *,ostream&,string,char,int);
   SubMenuItem(char,const char*,Menu *,ostream&,string);
   virtual ~SubMenuItem();

src/Menu/TextMenu.cpp

@@ -8 +8 @@
 #include <boost/bind.hpp>
 #include <iostream>
-#include "TextMenu.hpp"
-#include "MenuItem.hpp"
+#include <cmath>
+#include "defs.hpp"
+#include "Menu/TextMenu.hpp"
+#include "Menu/MenuItem.hpp"
+
+TextMenu::TextMenu(ostream& _outputter, string _title, char _spacer,int _length) :
+outputter(_outputter),
+title(_title),
+spacer(_spacer),
+length(_length),
+quit(false)
+{
+}
 
 TextMenu::TextMenu(ostream& _outputter, string _title) :
 outputter(_outputter),
 title(_title),
+spacer(STD_MENU_TITLE_SPACER),
+length(STD_MENU_LENGTH),
 quit(false)
 {
@@ -48 +61 @@
   char choice;
   do {
-    outputter << title << "\n";
+    int pre = floor((length - title.length()) /2.0);
+    int post = ceil((length - title.length()) /2.0);
+    for(int i=0;i<pre;i++)
+      outputter << spacer;
+    outputter << title;
+    for(int i=0;i<post;i++)
+          outputter << spacer;
+    outputter << '\n';
     for_each(items.begin(), items.end(), boost::bind(&TextMenu::showEntry,this,_1));
     outputter.flush();

src/Menu/TextMenu.hpp

@@ -20 +20 @@
 {
 public:
+  TextMenu(ostream&,string,char,int);
   TextMenu(ostream&,string);
   virtual ~TextMenu();
@@ -37 +38 @@
   ostream& outputter;
   string title;
+  char spacer;
+  int length;
+
   bool quit;
 };

src/defs.hpp

@@ -77 +77 @@
 #define UPDATECOUNT 10  //!< update ten sites per BOSSANOVA interval
 
+#define STD_MENU_LENGTH 60
+#define STD_MENU_TITLE_SPACER '='
+#define STD_SEPERATOR_SPACER '-'
+
 #endif /*DEFS_HPP_*/