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

File:

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

src/Actions/AtomAction/ChangeElementAction.cpp

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