Changes in src/Actions/WorldAction/BoundInBoxAction.cpp [ce7fdc:e670e4]

File:

• src/Actions/WorldAction/BoundInBoxAction.cpp (modified) (2 diffs)

src/Actions/WorldAction/BoundInBoxAction.cpp

@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include <boost/shared_ptr.hpp>
+
 #include "CodePatterns/Log.hpp"
 #include "molecule.hpp"
@@ -40 +42 @@
   getParametersfromValueStorage();
 
+  // create undo state
+  std::vector< boost::shared_ptr<Vector> > OldPositions;
+  std::vector<molecule*> AllMolecules = World::getInstance().getAllMolecules();
+  for (vector<molecule*>::iterator MolRunner = AllMolecules.begin();
+      MolRunner != AllMolecules.end();
+      ++MolRunner) {
+    for(molecule::const_iterator AtomRunner = (*MolRunner)->begin();
+        AtomRunner != (*MolRunner)->end();
+        ++AtomRunner) {
+      OldPositions.push_back(
+          boost::shared_ptr<Vector>(new Vector(
+              (*AtomRunner)->getPosition()
+              ))
+          );
+    }
+  }
+  WorldBoundInBoxState *undoState = new WorldBoundInBoxState(OldPositions, params);
+
   // center
-  vector<molecule*> AllMolecules = World::getInstance().getAllMolecules();
-  for (vector<molecule*>::iterator MolRunner = AllMolecules.begin(); MolRunner != AllMolecules.end(); ++MolRunner) {
+  for (std::vector<molecule*>::iterator MolRunner = AllMolecules.begin(); MolRunner != AllMolecules.end(); ++MolRunner) {
     (*MolRunner)->BoundInBox();
   }
-  return Action::success;
+  return Action::state_ptr(undoState);
 }
 
 Action::state_ptr WorldBoundInBoxAction::performUndo(Action::state_ptr _state) {
-//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
+  WorldBoundInBoxState *state = assert_cast<WorldBoundInBoxState*>(_state.get());
 
-  return Action::failure;
-//  string newName = state->mol->getName();
-//  state->mol->setName(state->lastName);
-//
-//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
+  // place atoms on old positions
+  std::vector< boost::shared_ptr<Vector> >::const_iterator OldPositionsIter = state->OldPositions.begin();
+  std::vector<molecule*> AllMolecules = World::getInstance().getAllMolecules();
+  for (std::vector<molecule*>::iterator MolRunner = AllMolecules.begin();
+      MolRunner != AllMolecules.end();
+      ++MolRunner) {
+    for(molecule::const_iterator AtomRunner = (*MolRunner)->begin();
+        AtomRunner != (*MolRunner)->end();
+        ++AtomRunner) {
+      ASSERT(OldPositionsIter != state->OldPositions.end(),
+          "WorldBoundInBoxAction::performUndo() - too few positions stored in UndoState.");
+      (*AtomRunner)->setPosition(**(OldPositionsIter++));
+    }
+  }
+
+  return Action::state_ptr(_state);
 }
 
 Action::state_ptr WorldBoundInBoxAction::performRedo(Action::state_ptr _state){
-  return Action::failure;
+//  WorldBoundInBoxState *state = assert_cast<WorldBoundInBoxState*>(_state.get());
+
+  // center
+  std::vector<molecule*> AllMolecules = World::getInstance().getAllMolecules();
+  for (std::vector<molecule*>::iterator MolRunner = AllMolecules.begin();
+      MolRunner != AllMolecules.end();
+      ++MolRunner) {
+    (*MolRunner)->BoundInBox();
+  }
+
+  return Action::state_ptr(_state);
 }
 
 bool WorldBoundInBoxAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool WorldBoundInBoxAction::shouldUndo() {
-  return false;
+  return true;
 }
 /** =========== end of function ====================== */