Changes in src/Actions/AtomAction/ChangeElementAction.cpp [54b953:047878]

File:

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

src/Actions/AtomAction/ChangeElementAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/AtomAction/ChangeElementAction.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "atom.hpp"
+#include "element.hpp"
 #include "log.hpp"
 #include "vector.hpp"
@@ -20 +24 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AtomChangeElementAction::NAME[] = "change-element";
@@ -31 +35 @@
 {}
 
+void AtomChangeElement(element *elemental) {
+  ValueStorage::getInstance().setCurrentValue(AtomChangeElementAction::NAME, elemental);
+  ActionRegistry::getInstance().getActionByName(AtomChangeElementAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* AtomChangeElementAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryElement(NAME, ValueStorage::getInstance().getDescription(NAME));
+
+return dialog;
+}
+
 Action::state_ptr AtomChangeElementAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   atom *first = NULL;
-  std::vector<element *> elements;
+  element *elemental = NULL;
 
-  dialog->queryAtom(NAME, &first, MapOfActions::getInstance().getDescription(NAME));
-  dialog->queryElement("element", &elements, MapOfActions::getInstance().getDescription("element"));
+  ValueStorage::getInstance().queryCurrentValue(NAME, elemental);
 
-  if(dialog->display()) {
-    delete dialog;
-    ASSERT(elements.size() == 1, "Unequal to one element specified when changing an atom's element");
-    ASSERT(first != NULL, "No valid atom specified");
-    DoLog(1) && (Log() << Verbose(1) << "Changing atom " << *first << " to element " << elements.at(0) << "." << endl);
-    if (elements.at(0) != NULL) {
-      first->type = elements.at(0);
-      return Action::success;
-    } else
-      return Action::failure;
-  } else {
-    delete dialog;
-    return Action::failure;
+  for (World::AtomSelectionIterator iter = World::getInstance().beginAtomSelection(); iter != World::getInstance().endAtomSelection(); ++iter) {
+    first = iter->second;
+    DoLog(1) && (Log() << Verbose(1) << "Changing atom " << *first << " to element " << elemental->symbol << "." << endl);
+    first->type = elemental;
   }
-
+  return Action::success;
 }