Changeset c82d0c

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.

Location:

src

Files:

• UIElements/Menu/Menu.cpp (modified) (3 diffs)
• UIElements/Menu/Menu.hpp (modified) (1 diff)
• UIElements/Menu/MenuDescription.cpp (modified) (9 diffs)
• UIElements/Menu/MenuDescription.hpp (modified) (4 diffs)
• builder.cpp (modified) (2 diffs)
• unittests/MenuDescriptionUnitTest.cpp (modified) (1 diff)

src/UIElements/Menu/Menu.cpp

@@ -41 +41 @@
  */
 Menu::~Menu()
-{}
+{
+  DuplicatesList.clear();
+}
 
 /** Initialiser for class Menu.
@@ -65 +67 @@
     CompleteFlag = true;
     PossibleMissingFlag = false;
-    for(MenuDescription::const_iterator iter = menudescriptions.getBeginIter();
-        iter != menudescriptions.getEndIter();
+    for(MenuDescription::const_iterator iter = MenuDescription::getInstance().getBeginIter();
+        iter != MenuDescription::getInstance().getEndIter();
         ++iter) {
       // skip when already present
@@ -137 +139 @@
   ASSERT (!isPresent(MenuName),
       "Menu::addSubmenu() - trying to add menu "+MenuName+" with already present token!");
-  addSubmenuItem(MenuName, menudescriptions.getDescription(MenuName));
+  addSubmenuItem(MenuName, MenuDescription::getInstance().getDescription(MenuName));
   DuplicatesList.insert(MenuName);
   LastItem = MenuItem;

src/UIElements/Menu/Menu.hpp

@@ -72 +72 @@
 
   int TopPosition;  // current position to add
-  MenuDescription menudescriptions; // contains the menu tree and description to each item
   enum ItemType LastItem;  // check whether separator followed separator
   std::set <std::string> DuplicatesList;  // is used to check for duplicates

src/UIElements/Menu/MenuDescription.cpp

@@ -24 +24 @@
 #include <string>
 
-#include "Actions/ActionRegistry.hpp"
+//#include "Actions/ActionRegistry.hpp"
 #include "Menu/MenuDescription.hpp"
+
+#include "Patterns/Singleton_impl.hpp"
+
+MenuDescription::TextMap *MenuDescription::MenuDescriptionsMap = NULL;
+MenuDescription::IterableMap *MenuDescription::MenuPositionMap = NULL;
+MenuDescription::TextMap *MenuDescription::MenuNameMap = NULL;
+
 
 /** Constructor of class MenuDescription.
@@ -32 +39 @@
 MenuDescription::MenuDescription()
 {
+  // allocate maps
+  MenuDescriptionsMap = new TextMap();
+  MenuPositionMap = new IterableMap();
+  MenuNameMap = new TextMap();
+
   // put each menu into its place, "" means top level
-  MenuPositionMap["analysis"] = TopPosition("tools",1);
-  MenuPositionMap["atom"] = TopPosition("edit",1);
-  MenuPositionMap["command"] = TopPosition("",3);
-  MenuPositionMap["edit"] = TopPosition("",2);
-  MenuPositionMap["fragmentation"] = TopPosition("tools",3);
-  MenuPositionMap["molecule"] = TopPosition("edit",2);
-  MenuPositionMap["parser"] = TopPosition("edit",3);
-  MenuPositionMap["selection"] = TopPosition("edit",4);
-  MenuPositionMap["tesselation"] = TopPosition("tools",2);
-  MenuPositionMap["tools"] = TopPosition("",4);
-  MenuPositionMap["world"] = TopPosition("",1);
+  MenuPositionMap->insert(std::make_pair("analysis",TopPosition("tools",1)));
+  MenuPositionMap->insert(std::make_pair("atom",TopPosition("edit",1)));
+  MenuPositionMap->insert(std::make_pair("command",TopPosition("",3)));
+  MenuPositionMap->insert(std::make_pair("edit",TopPosition("",2)));
+  MenuPositionMap->insert(std::make_pair("fragmentation",TopPosition("tools",3)));
+  MenuPositionMap->insert(std::make_pair("molecule",TopPosition("edit",2)));
+  MenuPositionMap->insert(std::make_pair("parser",TopPosition("edit",3)));
+  MenuPositionMap->insert(std::make_pair("selection",TopPosition("edit",4)));
+  MenuPositionMap->insert(std::make_pair("tesselation",TopPosition("tools",2)));
+  MenuPositionMap->insert(std::make_pair("tools",TopPosition("",4)));
+  MenuPositionMap->insert(std::make_pair("world",TopPosition("",1)));
 
   // put menu description into each menu category
-  MenuDescriptionsMap["analysis"] = "Analysis (pair correlation, volume)";
-  MenuDescriptionsMap["atom"] = "Edit atoms";
-  MenuDescriptionsMap["command"] = "Configuration";
-  MenuDescriptionsMap["edit"] = "Edit";
-  MenuDescriptionsMap["fragmentation"] = "Fragmentation";
-  MenuDescriptionsMap["molecule"] = "Parse files into system";
-  MenuDescriptionsMap["parser"] = "Edit molecules (load, parse, save)";
-  MenuDescriptionsMap["selection"] = "Select atoms/molecules";
-  MenuDescriptionsMap["tesselation"] = "Tesselate molecules";
-  MenuDescriptionsMap["tools"] = "Various tools";
-  MenuDescriptionsMap["world"] = "Edit world";
+  MenuDescriptionsMap->insert(std::make_pair("analysis","Analysis (pair correlation, volume)"));
+  MenuDescriptionsMap->insert(std::make_pair("atom","Edit atoms"));
+  MenuDescriptionsMap->insert(std::make_pair("command","Configuration"));
+  MenuDescriptionsMap->insert(std::make_pair("edit","Edit"));
+  MenuDescriptionsMap->insert(std::make_pair("fragmentation","Fragmentation"));
+  MenuDescriptionsMap->insert(std::make_pair("molecule","Parse files into system"));
+  MenuDescriptionsMap->insert(std::make_pair("parser","Edit molecules (load, parse, save)"));
+  MenuDescriptionsMap->insert(std::make_pair("selection","Select atoms/molecules"));
+  MenuDescriptionsMap->insert(std::make_pair("tesselation","Tesselate molecules"));
+  MenuDescriptionsMap->insert(std::make_pair("tools","Various tools"));
+  MenuDescriptionsMap->insert(std::make_pair("world","Edit world"));
 
   // put menu name into each menu category
-  MenuNameMap["analysis"] = "Analysis";
-  MenuNameMap["atom"] = "Atoms";
-  MenuNameMap["command"] = "Configuration";
-  MenuNameMap["edit"] = "Edit";
-  MenuNameMap["fragmentation"] = "Fragmentation";
-  MenuNameMap["molecule"] = "Molecules";
-  MenuNameMap["parser"] = "Input/Output";
-  MenuNameMap["selection"] = "Selection";
-  MenuNameMap["tesselation"] = "Tesselation";
-  MenuNameMap["tools"] = "Tools";
-  MenuNameMap["world"] = "Globals";
+  MenuNameMap->insert(std::make_pair("analysis","Analysis"));
+  MenuNameMap->insert(std::make_pair("atom","Atoms"));
+  MenuNameMap->insert(std::make_pair("command","Configuration"));
+  MenuNameMap->insert(std::make_pair("edit","Edit"));
+  MenuNameMap->insert(std::make_pair("fragmentation","Fragmentation"));
+  MenuNameMap->insert(std::make_pair("molecule","Molecules"));
+  MenuNameMap->insert(std::make_pair("parser","Input/Output"));
+  MenuNameMap->insert(std::make_pair("selection","Selection"));
+  MenuNameMap->insert(std::make_pair("tesselation","Tesselation"));
+  MenuNameMap->insert(std::make_pair("tools","Tools"));
+  MenuNameMap->insert(std::make_pair("world","Globals"));
 }
 
@@ -76 +88 @@
  */
 MenuDescription::~MenuDescription()
