Changes in src/Actions/WorldAction/AddEmptyBoundaryAction.cpp [9cd6bf:ce7fdc]

File:

• src/Actions/WorldAction/AddEmptyBoundaryAction.cpp (modified) (4 diffs)

src/Actions/WorldAction/AddEmptyBoundaryAction.cpp

@@ -18 +18 @@
 #endif
 
-// include headers that implement a archive in simple text format
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#include "boost/serialization/vector.hpp"
-
 #include "CodePatterns/MemDebug.hpp"
 
 #include "atom.hpp"
-#include "Box.hpp"
 #include "CodePatterns/Log.hpp"
-#include "LinearAlgebra/MatrixContent.hpp"
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
 #include "LinearAlgebra/Vector.hpp"
@@ -53 +46 @@
   getParametersfromValueStorage();
 
-  // create undo domain
-  std::stringstream undostream;
-  boost::archive::text_oarchive oa(undostream);
-  const RealSpaceMatrix &matrix = World::getInstance().getDomain().getM();
-  oa << matrix;
-
   // get maximum and minimum
-  std::vector<atom *> AllAtoms = World::getInstance().getAllAtoms();
+  vector<atom *> AllAtoms = World::getInstance().getAllAtoms();
   ASSERT(AllAtoms.size() > 0, "There must be atoms present for AddingEmptyBoundary.");
-  std::vector<atom *>::iterator AtomRunner = AllAtoms.begin();
+  vector<atom *>::iterator AtomRunner = AllAtoms.begin();
   Min = (*AtomRunner)->getPosition();
   Max = (*AtomRunner)->getPosition();
@@ -86 +73 @@
   // translate all atoms, such that Min is aty (0,0,0)
   AtomRunner = AllAtoms.begin();
-  for (std::vector<atom *>::iterator AtomRunner = AllAtoms.begin();
-      AtomRunner != AllAtoms.end();
-      ++AtomRunner)
+  for (; AtomRunner != AllAtoms.end(); ++AtomRunner)
     *(*AtomRunner) -= Min - params.boundary;
 
@@ -94 +79 @@
   LOG(0, "Box domain is now " << World::getInstance().getDomain().getM());
 
-  // create undo state
-  WorldAddEmptyBoundaryState *UndoState =
-      new WorldAddEmptyBoundaryState(
-          undostream.str(),
-          World::getInstance().getDomain().getM(),
-          Min,
-          params
-          );
-
-  return Action::state_ptr(UndoState);
+  return Action::success;
 }
 
 Action::state_ptr WorldAddEmptyBoundaryAction::performUndo(Action::state_ptr _state) {
-  WorldAddEmptyBoundaryState *state = assert_cast<WorldAddEmptyBoundaryState*>(_state.get());
+//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
 
-  // restore domain
-  RealSpaceMatrix matrix;
-  std::stringstream undostream(state->undostring);
-  boost::archive::text_iarchive ia(undostream);
-  ia >> matrix;
-  World::getInstance().setDomain(matrix);
-
-  // give final box size
-  LOG(0, "Box domain restored to " << World::getInstance().getDomain().getM());
-
-  // restore atoms
-  std::vector<atom *> AllAtoms = World::getInstance().getAllAtoms();
-  for (std::vector<atom *>::iterator AtomRunner = AllAtoms.begin();
-      AtomRunner != AllAtoms.end();
-      ++AtomRunner)
-    *(*AtomRunner) += state->Min - state->params.boundary;
-
-  return Action::state_ptr(_state);
+  return Action::failure;
+//  string newName = state->mol->getName();
+//  state->mol->setName(state->lastName);
+//
+//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
 }
 
 Action::state_ptr WorldAddEmptyBoundaryAction::performRedo(Action::state_ptr _state){
-  WorldAddEmptyBoundaryState *state = assert_cast<WorldAddEmptyBoundaryState*>(_state.get());
-
-  World::getInstance().setDomain(state->newdomain);
-
-  // give final box size
-  LOG(0, "Box domain is again " << World::getInstance().getDomain().getM());
-
-  // shift atoms
-  std::vector<atom *> AllAtoms = World::getInstance().getAllAtoms();
-  for (std::vector<atom *>::iterator AtomRunner = AllAtoms.begin();
-      AtomRunner != AllAtoms.end();
-      ++AtomRunner)
-    *(*AtomRunner) -= state->Min - state->params.boundary;
-
-  return Action::state_ptr(_state);
+  return Action::failure;
 }
 
 bool WorldAddEmptyBoundaryAction::canUndo() {
-  return true;
+  return false;
 }
 
 bool WorldAddEmptyBoundaryAction::shouldUndo() {
-  return true;
+  return false;
 }
 /** =========== end of function ====================== */