Changeset 22b786 for src/Actions/MakroAction.cpp

Timestamp:

Apr 8, 2013, 11:56:08 AM (13 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, Candidate_v1.7.0, Candidate_v1.7.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:

8652a30

Parents:

560cbf

git-author:

Frederik Heber <heber@…> (03/01/13 21:15:10)

git-committer:

Frederik Heber <heber@…> (04/08/13 11:56:08)

Message:

Made SubgraphDissection a MakroAction and added UpdateMoleculesAction.

• MakroAction does not delete the ActionSequence eventually and it now obtains just a ref, not pointer.
• TESTFIX: Changed ActionSequenceUnitTest::doesUndoTest() accordingly.
• SubgraphDissection is right now still very ugly with lots of copy&paste from the preprocessor header files to get every function in place.
• it could be made into a MakroAction because all three internal Actions do not require any options. How to achieve this with options is unsolved.

File:

• src/Actions/MakroAction.cpp (modified) (4 diffs)

src/Actions/MakroAction.cpp

@@ -56 +56 @@
 };
 
-MakroAction::MakroAction(const ActionTrait &_trait,ActionSequence* _actions,bool _doRegister) :
+MakroAction::MakroAction(const ActionTrait &_trait,ActionSequence& _actions,bool _doRegister) :
 Action(_trait,_doRegister),
 actions(_actions)
@@ -64 +64 @@
 MakroAction::~MakroAction()
 {
-  Action* action;
-  while((action=actions->removeLastAction())){
-    delete action;
-  }
-  delete actions;
+  // emptying the sequence is someone else responsibility
+//  Action* action;
+//  while((action=actions.removeLastAction())){
+//    delete action;
+//  }
 }
 
+void MakroAction::prepare(ActionRegistry &AR)
+{}
+
+void MakroAction::unprepare(ActionRegistry &AR)
+{}
+
 Dialog* MakroAction::fillDialog(Dialog *dialog) {
-  return actions->fillAllDialogs(dialog);
+  return actions.fillAllDialogs(dialog);
 }
 
 Action::state_ptr MakroAction::performCall(){
-  ActionSequence::stateSet states = actions->callAll(true);
+  ActionSequence::stateSet states = actions.callAll(true);
   return Action::state_ptr(new MakroActionState(states));
 }
@@ -83 +89 @@
   MakroActionState *state = dynamic_cast<MakroActionState*>(_state.get());
   ASSERT(state,"Type mismatch for the state of the MakroAction");
-  ActionSequence::stateSet states = actions->undoAll(state->states);
+  ActionSequence::stateSet states = actions.undoAll(state->states);
   return Action::state_ptr(new MakroActionState(states));
 }
@@ -90 +96 @@
   MakroActionState *state = dynamic_cast<MakroActionState*>(_state.get());
   ASSERT(state,"Type mismatch for the state of the MakroAction");
-  ActionSequence::stateSet states = actions->redoAll(state->states);
+  ActionSequence::stateSet states = actions.redoAll(state->states);
   return Action::state_ptr(new MakroActionState(states));
 }
 
 bool MakroAction::canUndo() {
-  return actions->canUndo();
+  return actions.canUndo();
 }
 
 bool MakroAction::shouldUndo() {
-  return actions->shouldUndo();
+  return actions.shouldUndo();
 }