Changes in src/Actions/MoleculeAction/CopyAction.cpp [be21fa:8ea3e7]

File:

• src/Actions/MoleculeAction/CopyAction.cpp (modified) (5 diffs)

src/Actions/MoleculeAction/CopyAction.cpp

@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include "Actions/UndoRedoHelpers.hpp"
 #include "CodePatterns/Log.hpp"
 #include "CodePatterns/Verbose.hpp"
@@ -31 +32 @@
 #include <fstream>
 #include <string>
+#include <vector>
 
 #include "Actions/MoleculeAction/CopyAction.hpp"
@@ -40 +42 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeCopyAction::performCall() {
-  molecule *copy = NULL;
+Action::state_ptr MoleculeCopyAction::performCall()
+{
+  std::vector<moleculeId_t> molecules;
+  for (World::MoleculeSelectionConstIterator iter = World::getInstance().beginMoleculeSelection();
+      iter != World::getInstance().endMoleculeSelection(); ++iter) {
+    molecule * const copy = (iter->second)->CopyMolecule();
+    Vector *Center = (iter->second)->DetermineCenterOfAll();
+    *Center *= -1.;
+    *Center += params.position.get();
+    copy->Translate(Center);
+    delete(Center);
+    molecules.push_back(copy->getId());
+  }
 
-  copy = params.mol->CopyMolecule();
-  Vector *Center = params.mol->DetermineCenterOfAll();
-  *Center *= -1.;
-  *Center += params.position;
-  copy->Translate(Center);
-  delete(Center);
-
-  return Action::state_ptr(new MoleculeCopyState(copy,params));
+  return Action::state_ptr(new MoleculeCopyState(molecules,params));
 }
 
@@ -56 +62 @@
   MoleculeCopyState *state = assert_cast<MoleculeCopyState*>(_state.get());
 
-  state->copy->removeAtomsinMolecule();
-  World::getInstance().destroyMolecule(state->copy);
+  RemoveMoleculesWithAtomsByIds(state->copies);
 
   return Action::state_ptr(_state);
@@ -63 +68 @@
 
 Action::state_ptr MoleculeCopyAction::performRedo(Action::state_ptr _state){
-  MoleculeCopyState *state = assert_cast<MoleculeCopyState*>(_state.get());
-
-  molecule *copy = state->params.mol->CopyMolecule();
-  Vector *Center = state->params.mol->DetermineCenterOfAll();
-  *Center *= -1.;
-  *Center += state->params.position;
-  copy->Translate(Center);
-  delete(Center);
-
-  return Action::state_ptr(new MoleculeCopyState(copy,state->params));
+  return performCall();
 }