-{}
+{
+  std::cout << "MenuDescription: clearing maps ... " << std::endl;
+  for (IterableMap::iterator iter = MenuPositionMap->begin(); !MenuPositionMap->empty(); iter = MenuPositionMap->begin())
+    MenuPositionMap->erase(iter);
+  delete MenuNameMap;
+  delete MenuDescriptionsMap;
+  delete MenuPositionMap;
+}
 
 /** Getter for MenuDescriptionsMap.
@@ -84 +103 @@
 const std::string MenuDescription::getDescription(const std::string &token) const
 {
-  if (MenuDescriptionsMap.find(token) != MenuDescriptionsMap.end())
-    return MenuDescriptionsMap.find(token)->second;
+  if (MenuDescriptionsMap->find(token) != MenuDescriptionsMap->end())
+    return MenuDescriptionsMap->find(token)->second;
   else
     return std::string();
 }
 
-/** Getter for MenuNameMap.
+/** Getter for MenuNameMap->
  * \param token name of menu
  * \return description string of the menu or empty
@@ -96 +115 @@
 const std::string MenuDescription::getName(const std::string &token) const
 {
-  if (MenuNameMap.find(token) != MenuNameMap.end())
-    return MenuNameMap.find(token)->second;
+  if (MenuNameMap->find(token) != MenuNameMap->end())
+    return MenuNameMap->find(token)->second;
   else
     return std::string();
 }
 
-/** Constructs a multimap of all menus running over all actions belonging to it.
- * \return multimap with which actions belongs to which menu.
- */
-std::multimap <std::string, std::string> MenuDescription::getMenuItemsMap() const
-{
-  std::multimap <std::string, std::string> result;
-
-  ActionRegistry &AR = ActionRegistry::getInstance();
-  for (ActionRegistry::const_iterator iter = AR.getBeginIter();iter != AR.getEndIter();++iter) {
-    std::cout << "Inserting " << (iter->second)->getName() << " into menu " << (iter->second)->Traits.getMenuName() << std::endl;
-    result.insert( std::pair<std::string, std::string> ((iter->second)->Traits.getMenuName(), (iter->second)->getName()));
-  }
-  // TODO: MenuPosition is not yet realized.
-  return result;
-}
+///** Constructs a multimap of all menus running over all actions belonging to it.
+// * \return multimap with which actions belongs to which menu.
+// */
+//std::multimap <std::string, std::string> MenuDescription::getMenuItemsMap() const
+//{
+//  std::multimap <std::string, std::string> result;
+//
+//  ActionRegistry &AR = ActionRegistry::getInstance();
+//  for (ActionRegistry::const_iterator iter = AR.getBeginIter();iter != AR.getEndIter();++iter) {
+//    std::cout << "Inserting " << (iter->second)->getName() << " into menu " << (iter->second)->Traits.getMenuName() << std::endl;
+//    result.insert( std::pair<std::string, std::string> ((iter->second)->Traits.getMenuName(), (iter->second)->getName()));
+//  }
+//  // TODO: MenuPosition is not yet realized.
+//  return result;
+//}
 
 /** Forward iterator from beginning of list of descriptions.
@@ -123 +142 @@
 MenuDescription::iterator MenuDescription::getBeginIter()
 {
-  return MenuPositionMap.begin();
+  return MenuPositionMap->begin();
 }
 
@@ -131 +150 @@
 MenuDescription::iterator MenuDescription::getEndIter()
 {
-  return MenuPositionMap.end();
+  return MenuPositionMap->end();
 }
 
@@ -139 +158 @@
 MenuDescription::const_iterator MenuDescription::getBeginIter() const
 {
-  return MenuPositionMap.begin();
+  return MenuPositionMap->begin();
 }
 
@@ -147 +166 @@
 MenuDescription::const_iterator MenuDescription::getEndIter() const
 {
-  return MenuPositionMap.end();
+  return MenuPositionMap->end();
 }
 
-
+CONSTRUCT_SINGLETON(MenuDescription)

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;
 };
 

src/builder.cpp

@@ -82 +82 @@
 #include "tesselationhelpers.hpp"
 #include "UIElements/UIFactory.hpp"
+#include "UIElements/Menu/MenuDescription.hpp"
 #include "UIElements/TextUI/TextUIFactory.hpp"
 #include "UIElements/CommandLineUI/CommandLineUIFactory.hpp"
@@ -136 +137 @@
   ChangeTracker::purgeInstance();
   World::purgeInstance();
+  MenuDescription::purgeInstance();
   UIFactory::purgeInstance();
   ValueStorage::purgeInstance();

src/unittests/MenuDescriptionUnitTest.cpp

@@ -51 +51 @@
 {
   // from MenuSet
-  for(MenuDescription::const_iterator iter = md.MenuPositionMap.begin(); iter != md.MenuPositionMap.end(); ++iter) {
+  for(MenuDescription::const_iterator iter = md.MenuPositionMap->begin(); iter != md.MenuPositionMap->end(); ++iter) {
     const std::string &MenuName = iter->first;
-    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuDewscriptionsMap", md.MenuDescriptionsMap.find(MenuName) != md.MenuDescriptionsMap.end());
-    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuNameMap", md.MenuNameMap.find(MenuName) != md.MenuNameMap.end());
+    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuDewscriptionsMap", md.MenuDescriptionsMap->find(MenuName) != md.MenuDescriptionsMap->end());
+    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuNameMap", md.MenuNameMap->find(MenuName) != md.MenuNameMap->end());
   }
 
   // from MenuDescriptionsMap
-  for(std::map<std::string, std::string>::const_iterator iter = md.MenuDescriptionsMap.begin(); iter != md.MenuDescriptionsMap.end(); ++iter) {
-    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuSet", md.MenuPositionMap.find(iter->first) != md.MenuPositionMap.end());
-    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuNameMap", md.MenuNameMap.find(iter->first) != md.MenuNameMap.end());
+  for(std::map<std::string const, std::string const>::const_iterator iter = md.MenuDescriptionsMap->begin(); iter != md.MenuDescriptionsMap->end(); ++iter) {
+    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuSet", md.MenuPositionMap->find(iter->first) != md.MenuPositionMap->end());
+    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuNameMap", md.MenuNameMap->find(iter->first) != md.MenuNameMap->end());
   }
 
   // from MenuNameMap
-  for(std::map<std::string, std::string>::const_iterator iter = md.MenuNameMap.begin(); iter != md.MenuNameMap.end(); ++iter) {
-    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuDescriptionsMap", md.MenuDescriptionsMap.find(iter->first) != md.MenuDescriptionsMap.end());
-    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuSet", md.MenuPositionMap.find(iter->first) != md.MenuPositionMap.end());
+  for(std::map<std::string const, std::string const>::const_iterator iter = md.MenuNameMap->begin(); iter != md.MenuNameMap->end(); ++iter) {
+    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuDescriptionsMap", md.MenuDescriptionsMap->find(iter->first) != md.MenuDescriptionsMap->end());
+    CPPUNIT_ASSERT_MESSAGE( "menu token not contained in MenuDescription::MenuSet", md.MenuPositionMap->find(iter->first) != md.MenuPositionMap->end());
   }