Changeset f0f9a6 for src/UIElements/Menu/TextMenu

Timestamp:

Dec 4, 2010, 11:42:38 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:

e9be39

Parents:

8f3f40

git-author:

Frederik Heber <heber@…> (11/08/10 12:15:08)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:42:38)

Message:

Placed TxMenu::LeaveAction implementation and declaration into its own module.

• TxMenu now only contains forward declaration

Location:

src/UIElements/Menu/TextMenu

Files:

• TextMenu.hpp (modified) (1 diff)
• TxMenu.cpp (modified) (2 diffs)
• TxMenu.hpp (modified) (2 diffs)
• TxMenuLeaveAction.cpp (added)
• TxMenuLeaveAction.hpp (added)

src/UIElements/Menu/TextMenu/TextMenu.hpp

@@ -19 +19 @@
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/ActionTraits.hpp"
-#include "Menu/TextMenu/TxMenu.hpp"
+#include "Menu/TextMenu/TxMenuLeaveAction.hpp"
 #include "Menu/TextMenu/ActionMenuItem.hpp"
 #include "Menu/TextMenu/SeperatorItem.hpp"

src/UIElements/Menu/TextMenu/TxMenu.cpp

@@ -24 +24 @@
 #include <iostream>
 #include <cmath>
-#include "Actions/Action.hpp"
-#include "Actions/ActionTraits.hpp"
 #include "Menu/TextMenu/TxMenu.hpp"
 #include "Menu/TextMenu/MenuItem.hpp"
-#include "Helpers/Assert.hpp"
 
 
@@ -161 +158 @@
 }
 
-/****************************** Contained Actions ****************/
-
-/** Constructor for class TxMenu::LeaveAction.
- * \param _menu pointer to the containing TxMenu
- * \param &LeaveActionTrait ActionTraits for this Action
- */
-TxMenu::LeaveAction::LeaveAction(TxMenu* const _menu, const ActionTraits & LeaveActionTrait) :
-  Action(LeaveActionTrait, true),
-  menu(_menu)
-{}
-
-/** Destructor for class TxMenu::LeaveAction.
- *
- */
-TxMenu::LeaveAction::~LeaveAction(){}
-
-/** We can't undo the leave action.
- * \return false
- */
-bool TxMenu::LeaveAction::canUndo(){
-  return false;
-}
-
-/** We should never undo the leave action.
- * \return false
- */
-bool TxMenu::LeaveAction::shouldUndo(){
-  return false;
-}
-
-/** Internal function to obtain parameters from a storage.
- * We do not use this one as we don't need any parameters.
- */
-void TxMenu::LeaveAction::getParametersfromValueStorage()
-{}
-
-/** Internal function to construct the dialog.
- * We do not need this function as there is no dialog to construct.
- */
-Dialog* TxMenu::LeaveAction::fillDialog(Dialog *dialog){
-  ASSERT(dialog,"No Dialog given when filling action dialog");
-  return dialog;
-}
-
-/** Calls TxMenu::doQuit() on the stored menu reference.
- * \return ActionState pointer with success
- */
-Action::state_ptr TxMenu::LeaveAction::performCall(){
-  menu->doQuit();
-  return Action::success;
-}
-
-/** Implementation of undo function for an Action.
- * We do not use this functionality.
- * \return ActionState pointer with failure
- */
-Action::state_ptr TxMenu::LeaveAction::performUndo(Action::state_ptr){
-  ASSERT(0,"Cannot undo leaving a menu");
-  return Action::failure;
-}
-
-/** Implementation of redo function for an Action.
- * We do not use this functionality.
- * \return ActionState pointer with failure
- */
-Action::state_ptr TxMenu::LeaveAction::performRedo(Action::state_ptr){
-  ASSERT(0,"Cannot redo leaving a menu");
-  return Action::failure;
-}

src/UIElements/Menu/TextMenu/TxMenu.hpp

@@ -14 +14 @@
 
 #include "Menu/Menu.hpp"
-#include "Actions/Action.hpp"
-#include "Actions/ActionTraits.hpp"
 #include "defs.hpp"
 
@@ -38 +36 @@
 {
 public:
-  /** This specific action is used to leave a submenu and return to an upper one.
-   * It differs from other Action's (and thus cannot be put into the usual
-   * structure) that we have to store the reference to the menu it belongs to.
-   * There, we call the doQuit() member function on performCall().
-   */
-  class LeaveAction : public Action {
-  public:
-    LeaveAction(TxMenu* const, const ActionTraits &_trait);
-    virtual ~LeaveAction();
-
-    bool canUndo();
-    bool shouldUndo();
-
-  protected:
-    virtual Dialog* fillDialog(Dialog *dialog);
-  private:
-    virtual void getParametersfromValueStorage();
-    virtual Action::state_ptr performCall();
-    virtual Action::state_ptr performUndo(Action::state_ptr);
-    virtual Action::state_ptr performRedo(Action::state_ptr);
-
-    TxMenu* const menu;
-  };
+  class LeaveAction;
 
   TxMenu(std::ostream& _outputter, const std::string _title, char _spacer=STD_MENU_TITLE_SPACER,int _length=STD_MENU_LENGTH);