Changeset c82d0c for src/UIElements/Menu/MenuDescription.hpp

Timestamp:

Dec 4, 2010, 11:47:35 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:

b2151f5

Parents:

d5240d

git-author:

Frederik Heber <heber@…> (11/11/10 18:43:28)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:47:35)

Message:

MenuDescription is now a singleton.

• also all Maps are static objects, allocated and filled dynamically in the constructor, removed in the destructor.

File:

• src/UIElements/Menu/MenuDescription.hpp (modified) (4 diffs)

src/UIElements/Menu/MenuDescription.hpp

@@ -13 +13 @@
 #include <string>
 
+#include "Patterns/Singleton.hpp"
+
 class MenuDescriptionTest;
 
@@ -18 +20 @@
  *
  */
-class MenuDescription
+class MenuDescription : public Singleton<MenuDescription>
 {
   friend class MenuDescriptionTest;
+  friend class Singleton<MenuDescription>;
 public:
-  MenuDescription();
-  ~MenuDescription();
 
-  typedef std::pair<std::string, int> TopPosition;
-  typedef std::map<std::string, TopPosition> IterableMap;
+  typedef std::pair<std::string const, int const> TopPosition;
+  typedef std::map<std::string const, TopPosition const> IterableMap;
   typedef IterableMap::iterator iterator;
   typedef IterableMap::const_iterator const_iterator ;
-  typedef std::map<std::string, std::string> TextMap;
+  typedef std::map<std::string const, std::string const> TextMap;
 
   // getter for description
@@ -35 +36 @@
   const std::string getName(const std::string &token) const;
 
-  std::multimap <std::string, std::string> getMenuItemsMap() const;
+  //std::multimap <std::string, std::string> getMenuItemsMap() const;
 
   // iterators
@@ -44 +45 @@
 
 private:
-  TextMap MenuDescriptionsMap;
-  IterableMap MenuPositionMap;
-  TextMap MenuNameMap;
-  std::multimap <std::string, std::string> MenuItemMap;
+  MenuDescription();
+  ~MenuDescription();
+
+  static TextMap *MenuDescriptionsMap;
+  static IterableMap *MenuPositionMap;
+  static TextMap *MenuNameMap;
 };