Changeset d649b7 for src

Timestamp:

Sep 19, 2013, 8:23:52 PM (11 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:

126867

Parents:

6367dd

git-author:

Frederik Heber <heber@…> (08/20/13 09:33:29)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:52)

Message:

Added functor getLastPosition, extracted from ActionRegistry.

• this function had been placed in ActionRegistry only for convenience because of direct access to all action tokens. However, it is more sensible to place it with the menus.

Location:

src

Files:

• Actions/ActionQueue.cpp (modified) (1 diff)
• Actions/ActionQueue.hpp (modified) (1 diff)
• Actions/ActionRegistry.cpp (modified) (1 diff)
• Actions/ActionRegistry.hpp (modified) (1 diff)
• UIElements/Makefile.am (modified) (2 diffs)
• UIElements/Menu/TextMenu/TextMenu.hpp (modified) (5 diffs)
• UIElements/Menu/getLastPosition.cpp (added)
• UIElements/Menu/getLastPosition.hpp (added)

src/Actions/ActionQueue.cpp

@@ -69 +69 @@
 }
 
-int ActionQueue::getLastPosition(const std::string &MenuName) const
-{
-  return AR->getLastPosition(MenuName);
-}
-
 const ActionTrait& ActionQueue::getActionsTrait(const std::string &name) const
 {

src/Actions/ActionQueue.hpp

@@ -54 +54 @@
    */
   bool isActionKnownByName(const std::string &name) const;
-
-  /** Returns the last taken position for the Menu with \a MenuName.
-   *
-   * \param MenuName name of menu to check for last position
-   * \return index of last position
-   */
-  int getLastPosition(const std::string &MenuName) const;
 
   /** Returns the vector with the tokens of all currently known Actions.

src/Actions/ActionRegistry.cpp

@@ -144 +144 @@
 }
 
-/** Returns the last present action position in the requested menu.
- * \param &token token of the menu
- * \return last used position
- */
-int ActionRegistry::getLastPosition(const std::string &token) const
-{
-  int position = 0;
-  for (const_iterator iter = getBeginIter();
-      iter != getEndIter();
-      ++iter) {
-    const std::string &MenuName = (iter->second)->Traits.getMenuName();
-    const int &MenuPosition = (iter->second)->Traits.getMenuPosition();
-    if ((MenuName == token) && (position < MenuPosition))
-      position = MenuPosition;
-  }
-  return position;
-}
-
 
 CONSTRUCT_REGISTRY(Action)

src/Actions/ActionRegistry.hpp

@@ -44 +44 @@
   Action* getActionByName(const std::string &name);
   bool isActionPresentByName(const std::string &name) const;
-  int getLastPosition(const std::string &MenuName) const;
 
   /** Static getter for the state of the registry.

src/UIElements/Makefile.am

@@ -43 +43 @@
 
 MENUSOURCE = \
+  UIElements/Menu/getLastPosition.cpp \
   UIElements/Menu/Menu.cpp \
   UIElements/Menu/MenuDescription.cpp \
@@ -48 +49 @@
 
 MENUHEADER = \
+  UIElements/Menu/getLastPosition.hpp \
   UIElements/Menu/Menu.hpp \
   UIElements/Menu/MenuDescription.hpp \

src/UIElements/Menu/TextMenu/TextMenu.hpp

@@ -27 +27 @@
 #include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
+#include "Menu/getLastPosition.hpp"
 #include "Menu/TextMenu/TxMenuLeaveAction.hpp"
 #include "Menu/TextMenu/ActionMenuItem.hpp"
@@ -53 +54 @@
     MenuInstance(new T(_outputter, _token)),
     outputter(_outputter),
-    deleteMenu(true)
+    deleteMenu(true),
+    lastposition(MoleCuilder::ActionQueue::getInstance().getListOfActions())
   {}
 
@@ -60 +62 @@
     MenuInstance(_MenuInstance),
     outputter(_MenuInstance->getOutputter()),
-    deleteMenu(false)
+    deleteMenu(false),
+    lastposition(MoleCuilder::ActionQueue::getInstance().getListOfActions())
   {}
 
@@ -110 +113 @@
   bool deleteMenu;
 
+  //!> internal functor to get last used position in menu of actions
+  getLastPosition lastposition;
+
   typedef std::map <char, std::string> MenuShortcutMap;
   MenuShortcutMap ShortcutMap;
@@ -148 +154 @@
         MoleCuilder::OptionTrait("leave"+token, &typeid(void), "leave menu "+token),
         token,
-        MoleCuilder::ActionQueue::getInstance().getLastPosition(token)+2); // have a separator in between
+        lastposition(token)+2); // have a separator in between
     new TxMenu::LeaveAction(NewMenu->getMenuInstance(), leaveTrait);
     NewMenu->init();