Changeset bcc29ca for src/Actions/CommandAction

Timestamp:

Aug 13, 2025, 8:24:42 AM (2 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

780bfa

Parents:

1c355bf

git-author:

Frederik Heber <frederik.heber@…> (08/13/25 08:17:04)

git-committer:

Frederik Heber <frederik.heber@…> (08/13/25 08:24:42)

Message:

Splits off Undo mark actions.

• Undo action has again no parameters (which is preferable to use in the GUI).
• undo-mark is now alled set-undo-mark (with parameter telling whether to set or unset the mark).
• undo-till-mark is now a separate action.
• adapted userguide accordingly.
• TESTS: adapted regression tests.

Location:

src/Actions/CommandAction

Files:

• RedoAction.cpp (moved) (moved from src/Actions/RedoAction.cpp ) (1 diff)
• RedoAction.def (moved) (moved from src/Actions/RedoAction.def )
• RedoAction.hpp (moved) (moved from src/Actions/RedoAction.hpp )
• SetUndoMarkAction.cpp (moved) (moved from src/Actions/CommandAction/UndoMarkAction.cpp ) (5 diffs)
• SetUndoMarkAction.def (moved) (moved from src/Actions/CommandAction/UndoMarkAction.def ) (3 diffs)
• SetUndoMarkAction.hpp (moved) (moved from src/Actions/CommandAction/UndoMarkAction.hpp ) (3 diffs)
• UndoAction.cpp (moved) (moved from src/Actions/UndoAction.cpp ) (2 diffs)
• UndoAction.def (moved) (moved from src/Actions/UndoAction.def ) (2 diffs)
• UndoAction.hpp (moved) (moved from src/Actions/UndoAction.hpp )
• UndoTillMarkAction.cpp (added)
• UndoTillMarkAction.def (added)
• UndoTillMarkAction.hpp (added)

src/Actions/CommandAction/RedoAction.cpp

@@ -44 +44 @@
 using namespace MoleCuilder;
 
-#include "Actions/RedoAction.hpp"
+#include "Actions/CommandAction/RedoAction.hpp"
 
 // and construct the stuff

src/Actions/CommandAction/SetUndoMarkAction.cpp

@@ -2 +2 @@
  * Project: MoleCuilder
  * Description: creates and alters molecular systems
- * Copyright (C)  2021 Frederik Heber. All rights reserved.
+ * Copyright (C)  2025 Frederik Heber. All rights reserved.
  * 
  *
@@ -22 +22 @@
 
 /*
- * UndoMarkAction.cpp
+ * SetUndoMarkAction.cpp
  *
  *  Created on: Apr 06, 2021
@@ -35 +35 @@
 //#include "CodePatterns/MemDebug.hpp"
 
-#include "Actions/CommandAction/UndoMarkAction.hpp"
+#include "Actions/CommandAction/SetUndoMarkAction.hpp"
 
 #include "Actions/ActionQueue.hpp"
@@ -42 +42 @@
 
 // and construct the stuff
-#include "UndoMarkAction.def"
+#include "SetUndoMarkAction.def"
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-ActionState::ptr CommandUndoMarkAction::performCall() {
+ActionState::ptr CommandSetUndoMarkAction::performCall() {
   // set ActionQueue on to last element (hence skipping all in between)
 
@@ -59 +59 @@
 }
 
-ActionState::ptr CommandUndoMarkAction::performUndo(ActionState::ptr _state) {
+ActionState::ptr CommandSetUndoMarkAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-ActionState::ptr CommandUndoMarkAction::performRedo(ActionState::ptr _state){
+ActionState::ptr CommandSetUndoMarkAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }
 
-bool CommandUndoMarkAction::canUndo() {
+bool CommandSetUndoMarkAction::canUndo() {
   return false;
 }
 
-bool CommandUndoMarkAction::shouldUndo() {
+bool CommandSetUndoMarkAction::shouldUndo() {
   return false;
 }

src/Actions/CommandAction/SetUndoMarkAction.def

@@ -1 +1 @@
 /*
- * UndoMarkAction.def
+ * SetUndoMarkAction.def
  *
  *  Created on: Apr 06, 2021
@@ -14 +14 @@
 // "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (bool)
-#define paramtokens ("undo-mark")
+#define paramtokens ("set-undo-mark")
 #define paramdescriptions ("whether to set (true) the undo mark or reset (false)")
 #undef paramdefaults
@@ -27 +27 @@
 #define MENUNAME "command"
 #define MENUPOSITION 8
-#define ACTIONNAME UndoMark
-#define TOKEN "undo-mark"
+#define ACTIONNAME SetUndoMark
+#define TOKEN "set-undo-mark"
 
 

src/Actions/CommandAction/SetUndoMarkAction.hpp

@@ -1 +1 @@
 /*
- * UndoMarkAction.hpp
+ * SetUndoMarkAction.hpp
  *
  *  Created on: Apr 06, 2021
@@ -6 +6 @@
  */
 
-#ifndef UNDOMARKACTION_HPP_
-#define UNDOMARKACTION_HPP_
+#ifndef SETUNDOMARKACTION_HPP_
+#define SETUNDOMARKACTION_HPP_
 
 // include config.h
@@ -17 +17 @@
 #include "Actions/Action.hpp"
 
-#include "UndoMarkAction.def"
+#include "SetUndoMarkAction.def"
 #include "Action_impl_header.hpp"
 
-#endif /* UNDOMARKACTION_HPP_ */
+#endif /* SETUNDOMARKACTION_HPP_ */

src/Actions/CommandAction/UndoAction.cpp

@@ -43 +43 @@
 using namespace MoleCuilder;
 
-#include "Actions/UndoAction.hpp"
+#include "Actions/CommandAction/UndoAction.hpp"
 
 // and construct the stuff
@@ -52 +52 @@
 ActionState::ptr UndoAction::performCall(){
   // std::cout << "Undo" << std::endl;
-  if (params.undoTillMark.get())
-    ActionQueue::getInstance().undoTillMark();
-  else
-    ActionQueue::getInstance().undoLast();
+  ActionQueue::getInstance().undoLast();
   return Action::success;
 }

src/Actions/CommandAction/UndoAction.def

@@ -13 +13 @@
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
 // "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
-#define paramtypes (bool)
-#define paramtokens ("till-mark")
-#define paramdescriptions ("whether to undo just a single step (false) or until a previously set mark (true)")
-#define paramdefaults (PARAM_DEFAULT(false))
-#define paramreferences (undoTillMark)
-#define paramvalids (DummyValidator<bool>())
+#undef paramtypes
+#undef paramreferences
+#undef paramtokens
+#undef paramdescriptions
+#undef paramdefaults
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS
@@ -28 +27 @@
 
 // finally the information stored in the ActionTrait specialization
-#define DESCRIPTION "undo last action or until a given mark"
+#define DESCRIPTION "undo last action"
 #undef SHORTFORM