Changeset 87c1cc

Timestamp:

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

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

2390e6

Parents:

d54e37

git-author:

Frederik Heber <frederik.heber@…> (04/10/21 19:57:13)

git-committer:

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

Message:

FIX: NotAtomByElementAction used atom ptr instead of ids for undo state.

Location:

src/Actions/SelectionAction/Atoms

Files:

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

src/Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp

@@ -57 +57 @@
 ActionState::ptr SelectionNotAtomByElementAction::performCall() {
   LOG(1, "Unselecting atoms of type " << *params.elemental.get());
-  std::vector<const atom *> unselectedAtoms = const_cast<const World &>(World::getInstance()).
-      getAllAtoms(!AtomsBySelection());
+  // build undo state: get all previously unselected atoms of the given type
+  const World &world = World::getConstInstance();
+  const std::vector<const atom *> atoms_of_element = world.
+      getAllAtoms(AtomByType(params.elemental.get()));
+  std::vector<atomId_t> unselectedAtomIds;
+  unselectedAtomIds.reserve(atoms_of_element.size());
+  BOOST_FOREACH(const atom * _atom, atoms_of_element) {
+    if (!world.isSelected(_atom))
+      unselectedAtomIds.push_back(_atom->getId());
+  }
   World::getInstance().unselectAllAtoms(AtomByType(params.elemental.get()));
-  LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
-  return ActionState::ptr(new SelectionNotAtomByElementState(unselectedAtoms,params));
+  LOG(0, world.countSelectedAtoms() << " atoms remain selected.");
+  return ActionState::ptr(new SelectionNotAtomByElementState(unselectedAtomIds,params));
 }
 
@@ -68 +76 @@
 
   World::getInstance().selectAllAtoms(AtomByType(state->params.elemental.get()));
-  BOOST_FOREACH(const atom *_atom, state->unselectedAtoms)
-    World::getInstance().unselectAtom(_atom);
+  BOOST_FOREACH(const atomId_t _atomid, state->unselectedAtomIds)
+    World::getInstance().unselectAtom(_atomid);
 
   return ActionState::ptr(_state);

src/Actions/SelectionAction/Atoms/NotAtomByElementAction.def

@@ -22 +22 @@
 (ElementValidator())
 
-#define statetypes (std::vector<const atom*>)
-#define statereferences (unselectedAtoms)
+#define statetypes (std::vector<atomId_t>)
+#define statereferences (unselectedAtomIds)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS