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

File:

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

src/Actions/WorldAction/CenterInBoxAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/WorldAction/CenterInBoxAction.hpp"
+#include "Actions/ActionRegistry.hpp"
+#include "Box.hpp"
 #include "log.hpp"
 #include "molecule.hpp"
@@ -18 +22 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char WorldCenterInBoxAction::NAME[] = "center-in-box";
@@ -29 +33 @@
 {}
 
+void WorldCenterInBox(Box &_box) {
+  ValueStorage::getInstance().setCurrentValue(WorldCenterInBoxAction::NAME, _box);
+  ActionRegistry::getInstance().getActionByName(WorldCenterInBoxAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* WorldCenterInBoxAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryBox(NAME, ValueStorage::getInstance().getDescription(NAME));
+
+  return dialog;
+}
+
 Action::state_ptr WorldCenterInBoxAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
 
-  double * cell_size = World::getInstance().getDomain();
-  dialog->queryBox(NAME, &cell_size, MapOfActions::getInstance().getDescription(NAME));
+  Box& cell_size = World::getInstance().getDomain();
+  ValueStorage::getInstance().queryCurrentValue(NAME, cell_size);
+  World::getInstance().setDomain(cell_size.getM());
 
-  if(dialog->display()) {
-    // center
-    vector<molecule *> AllMolecules = World::getInstance().getAllMolecules();
-    for (vector<molecule*>::iterator MolRunner = AllMolecules.begin(); MolRunner != AllMolecules.end(); ++MolRunner) {
-      (*MolRunner)->CenterInBox();
-    }
-    delete dialog;
-    return Action::success;
-  } else {
-    delete dialog;
-    return Action::failure;
+  // center
+  vector<molecule *> AllMolecules = World::getInstance().getAllMolecules();
+  for (vector<molecule*>::iterator MolRunner = AllMolecules.begin(); MolRunner != AllMolecules.end(); ++MolRunner) {
+    (*MolRunner)->CenterInBox();
   }
+  return Action::success;
 }