Changes in src/Actions/WorldAction/CenterOnEdgeAction.cpp [d74077:952f38]

File:

• src/Actions/WorldAction/CenterOnEdgeAction.cpp (modified) (5 diffs)

src/Actions/WorldAction/CenterOnEdgeAction.cpp

@@ -11 +11 @@
 #include "Actions/ActionRegistry.hpp"
 #include "atom.hpp"
-#include "log.hpp"
-#include "vector.hpp"
+#include "Helpers/Log.hpp"
+#include "LinearAlgebra/Vector.hpp"
 #include "World.hpp"
-#include "Matrix.hpp"
+#include "LinearAlgebra/Matrix.hpp"
 
 #include <iostream>
@@ -23 +23 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "UIElements/ValueStorage.hpp"
+#include "Actions/ValueStorage.hpp"
 #include "Helpers/Assert.hpp"
 
@@ -39 +39 @@
 };
 
-Dialog* WorldCenterOnEdgeAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* WorldCenterOnEdgeAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryEmpty(NAME, ValueStorage::getInstance().getDescription(NAME));
@@ -55 +55 @@
   ASSERT(AllAtoms.size() > 0, "For CenteronEdge atoms must be present.");
   vector<atom *>::iterator AtomRunner = AllAtoms.begin();
-  Min = (*AtomRunner)->getPosition();
-  Max = (*AtomRunner)->getPosition();
+  Min = (*AtomRunner)->x;
+  Max = (*AtomRunner)->x;
   for (; AtomRunner != AllAtoms.end(); ++AtomRunner) {
     for (int i=0;i<NDIM;i++) {
-      if ((*AtomRunner)->at(i) > Max[i])
-        Max[i] = (*AtomRunner)->at(i);
-      if ((*AtomRunner)->at(i) < Min[i])
-        Min[i] = (*AtomRunner)->at(i);
+      if ((*AtomRunner)->x[i] > Max[i])
+        Max[i] = (*AtomRunner)->x[i];
+      if ((*AtomRunner)->x[i] < Min[i])
+        Min[i] = (*AtomRunner)->x[i];
     }
   }
@@ -75 +75 @@
   // translate all atoms, such that Min is aty (0,0,0)
   for (vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner)
-    *(*AtomRunner) -= Min;
+    (*AtomRunner)->x -= Min;
 
   return Action::success;