Changes in src/Actions/MoleculeAction/SuspendInWaterAction.cpp [112b09:047878]

File:

• src/Actions/MoleculeAction/SuspendInWaterAction.cpp (modified) (4 diffs)

src/Actions/MoleculeAction/SuspendInWaterAction.cpp

@@ -9 +9 @@
 
 #include "Actions/MoleculeAction/SuspendInWaterAction.hpp"
+#include "Actions/ActionRegistry.hpp"
+#include "boundary.hpp"
+#include "config.hpp"
+#include "log.hpp"
+#include "verbose.hpp"
+#include "World.hpp"
 
 #include <iostream>
@@ -17 +23 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
-
-#include "atom.hpp"
-#include "boundary.hpp"
-#include "config.hpp"
-#include "log.hpp"
-#include "config.hpp"
-#include "World.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 /****** MoleculeSuspendInWaterAction *****/
@@ -49 +48 @@
 {}
 
+void MoleculeSuspendInWater(double density) {
+  ValueStorage::getInstance().setCurrentValue(MoleculeSuspendInWaterAction::NAME, density);
+  ActionRegistry::getInstance().getActionByName(MoleculeSuspendInWaterAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* MoleculeSuspendInWaterAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryDouble(NAME, ValueStorage::getInstance().getDescription(NAME));
+
+  return dialog;
+}
+
 Action::state_ptr MoleculeSuspendInWaterAction::performCall() {
   molecule *mol = NULL;
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   double density;
   double volume = 0.;
 
-  dialog->queryMolecule(NAME, &mol, MapOfActions::getInstance().getDescription(NAME));
-  dialog->queryDouble("density", &density, MapOfActions::getInstance().getDescription("density"));
+  ValueStorage::getInstance().queryCurrentValue(NAME, density);
 
-  if(dialog->display()) {
+  for (World::MoleculeSelectionIterator iter = World::getInstance().beginMoleculeSelection(); iter != World::getInstance().endMoleculeSelection(); ++iter) {
+    mol = iter->second;
     DoLog(0) && (Log() << Verbose(0) << "Evaluating necessary cell volume for a cluster suspended in water.");
     if (density < 1.0) {
@@ -64 +75 @@
     } else {
       PrepareClustersinWater(World::getInstance().getConfig(), mol, volume, density);  // if volume == 0, will calculate from ConvexEnvelope
-      delete dialog;
-      return Action::success;
     }
   }
-  delete dialog;
-  return Action::failure;
+  return Action::success;
 }