Changes in src/Actions/ParserAction/SaveXyzAction.cpp [112b09:047878]

File:

• src/Actions/ParserAction/SaveXyzAction.cpp (modified) (3 diffs)

src/Actions/ParserAction/SaveXyzAction.cpp

@@ -9 +9 @@
 
 #include "Actions/ParserAction/SaveXyzAction.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "Parser/XyzParser.hpp"
+#include "atom.hpp"
+#include "molecule.hpp"
 
 #include <iostream>
@@ -18 +21 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
-#include "atom.hpp"
-#include "molecule.hpp"
 
 /****** ParserSaveXyzAction *****/
@@ -46 +47 @@
 {}
 
+void ParserSaveXyz(std::string &filename) {
+  ValueStorage::getInstance().setCurrentValue(ParserSaveXyzAction::NAME, filename);
+  ActionRegistry::getInstance().getActionByName(ParserSaveXyzAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* ParserSaveXyzAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));
+
+  return dialog;
+}
+
 Action::state_ptr ParserSaveXyzAction::performCall() {
   string filename;
   XyzParser parser;
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
 
-  dialog->queryString("filename",&filename, "Filename of the xyz file");
+  ValueStorage::getInstance().queryCurrentValue(NAME, filename);
 
-  if(dialog->display()) {
-    // store xyz file
-    ofstream output;
-    output.open(filename.c_str());
-    if (!output.fail())
-      parser.save(&output);
-    output.close();
-  }
-  delete dialog;
+  // store xyz file
+  ofstream output;
+  output.open(filename.c_str());
+  if (!output.fail())
+    parser.save(&output);
+  output.close();
   return Action::failure;
 }