Changeset b5b01e for src/Actions/FillAction

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/FillAction

Files:

• FillRegularGridAction.cpp (modified) (4 diffs)
• FillSurfaceAction.cpp (modified) (4 diffs)

src/Actions/FillAction/FillRegularGridAction.cpp

@@ -77 +77 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr FillRegularGridAction::performCall() {
+ActionState::ptr FillRegularGridAction::performCall() {
   typedef std::vector<atom*> AtomVector;
 
@@ -190 +190 @@
 
   if (successflag)
-    return Action::state_ptr(UndoState);
+    return ActionState::ptr(UndoState);
   else
     return Action::failure;
 }
 
-Action::state_ptr FillRegularGridAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr FillRegularGridAction::performUndo(ActionState::ptr _state) {
   FillRegularGridState *state = assert_cast<FillRegularGridState*>(_state.get());
 
@@ -203 +203 @@
   SetAtomsFromAtomicInfo(state->movedatoms);
 
-  return Action::state_ptr(_state);
-}
-
-Action::state_ptr FillRegularGridAction::performRedo(Action::state_ptr _state){
+  return ActionState::ptr(_state);
+}
+
+ActionState::ptr FillRegularGridAction::performRedo(ActionState::ptr _state){
   FillRegularGridState *state = assert_cast<FillRegularGridState*>(_state.get());
 
@@ -219 +219 @@
     AddBondsFromBondInfo(state->clonedbonds);
   if (statusflag)
-    return Action::state_ptr(_state);
+    return ActionState::ptr(_state);
   else
     return Action::failure;

src/Actions/FillAction/FillSurfaceAction.cpp

@@ -67 +67 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr FillSurfaceAction::performCall() {
+ActionState::ptr FillSurfaceAction::performCall() {
   // get the filler molecule
   const std::vector< molecule *> molecules = World::getInstance().getSelectedMolecules();
@@ -169 +169 @@
 
   if (successflag)
-    return Action::state_ptr(UndoState);
+    return ActionState::ptr(UndoState);
   else
     return Action::failure;
 }
 
-Action::state_ptr FillSurfaceAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr FillSurfaceAction::performUndo(ActionState::ptr _state) {
   FillSurfaceState *state = assert_cast<FillSurfaceState*>(_state.get());
 
@@ -182 +182 @@
   SetAtomsFromAtomicInfo(state->movedatoms);
 
-  return Action::state_ptr(_state);
-}
-
-Action::state_ptr FillSurfaceAction::performRedo(Action::state_ptr _state){
+  return ActionState::ptr(_state);
+}
+
+ActionState::ptr FillSurfaceAction::performRedo(ActionState::ptr _state){
   FillSurfaceState *state = assert_cast<FillSurfaceState*>(_state.get());
 
@@ -197 +197 @@
   statusflag = statusflag && AddBondsFromBondInfo(state->clonedbonds);
   if (statusflag)
-    return Action::state_ptr(_state);
+    return ActionState::ptr(_state);
   else
     return Action::failure;