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

File:

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

src/Actions/WorldAction/ScaleBoxAction.cpp

@@ -11 +11 @@
 #include "Actions/ActionRegistry.hpp"
 #include "atom.hpp"
-#include "log.hpp"
-#include "vector.hpp"
-#include "verbose.hpp"
+#include "Helpers/Log.hpp"
+#include "LinearAlgebra/Vector.hpp"
+#include "Helpers/Verbose.hpp"
 #include "World.hpp"
 #include "Box.hpp"
-#include "Matrix.hpp"
+#include "LinearAlgebra/Matrix.hpp"
 
 #include <iostream>
@@ -25 +25 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "UIElements/ValueStorage.hpp"
+#include "Actions/ValueStorage.hpp"
 
 const char WorldScaleBoxAction::NAME[] = "scale-box";
@@ -41 +41 @@
 };
 
-Dialog* WorldScaleBoxAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* WorldScaleBoxAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryVector(NAME, false, ValueStorage::getInstance().getDescription(NAME));
@@ -60 +60 @@
   vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
   for(vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
-    (*AtomRunner)->ScaleAll(x);
+    (*AtomRunner)->x.ScaleAll(x);
   }