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

File:

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

src/Actions/AtomAction/ChangeElementAction.cpp

@@ -6 +6 @@
  */
 
-#include "Helpers/MemDebug.hpp"
-
 #include "Actions/AtomAction/ChangeElementAction.hpp"
-#include "CommandLineParser.hpp"
 #include "atom.hpp"
 #include "log.hpp"
@@ -36 +33 @@
 Action::state_ptr AtomChangeElementAction::performCall() {
   Dialog *dialog = UIFactory::getInstance().makeDialog();
-  int Z = -1;
   atom *first = NULL;
-  element *elemental = NULL;
+  std::vector<element *> elements;
 
-  dialog->queryElement(NAME, (const element **) &elemental, MapOfActions::getInstance().getDescription(NAME));
-  dialog->queryAtom("atom-by-id", &first, MapOfActions::getInstance().getDescription("atom-by-id"));
+  dialog->queryAtom(NAME, &first, MapOfActions::getInstance().getDescription(NAME));
+  dialog->queryElement("element", &elements, MapOfActions::getInstance().getDescription("element"));
 
   if(dialog->display()) {
     delete dialog;
-    DoLog(1) && (Log() << Verbose(1) << "Changing atom " << *first << " to element " << elemental << "." << endl);
-    if (elemental != NULL) {
-      first->type = elemental;
+    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