Changes in src/Actions/TesselationAction/NonConvexEnvelopeAction.cpp [980dd6:047878]

File:

• src/Actions/TesselationAction/NonConvexEnvelopeAction.cpp (modified) (5 diffs)

src/Actions/TesselationAction/NonConvexEnvelopeAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/TesselationAction/NonConvexEnvelopeAction.hpp"
+#include "Actions/ActionRegistry.hpp"
+#include "boundary.hpp"
+#include "linkedcell.hpp"
+#include "log.hpp"
+#include "molecule.hpp"
+#include "verbose.hpp"
+#include "World.hpp"
 
 #include <iostream>
@@ -15 +24 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
-
-#include "atom.hpp"
-#include "boundary.hpp"
-#include "linkedcell.hpp"
-#include "log.hpp"
-#include "molecule.hpp"
-#include "verbose.hpp"
-#include "World.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 /****** TesselationNonConvexEnvelopeAction *****/
@@ -48 +49 @@
 {}
 
+void TesselationNonConvexEnvelope(double radius, std::string &filename) {
+  ValueStorage::getInstance().setCurrentValue(TesselationNonConvexEnvelopeAction::NAME, radius);
+  ValueStorage::getInstance().setCurrentValue("nonconvex-file", filename);
+  ActionRegistry::getInstance().getActionByName(TesselationNonConvexEnvelopeAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* TesselationNonConvexEnvelopeAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryDouble(NAME, MapOfActions::getInstance().getDescription(NAME));
+  dialog->queryString("nonconvex-file", MapOfActions::getInstance().getDescription("nonconvex-file"));
+
+  return dialog;
+}
+
 Action::state_ptr TesselationNonConvexEnvelopeAction::performCall() {
   string filename;
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   molecule * Boundary = NULL;
   double SphereRadius = 0;
@@ -56 +71 @@
   clock_t start,end;
 
-  dialog->queryMolecule(NAME, &Boundary, MapOfActions::getInstance().getDescription(NAME));
-  dialog->queryString("nonconvex-file", &filename, MapOfActions::getInstance().getDescription("nonconvex-file"));
-  dialog->queryDouble("sphere-radius", &SphereRadius, MapOfActions::getInstance().getDescription("sphere-radius"));
+  ValueStorage::getInstance().queryCurrentValue(NAME, SphereRadius);
+  ValueStorage::getInstance().queryCurrentValue("nonconvex-file", filename);
 
-  if(dialog->display()) {
+  for (World::MoleculeSelectionIterator iter = World::getInstance().beginMoleculeSelection(); iter != World::getInstance().endMoleculeSelection(); ++iter) {
+    Boundary = iter->second;
     class Tesselation *T = NULL;
     const LinkedCell *LCList = NULL;
@@ -74 +89 @@
     delete(LCList);
     delete(T);
-    delete dialog;
-    if (Success)
-      return Action::success;
-    else
-      return Action::failure;
   }
-  delete dialog;
-  return Action::failure;
+  if (Success)
+    return Action::success;
+  else
+    return Action::failure;
 }