Changes in src/Actions/AtomAction/AddAction.cpp [d74077:952f38]

File:

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

src/Actions/AtomAction/AddAction.cpp

@@ -12 +12 @@
 #include "atom.hpp"
 #include "element.hpp"
-#include "log.hpp"
+#include "Helpers/Log.hpp"
 #include "molecule.hpp"
-#include "vector.hpp"
-#include "verbose.hpp"
+#include "LinearAlgebra/Vector.hpp"
+#include "Helpers/Verbose.hpp"
 #include "World.hpp"
 
@@ -25 +25 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "UIElements/ValueStorage.hpp"
+#include "Actions/ValueStorage.hpp"
 
 const char AtomAddAction::NAME[] = "add-atom";
@@ -42 +42 @@
 };
 
-Dialog * AtomAddAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog * AtomAddAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryElement(NAME, ValueStorage::getInstance().getDescription(NAME));
@@ -61 +61 @@
   // execute action
   atom * first = World::getInstance().createAtom();
-  first->setType(elemental);
-  first->setPosition(position);
-  DoLog(1) && (Log() << Verbose(1) << "Adding new atom with element " << first->getType()->name << " at " << (first->getPosition()) << "." << endl);
+  first->type = elemental;
+  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();