Changes in src/Actions/AtomAction/ChangeElementAction.cpp [dddbfe:d74077]

File:

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

src/Actions/AtomAction/ChangeElementAction.cpp

@@ -12 +12 @@
 #include "atom.hpp"
 #include "element.hpp"
-#include "Helpers/Log.hpp"
-#include "LinearAlgebra/Vector.hpp"
-#include "Helpers/Verbose.hpp"
-#include "molecule.hpp"
+#include "log.hpp"
+#include "vector.hpp"
+#include "verbose.hpp"
 #include "World.hpp"
 
@@ -25 +24 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/ValueStorage.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AtomChangeElementAction::NAME[] = "change-element";
@@ -41 +40 @@
 };
 
-Dialog* AtomChangeElementAction::fillDialog(Dialog *dialog) {
-  ASSERT(dialog,"No Dialog given when filling action dialog");
+Dialog* AtomChangeElementAction::createDialog() {
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
 
   dialog->queryElement(NAME, ValueStorage::getInstance().getDescription(NAME));
@@ -52 +51 @@
   atom *first = NULL;
   element *elemental = NULL;
-  molecule *mol = NULL;
 
   ValueStorage::getInstance().queryCurrentValue(NAME, elemental);
@@ -59 +57 @@
     first = iter->second;
     DoLog(1) && (Log() << Verbose(1) << "Changing atom " << *first << " to element " << elemental->symbol << "." << endl);
-    mol = first->getMolecule();
-    first->removeFromMolecule(); // remove atom
-    first->type = elemental;
-    mol->AddAtom(first);  // add atom to ensure correctness of formula
+    first->setType(elemental);
   }
   return Action::success;