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

File:

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

src/Actions/AtomAction/AddAction.cpp

@@ -6 +6 @@
  */
 
-#include "Helpers/MemDebug.hpp"
-
 #include "Actions/AtomAction/AddAction.hpp"
-#include "CommandLineParser.hpp"
 #include "atom.hpp"
 #include "element.hpp"
 #include "log.hpp"
-#include "periodentafel.hpp"
+#include "molecule.hpp"
 #include "vector.hpp"
 #include "verbose.hpp"
@@ -38 +35 @@
 Action::state_ptr AtomAddAction::performCall() {
   Dialog *dialog = UIFactory::getInstance().makeDialog();
-  int Z = -1;
+  std::vector<element *> elements;
   Vector position;
 
-  dialog->queryInt(NAME, &Z, MapOfActions::getInstance().getDescription(NAME));
+  dialog->queryElement(NAME, &elements, MapOfActions::getInstance().getDescription(NAME));
   dialog->queryVector("position", &position, World::getInstance().getDomain(), true, MapOfActions::getInstance().getDescription("position"));
+  cout << "pre-dialog" << endl;
 
   if(dialog->display()) {
+    cout << "post-dialog" << endl;
     delete dialog;
-    atom * first = World::getInstance().createAtom();
-    first->type = World::getInstance().getPeriode()->FindElement(Z);
-    first->x = position;
-    if (first->type != NULL) {
+    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);
-      World::getInstance().destroyAtom(first);
       return Action::failure;
     }