Changeset 0e08d5 for src

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:

a01144

Parents:

b2151f5

git-author:

Frederik Heber <heber@…> (11/11/10 18:48:45)

git-committer:

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

Message:

MEMFIX: Submenus were not free'd.

• introduced list of submenus to class TextMenu.
• Submenu TextMenus are deleted in destructor of TextMenu.
• also ShortcutMap is cleared there.
• in TxMenu list of MenuItems is properly erased now.

Location:

src/UIElements/Menu/TextMenu

Files:

• TextMenu.hpp (modified) (3 diffs)
• TxMenu.cpp (modified) (1 diff)

src/UIElements/Menu/TextMenu/TextMenu.hpp

@@ -62 +62 @@
   ~TextMenu()
   {
+    ShortcutMap.clear();
     if (deleteMenu)
       delete MenuInstance;
+    for (typename SubmenuList::iterator iter = Submenus.begin(); !Submenus.empty(); iter = Submenus.begin()) {
+      delete(*iter);
+      Submenus.erase(iter);
+    }
   }
 
@@ -102 +107 @@
   MenuShortcutMap ShortcutMap;
 
+  typedef std::list< TextMenu<T> *> SubmenuList;
+  SubmenuList Submenus;
+
   /** Adds an ActionItem by simply creating a new one.
    * \param &token token of Action (token in ActionRegistry)
@@ -128 +136 @@
   {
     TextMenu<TxMenu> *NewMenu = new TextMenu<TxMenu>(outputter, token);
+    Submenus.push_back(NewMenu);
     new SubMenuItem(getSuitableShortForm(description), description, MenuInstance, NewMenu->getMenuInstance());
     NewMenu->reserveShortcut('q',"leave"+token);

src/UIElements/Menu/TextMenu/TxMenu.cpp

@@ -52 +52 @@
 TxMenu::~TxMenu()
 {
-  for(std::list<MenuItem*>::iterator it=items.begin(); it != items.end(); it++)
+  for(std::list<MenuItem*>::iterator it=items.begin(); !items.empty(); it=items.begin()) {
     delete (*it);
+    items.erase(it);
+  }
 }