Changes in src/Actions/WorldAction/RemoveSphereOfAtomsAction.cpp [e2b47c:047878]

File:

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

src/Actions/WorldAction/RemoveSphereOfAtomsAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/WorldAction/RemoveSphereOfAtomsAction.hpp"
+#include "Actions/ActionRegistry.hpp"
+#include "Descriptors/AtomDescriptor.hpp"
 #include "atom.hpp"
-#include "Descriptors/AtomDescriptor.hpp"
 #include "log.hpp"
 #include "molecule.hpp"
@@ -22 +25 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char WorldRemoveSphereOfAtomsAction::NAME[] = "remove-sphere";
@@ -33 +36 @@
 {}
 
+void WorldRemoveSphereOfAtoms(double radius, Vector &point) {
+  ValueStorage::getInstance().setCurrentValue(WorldRemoveSphereOfAtomsAction::NAME, radius);
+  ValueStorage::getInstance().setCurrentValue("position", point);
+  ActionRegistry::getInstance().getActionByName(WorldRemoveSphereOfAtomsAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* WorldRemoveSphereOfAtomsAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryDouble(NAME, ValueStorage::getInstance().getDescription(NAME));
+  dialog->queryVector("position", false, ValueStorage::getInstance().getDescription("position"));
+
+  return dialog;
+}
+
 Action::state_ptr WorldRemoveSphereOfAtomsAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   double radius = 0.;
   Vector point;
 
-  dialog->queryDouble(NAME, &radius, MapOfActions::getInstance().getDescription(NAME));
-  dialog->queryVector("position", &point, World::getInstance().getDomain(), false, MapOfActions::getInstance().getDescription("position"));
+  ValueStorage::getInstance().queryCurrentValue(NAME, radius);
+  ValueStorage::getInstance().queryCurrentValue("position", point);
 
-  if(dialog->display()) {
-    delete dialog;
-    DoLog(1) && (Log() << Verbose(1) << "Removing atoms around " << point << " with radius " << radius << "." << endl);
-    vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
-    vector<molecule *> molecules = World::getInstance().getAllMolecules();
-    for (vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
-      if (point.DistanceSquared((*AtomRunner)->x) > radius*radius) { // distance to first above radius ...
-        // TODO: This is not necessary anymore when atoms are completely handled by World (create/destroy and load/save)
-        for (vector<molecule *>::iterator iter = molecules.begin();iter != molecules.end();++iter)
-          (*iter)->erase(*AtomRunner);
-        World::getInstance().destroyAtom(*AtomRunner);
-      }
+  DoLog(1) && (Log() << Verbose(1) << "Removing atoms around " << point << " with radius " << radius << "." << endl);
+  vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
+  vector<molecule *> molecules = World::getInstance().getAllMolecules();
+  for (vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
+    if (point.DistanceSquared((*AtomRunner)->x) > radius*radius) { // distance to first above radius ...
+      // TODO: This is not necessary anymore when atoms are completely handled by World (create/destroy and load/save)
+      for (vector<molecule *>::iterator iter = molecules.begin();iter != molecules.end();++iter)
+        (*iter)->erase(*AtomRunner);
+      World::getInstance().destroyAtom(*AtomRunner);
     }
-    return Action::success;
-  } else {
-    delete dialog;
-    return Action::failure;
   }
-
+  return Action::success;
 }