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

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"
@@ -32 +31 @@
 #include <fstream>
 #include <string>
-#include <vector>
 
 #include "Actions/MoleculeAction/CopyAction.hpp"
@@ -42 +40 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-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());
-  }
+Action::state_ptr MoleculeCopyAction::performCall() {
+  molecule *copy = NULL;
 
-  return Action::state_ptr(new MoleculeCopyState(molecules,params));
+  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));
 }
 
@@ -62 +56 @@
   MoleculeCopyState *state = assert_cast<MoleculeCopyState*>(_state.get());
 
-  RemoveMoleculesWithAtomsByIds(state->copies);
+  state->copy->removeAtomsinMolecule();
+  World::getInstance().destroyMolecule(state->copy);
 
   return Action::state_ptr(_state);
@@ -68 +63 @@
 
 Action::state_ptr MoleculeCopyAction::performRedo(Action::state_ptr _state){
-  return performCall();
+  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));
 }