Changes in src/Actions/CmdAction/VerboseAction.cpp [623e89:680470]

File:

• src/Actions/CmdAction/VerboseAction.cpp (modified) (3 diffs)

src/Actions/CmdAction/VerboseAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/CmdAction/VerboseAction.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "log.hpp"
 #include "verbose.hpp"
@@ -17 +20 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
+
+// memento to remember the state when undoing
+
+class CommandLineVerboseState : public ActionState {
+public:
+  CommandLineVerboseState(int _verbosity) :
+    verbosity(_verbosity)
+  {}
+  int verbosity;
+};
+
 
 const char CommandLineVerboseAction::NAME[] = "verbose";
@@ -28 +42 @@
 {}
 
+void CommandVerbose(int verbosity) {
+  ValueStorage::getInstance().setCurrentValue(CommandLineVerboseAction::NAME, verbosity);
+  ActionRegistry::getInstance().getActionByName(CommandLineVerboseAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* CommandLineVerboseAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryInt(NAME, ValueStorage::getInstance().getDescription(NAME));
+
+  return dialog;
+}
+
 Action::state_ptr CommandLineVerboseAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   int verbosity = 2;
 
-  dialog->queryInt(NAME, &verbosity, MapOfActions::getInstance().getDescription(NAME));
+  ValueStorage::getInstance().queryCurrentValue(NAME, verbosity);
 
-  if(dialog->display()) {
-    setVerbosity(verbosity);
-    DoLog(0) && (Log() << Verbose(0) << "Setting verbosity to " << verbosity << "." << endl);
-    delete dialog;
-    return Action::success;
-  } else {
-    delete dialog;
-    return Action::failure;
-  }
+  setVerbosity(verbosity);
+  DoLog(0) && (Log() << Verbose(0) << "Setting verbosity to " << verbosity << "." << endl);
+  return Action::success;
 }
 
 Action::state_ptr CommandLineVerboseAction::performUndo(Action::state_ptr _state) {
-//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
+  CommandLineVerboseState *state = assert_cast<CommandLineVerboseState*>(_state.get());
 
-  return Action::failure;
-//  string newName = state->mol->getName();
-//  state->mol->setName(state->lastName);
-//
-//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
+  int verbosity = 2;
+  ValueStorage::getInstance().queryCurrentValue(NAME, verbosity);
+
+  setVerbosity(state->verbosity);
+  return Action::state_ptr(new CommandLineVerboseState(verbosity));
 }
 
 Action::state_ptr CommandLineVerboseAction::performRedo(Action::state_ptr _state){
-  return Action::failure;
+  return performUndo(_state);
 }
 
 bool CommandLineVerboseAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool CommandLineVerboseAction::shouldUndo() {
-  return false;
+  return true;
 }