Changes in src/Actions/WorldAction/ScaleBoxAction.cpp [623e89:047878]

File:

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

src/Actions/WorldAction/ScaleBoxAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/WorldAction/ScaleBoxAction.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "atom.hpp"
 #include "log.hpp"
@@ -12 +15 @@
 #include "verbose.hpp"
 #include "World.hpp"
+#include "Box.hpp"
+#include "Matrix.hpp"
 
 #include <iostream>
@@ -20 +25 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char WorldScaleBoxAction::NAME[] = "scale-box";
@@ -31 +36 @@
 {}
 
+void WorldScaleBox(Vector &Scaler) {
+  ValueStorage::getInstance().setCurrentValue(WorldScaleBoxAction::NAME, Scaler);
+  ActionRegistry::getInstance().getActionByName(WorldScaleBoxAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* WorldScaleBoxAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryVector(NAME, false, ValueStorage::getInstance().getDescription(NAME));
+
+  return dialog;
+}
+
 Action::state_ptr WorldScaleBoxAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   Vector Scaler;
   double x[NDIM];
-  int j=0;
 
-  dialog->queryVector(NAME, &Scaler, World::getInstance().getDomain(), false, MapOfActions::getInstance().getDescription(NAME));
+  ValueStorage::getInstance().queryCurrentValue(NAME, Scaler);
 
-  if(dialog->display()) {
-    DoLog(1) && (Log() << Verbose(1) << "Scaling all atomic positions by factor." << endl);
-    for (int i=0;i<NDIM;i++)
-      x[i] = Scaler[i];
-    vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
-    for(vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
-      (*AtomRunner)->x.ScaleAll(x);
-    }
-    j = -1;
-    double * const cell_size = World::getInstance().getDomain();
-    for (int i=0;i<NDIM;i++) {
-      j += i+1;
-      cell_size[j]*=x[i];
-    }
+  DoLog(1) && (Log() << Verbose(1) << "Scaling all atomic positions by factor." << endl);
+  for (int i=0;i<NDIM;i++)
+    x[i] = Scaler[i];
+  vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
+  for(vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
+    (*AtomRunner)->x.ScaleAll(x);
+  }
 
-    delete dialog;
-    return Action::success;
-  } else {
-    delete dialog;
-    return Action::failure;
+  Matrix M = World::getInstance().getDomain().getM();
+  Matrix scale;
+
+  for (int i=0;i<NDIM;i++) {
+    scale.at(i,i) = x[i];
   }
+  M *= scale;
+  World::getInstance().setDomain(M);
+
+  return Action::success;
 }