Changes in src/Actions/AtomAction/AddAction.cpp [f0a3ec:047878]

File:

• src/Actions/AtomAction/AddAction.cpp (modified) (3 diffs)

src/Actions/AtomAction/AddAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/AtomAction/AddAction.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "atom.hpp"
 #include "element.hpp"
@@ -22 +25 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AtomAddAction::NAME[] = "add-atom";
@@ -33 +36 @@
 {}
 
+void AtomAdd(element *elemental, Vector &position) {
+  ValueStorage::getInstance().setCurrentValue(AtomAddAction::NAME, elemental);
+  ValueStorage::getInstance().setCurrentValue("position", elemental);
+  ActionRegistry::getInstance().getActionByName(AtomAddAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog * AtomAddAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryElement(NAME, ValueStorage::getInstance().getDescription(NAME));
+  dialog->queryVector("position", true, ValueStorage::getInstance().getDescription("position"));
+
+  return dialog;
+}
+
 Action::state_ptr AtomAddAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
-  std::vector<element *> elements;
+  element * elemental = NULL;
   Vector position;
 
-  dialog->queryElement(NAME, &elements, MapOfActions::getInstance().getDescription(NAME));
-  dialog->queryVector("position", &position, World::getInstance().getDomain(), true, MapOfActions::getInstance().getDescription("position"));
-  cout << "pre-dialog" << endl;
+  // obtain information
+  ValueStorage::getInstance().queryCurrentValue(NAME, elemental);
+  ValueStorage::getInstance().queryCurrentValue("position", position);
 
-  if(dialog->display()) {
-    cout << "post-dialog" << endl;
-    delete dialog;
-    if (elements.size() == 1) {
-      atom * first = World::getInstance().createAtom();
-      first->type = *(elements.begin());
-      first->x = position;
-      DoLog(1) && (Log() << Verbose(1) << "Adding new atom with element " << first->type->name << " at " << (first->x) << "." << endl);
-      // TODO: remove when all of World's atoms are stored.
-      std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
-      if (!molecules.empty()) {
-        std::vector<molecule *>::iterator iter = molecules.begin();
-        (*iter)->AddAtom(first);
-      }
-      return Action::success;
-    } else {
-      DoeLog(1) && (eLog()<< Verbose(1) << "Could not find the specified element." << endl);
-      return Action::failure;
-    }
-  } else {
-    delete dialog;
-    return Action::failure;
+  // execute action
+  atom * first = World::getInstance().createAtom();
+  first->type = elemental;
+  first->x = position;
+  DoLog(1) && (Log() << Verbose(1) << "Adding new atom with element " << first->type->name << " at " << (first->x) << "." << endl);
+  // TODO: remove when all of World's atoms are stored.
+  std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
+  if (!molecules.empty()) {
+    std::vector<molecule *>::iterator iter = molecules.begin();
+    (*iter)->AddAtom(first);
   }
-
+  return Action::success;
 }