Changeset d54e37

Timestamp:

Apr 23, 2021, 9:02:12 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

87c1cc

Parents:

7df863

git-author:

Frederik Heber <frederik.heber@…> (04/10/21 14:16:42)

git-committer:

Frederik Heber <frederik.heber@…> (04/23/21 21:02:12)

Message:

FIX: PopAtomAction must not store atom ptr but atom ids for undoing.

Location:

src/Actions/SelectionAction/Atoms

Files:

• PopAtomsAction.cpp (modified) (2 diffs)
• PopAtomsAction.def (modified) (1 diff)

src/Actions/SelectionAction/Atoms/PopAtomsAction.cpp

@@ -50 +50 @@
 ActionState::ptr SelectionPopAtomsAction::performCall() {
   // create undo state
-  const std::vector<const atom *> selectedAtoms =
-      const_cast<const World &>(World::getInstance()).getSelectedAtoms();
+  const std::vector<atomId_t> selectedAtomIds = World::getConstInstance().getSelectedAtomIds();
   LOG(1, "Popping atom selection.");
   World::getInstance().popAtomSelection();
-  return ActionState::ptr(new SelectionPopAtomsState(selectedAtoms, params));
+  return ActionState::ptr(new SelectionPopAtomsState(selectedAtomIds, params));
 }
 
@@ -64 +63 @@
   // and re-create present selection
   World::getInstance().clearAtomSelection();
-  BOOST_FOREACH(const atom *_atom, state->selectedAtoms)
-    World::getInstance().selectAtom(_atom);
+  BOOST_FOREACH(const atomId_t _atomid, state->selectedAtomIds)
+    World::getInstance().selectAtom(_atomid);
 
   return ActionState::ptr(_state);

src/Actions/SelectionAction/Atoms/PopAtomsAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<const atom *>)
-#define statereferences (selectedAtoms)
+#define statetypes (std::vector<atomId_t>)
+#define statereferences (selectedAtomIds)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS