Changeset cee565

Timestamp:

Aug 3, 2017, 10:57:43 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued

Children:

c0baa8

Parents:

4919f0

git-author:

Frederik Heber <frederik.heber@…> (08/03/17 10:47:26)

git-committer:

Frederik Heber <frederik.heber@…> (08/03/17 10:57:43)

Message:

tempcommit: FIX: ForceAnnealingAction's Undo is again working.

File:

• src/Actions/MoleculeAction/ForceAnnealingAction.cpp (modified) (2 diffs)

src/Actions/MoleculeAction/ForceAnnealingAction.cpp

@@ -146 +146 @@
   MoleculeForceAnnealingState *state =
       assert_cast<MoleculeForceAnnealingState*>(_state.get());
+  const size_t CurrentStep = WorldTime::getInstance().getTime();
+  World::getInstance().setTime(CurrentStep-1);
+
+  // remove current step for all modified atoms
+  removeSteps(getIdsFromAtomicInfo(state->UndoInfo), CurrentStep, CurrentStep);
 
   // set stored old state
@@ -156 +161 @@
   MoleculeForceAnnealingState *state =
       assert_cast<MoleculeForceAnnealingState*>(_state.get());
+  const size_t CurrentStep = WorldTime::getInstance().getTime();
+  World::getInstance().setTime(CurrentStep+1);
 
   // set stored new state