Changes in src/Actions/GraphAction/SubgraphDissectionAction.cpp [3213f2:f47e00b]

File:

• src/Actions/GraphAction/SubgraphDissectionAction.cpp (modified) (5 diffs)

src/Actions/GraphAction/SubgraphDissectionAction.cpp

@@ -42 +42 @@
 #include "Actions/GraphAction/UpdateMoleculesAction.hpp"
 #include "Actions/GraphAction/SubgraphDissectionAction.hpp"
-#include "Actions/SelectionAction/Atoms/PushAtomsAction.hpp"
-#include "Actions/SelectionAction/Atoms/PopAtomsAction.hpp"
-#include "Actions/SelectionAction/Atoms/AllAtomsAction.hpp"
 #include "Actions/ActionQueue.hpp"
 #include "Actions/ActionRegistry.hpp"
@@ -63 +60 @@
 void GraphSubgraphDissectionAction::prepare(ActionRegistry &AR)
 {
-  actions.addAction(AR.getActionByName(std::string("push-atom-selection")));
   actions.addAction(AR.getActionByName(std::string("select-all-atoms")));
   actions.addAction(AR.getActionByName(std::string("destroy-adjacency")));
   actions.addAction(AR.getActionByName(std::string("create-adjacency")));
   actions.addAction(AR.getActionByName(std::string("update-molecules")));
-  actions.addAction(AR.getActionByName(std::string("pop-atom-selection")));
   isPrepared = true;
 }
@@ -79 +74 @@
 }
 
+void reselectAtoms(const std::vector<atom *> &selected_atoms)
+{
+  World::getInstance().clearAtomSelection();
+  for (std::vector<atom *>::const_iterator iter = selected_atoms.begin();
+      iter != selected_atoms.end();
+      ++iter)
+    World::getInstance().selectAtom(*iter);
+}
+
 ActionState::ptr GraphSubgraphDissectionAction::performCall(){
+  // we need to "emulate" that all atoms have been selected without destroying
+  // current selection
+  const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
   ActionState::ptr state(MakroAction::performCall());
+  reselectAtoms(selected_atoms);
 
   return state;
@@ -86 +94 @@
 
 ActionState::ptr GraphSubgraphDissectionAction::performUndo(ActionState::ptr _state) {
+  // we need to "emulate" that all atoms have been selected without destroying
+  // current selection
+  const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
   ActionState::ptr state(MakroAction::performUndo(_state));
+  reselectAtoms(selected_atoms);
 
   return state;
@@ -92 +104 @@
 
 ActionState::ptr GraphSubgraphDissectionAction::performRedo(ActionState::ptr _state){
+  // we need to "emulate" that all atoms have been selected without destroying
+  // current selection
+  const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
   ActionState::ptr state(MakroAction::performRedo(_state));
+  reselectAtoms(selected_atoms);
 
   return state;