Changeset b5b01e for src/Actions/ShapeAction

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:

6367dd

Parents:

f92ef3

git-author:

Frederik Heber <heber@…> (08/19/13 19:04:10)

git-committer:

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

Message:

ActionState extracted into own header file, rename Action::state_ptr -> ActionState::ptr.

Location:

src/Actions/ShapeAction

Files:

• CombineShapesAction.cpp (modified) (4 diffs)
• CreateShapeAction.cpp (modified) (4 diffs)
• RemoveShapeAction.cpp (modified) (4 diffs)
• RotateShapeAction.cpp (modified) (4 diffs)
• StretchShapeAction.cpp (modified) (4 diffs)
• TranslateShapeAction.cpp (modified) (4 diffs)

src/Actions/ShapeAction/CombineShapesAction.cpp

@@ -51 +51 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ShapeCombineShapesAction::performCall() {
+ActionState::ptr ShapeCombineShapesAction::performCall() {
   LOG(1, "Combining shapes in ShapeRegistry.");
 
@@ -88 +88 @@
   ShapeRegistry::getInstance().addShape(s);
 
-  return Action::state_ptr(new ShapeCombineShapesState(old_name, params));
+  return ActionState::ptr(new ShapeCombineShapesState(old_name, params));
 }
 
-Action::state_ptr ShapeCombineShapesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ShapeCombineShapesAction::performUndo(ActionState::ptr _state) {
   ShapeCombineShapesState *state = assert_cast<ShapeCombineShapesState*>(_state.get());
 
@@ -99 +99 @@
   ShapeRegistry::getInstance().removeShape(state->old_name);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr ShapeCombineShapesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ShapeCombineShapesAction::performRedo(ActionState::ptr _state){
   ShapeCombineShapesState *state = assert_cast<ShapeCombineShapesState*>(_state.get());
 
@@ -134 +134 @@
   ShapeRegistry::getInstance().addShape(s);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/ShapeAction/CreateShapeAction.cpp

@@ -51 +51 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ShapeCreateShapeAction::performCall() {
+ActionState::ptr ShapeCreateShapeAction::performCall() {
   LOG(1, "Adding shape into ShapeRegistry.");
 
@@ -65 +65 @@
   ShapeRegistry::getInstance().addShape(s);
 
-  return Action::state_ptr(new ShapeCreateShapeState(old_name, params));
+  return ActionState::ptr(new ShapeCreateShapeState(old_name, params));
 }
 
-Action::state_ptr ShapeCreateShapeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ShapeCreateShapeAction::performUndo(ActionState::ptr _state) {
   ShapeCreateShapeState *state = assert_cast<ShapeCreateShapeState*>(_state.get());
 
@@ -76 +76 @@
   ShapeRegistry::getInstance().removeShape(state->old_name);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr ShapeCreateShapeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ShapeCreateShapeAction::performRedo(ActionState::ptr _state){
   ShapeCreateShapeState *state = assert_cast<ShapeCreateShapeState*>(_state.get());
 
@@ -93 +93 @@
   ShapeRegistry::getInstance().addShape(s);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/ShapeAction/RemoveShapeAction.cpp

@@ -51 +51 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ShapeRemoveShapeAction::performCall() {
+ActionState::ptr ShapeRemoveShapeAction::performCall() {
   LOG(1, "Removing shapes from ShapeRegistry.");
 
@@ -62 +62 @@
   }
 
-  return Action::state_ptr(new ShapeRemoveShapeState(old_shapes, params));
+  return ActionState::ptr(new ShapeRemoveShapeState(old_shapes, params));
 }
 
-Action::state_ptr ShapeRemoveShapeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ShapeRemoveShapeAction::performUndo(ActionState::ptr _state) {
   ShapeRemoveShapeState *state = assert_cast<ShapeRemoveShapeState*>(_state.get());
 
@@ -75 +75 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr ShapeRemoveShapeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ShapeRemoveShapeAction::performRedo(ActionState::ptr _state){
   ShapeRemoveShapeState *state = assert_cast<ShapeRemoveShapeState*>(_state.get());
 
@@ -85 +85 @@
     ShapeRegistry::getInstance().removeShape(selectedShapes[i]->getName());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/ShapeAction/RotateShapeAction.cpp

@@ -51 +51 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ShapeRotateShapeAction::performCall() {
+ActionState::ptr ShapeRotateShapeAction::performCall() {
   LOG(1, "Translating shapes in ShapeRegistry.");
 
@@ -72 +72 @@
   }
 
-  return Action::state_ptr(new ShapeRotateShapeState(old_shapes, params));
+  return ActionState::ptr(new ShapeRotateShapeState(old_shapes, params));
 }
 
-Action::state_ptr ShapeRotateShapeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ShapeRotateShapeAction::performUndo(ActionState::ptr _state) {
   ShapeRotateShapeState *state = assert_cast<ShapeRotateShapeState*>(_state.get());
 
@@ -85 +85 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr ShapeRotateShapeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ShapeRotateShapeAction::performRedo(ActionState::ptr _state){
   ShapeRotateShapeState *state = assert_cast<ShapeRotateShapeState*>(_state.get());
 
@@ -106 +106 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/ShapeAction/StretchShapeAction.cpp

@@ -51 +51 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ShapeStretchShapeAction::performCall() {
+ActionState::ptr ShapeStretchShapeAction::performCall() {
   LOG(1, "Translating shapes in ShapeRegistry.");
 
@@ -72 +72 @@
   }
 
-  return Action::state_ptr(new ShapeStretchShapeState(old_shapes, params));
+  return ActionState::ptr(new ShapeStretchShapeState(old_shapes, params));
 }
 
-Action::state_ptr ShapeStretchShapeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ShapeStretchShapeAction::performUndo(ActionState::ptr _state) {
   ShapeStretchShapeState *state = assert_cast<ShapeStretchShapeState*>(_state.get());
 
@@ -85 +85 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr ShapeStretchShapeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ShapeStretchShapeAction::performRedo(ActionState::ptr _state){
   ShapeStretchShapeState *state = assert_cast<ShapeStretchShapeState*>(_state.get());
 
@@ -106 +106 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/ShapeAction/TranslateShapeAction.cpp

@@ -51 +51 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ShapeTranslateShapeAction::performCall() {
+ActionState::ptr ShapeTranslateShapeAction::performCall() {
   LOG(1, "Translating shapes in ShapeRegistry.");
 
@@ -68 +68 @@
   }
 
-  return Action::state_ptr(new ShapeTranslateShapeState(old_shapes, params));
+  return ActionState::ptr(new ShapeTranslateShapeState(old_shapes, params));
 }
 
-Action::state_ptr ShapeTranslateShapeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ShapeTranslateShapeAction::performUndo(ActionState::ptr _state) {
   ShapeTranslateShapeState *state = assert_cast<ShapeTranslateShapeState*>(_state.get());
 
@@ -81 +81 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr ShapeTranslateShapeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ShapeTranslateShapeAction::performRedo(ActionState::ptr _state){
   ShapeTranslateShapeState *state = assert_cast<ShapeTranslateShapeState*>(_state.get());
 
@@ -98 +98 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }