Changes in src/Actions/WorldAction/RemoveSphereOfAtomsAction.cpp [d74077:952f38]

File:

• src/Actions/WorldAction/RemoveSphereOfAtomsAction.cpp (modified) (5 diffs)

src/Actions/WorldAction/RemoveSphereOfAtomsAction.cpp

@@ -12 +12 @@
 #include "Descriptors/AtomDescriptor.hpp"
 #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"
 
@@ -26 +25 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "UIElements/ValueStorage.hpp"
+#include "Actions/ValueStorage.hpp"
 
 const char WorldRemoveSphereOfAtomsAction::NAME[] = "remove-sphere";
@@ -43 +42 @@
 };
 
-Dialog* WorldRemoveSphereOfAtomsAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* WorldRemoveSphereOfAtomsAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryDouble(NAME, ValueStorage::getInstance().getDescription(NAME));
@@ -63 +62 @@
   vector<molecule *> molecules = World::getInstance().getAllMolecules();
   for (vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
-    if ((*AtomRunner)->DistanceSquared(point) > radius*radius) { // distance to first above radius ...
-//      cout << "Removing " << (*AtomRunner)->getType()->symbol << (*AtomRunner)->getId() << " at " << (*AtomRunner)->getPosition() << " as distance is " << sqrt((*AtomRunner)->DistanceSquared(point)) << endl;
+    if (point.DistanceSquared((*AtomRunner)->x) > radius*radius) { // distance to first above radius ...
       // TODO: This is not necessary anymore when atoms are completely handled by World (create/destroy and load/save)
       for (vector<molecule *>::iterator iter = molecules.begin();iter != molecules.end();++iter)
@@ -70 +68 @@
       World::getInstance().destroyAtom(*AtomRunner);
     }
-//    else {
-//      cout << "Keeping" << (*AtomRunner)->getType()->symbol << (*AtomRunner)->getId() << " at " << (*AtomRunner)->getPosition() << " as distance is " << sqrt((*AtomRunner)->DistanceSquared(point)) << endl;
-//    }
   }
   return Action::success;