Changes in src/Actions/WorldAction/ScaleBoxAction.cpp [ce7fdc:cbfb9a]

File:

• src/Actions/WorldAction/ScaleBoxAction.cpp (modified) (3 diffs)

src/Actions/WorldAction/ScaleBoxAction.cpp

@@ -22 +22 @@
 #include "atom.hpp"
 #include "CodePatterns/Log.hpp"
+#include "LinearAlgebra/RealSpaceMatrix.hpp"
 #include "LinearAlgebra/Vector.hpp"
-#include "CodePatterns/Verbose.hpp"
 #include "World.hpp"
 #include "Box.hpp"
-#include "LinearAlgebra/RealSpaceMatrix.hpp"
 
 #include <iostream>
 #include <string>
+#include <vector>
 
 #include "Actions/WorldAction/ScaleBoxAction.hpp"
@@ -45 +45 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Scaling all atomic positions by factor." << endl);
+  // scale atoms
   for (int i=0;i<NDIM;i++)
     x[i] = params.Scaler[i];
-  vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
-  for(vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
+  std::vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
+  for(std::vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
     (*AtomRunner)->ScaleAll(x);
   }
 
+  // scale box
   RealSpaceMatrix M = World::getInstance().getDomain().getM();
   RealSpaceMatrix scale;
-
   for (int i=0;i<NDIM;i++) {
-    scale.at(i,i) = x[i];
+    scale.at(i,i) = params.Scaler[i];
   }
   M *= scale;
@@ -65 +65 @@
   LOG(0, "Box domain is now " << World::getInstance().getDomain().getM());
 
-  return Action::success;
+  // create undo state
+  WorldScaleBoxState *UndoState = new WorldScaleBoxState(params);
+
+  return Action::state_ptr(UndoState);
 }
 
 Action::state_ptr WorldScaleBoxAction::performUndo(Action::state_ptr _state) {
-//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
+  WorldScaleBoxState *state = assert_cast<WorldScaleBoxState*>(_state.get());
 
-  return Action::failure;
-//  string newName = state->mol->getName();
-//  state->mol->setName(state->lastName);
-//
-//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
+  // scale back atoms
+  double x[NDIM];
+  for (int i=0;i<NDIM;i++)
+    x[i] = 1./state->params.Scaler[i];
+  vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
+  for(vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
+    (*AtomRunner)->ScaleAll(x);
+  }
+
+  // scale back box
+  RealSpaceMatrix M = World::getInstance().getDomain().getM();
+  RealSpaceMatrix scale;
+  for (int i=0;i<NDIM;i++) {
+    scale.at(i,i) = 1./state->params.Scaler[i];
+  }
+  M *= scale;
+  World::getInstance().setDomain(M);
+
+  // give final box size
+  LOG(0, "Box domain restored to " << World::getInstance().getDomain().getM());
+
+  return Action::state_ptr(_state);
 }
 
 Action::state_ptr WorldScaleBoxAction::performRedo(Action::state_ptr _state){
-  return Action::failure;
+  WorldScaleBoxState *state = assert_cast<WorldScaleBoxState*>(_state.get());
+
+  // scale atoms
+  double x[NDIM];
+  for (int i=0;i<NDIM;i++)
+    x[i] = state->params.Scaler[i];
+  vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
+  for(vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
+    (*AtomRunner)->ScaleAll(x);
+  }
+
+  // scale box
+  RealSpaceMatrix M = World::getInstance().getDomain().getM();
+  RealSpaceMatrix scale;
+  for (int i=0;i<NDIM;i++) {
+    scale.at(i,i) = state->params.Scaler[i];
+  }
+  M *= scale;
+  World::getInstance().setDomain(M);
+
+  // give final box size
+  LOG(0, "Box domain is again " << World::getInstance().getDomain().getM());
+
+  return Action::state_ptr(_state);
 }
 
 bool WorldScaleBoxAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool WorldScaleBoxAction::shouldUndo() {
-  return false;
+  return true;
 }
 /** =========== end of function ====================== */