Changeset 7d2ee1 for src/Actions/ActionHistory.cpp

Timestamp:

Apr 23, 2021, 9:02:12 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

7df863

Parents:

3b7834

git-author:

Frederik Heber <frederik.heber@…> (04/10/21 07:58:48)

git-committer:

Frederik Heber <frederik.heber@…> (04/23/21 21:02:12)

Message:

ActionHistory's marked states is now a stack.

• i.e. multiple marks can be set and are removed when the history passes over them or when they are undone till that mark.

File:

• src/Actions/ActionHistory.cpp (modified) (3 diffs)

src/Actions/ActionHistory.cpp

@@ -64 +64 @@
   HistoryElement elem = history.back();
   LOG(1, "INFO: Undoing action " << elem.action->getName());
-  if ((mark != NULL) && (mark == &elem)) {
+  while ((!marked.empty()) && (marked.top() == &elem)) {
     LOG(2, "DEBUG: Undoing marked item in ActionHistory, hence resetting mark.");
-    mark = NULL;
+    marked.pop();
   }
   history.pop_back();
@@ -74 +74 @@
   yrotsih.push_back(HistoryElement(elem.action,newState));
 }
+
 void ActionHistory::redoLast(){
   if (!hasRedo()){
@@ -98 +99 @@
 
 void ActionHistory::setMark() {
-  mark = &(history.back());
+  HistoryElement * const mark = &(history.back());
+  ASSERT( mark != NULL,
+      "ActionHistory::setMark() - must not push NULL as element");
+  marked.push(mark);
 }
 
 void ActionHistory::unsetMark() {
-  mark = NULL;
+  marked.pop();
 }
 
 void ActionHistory::undoTillMark() {
-  if (mark == NULL) {
+  if (marked.empty()) {
     undoLast();
   } else {
+    const HistoryElement * const mark = marked.top();
     while (mark != &(history.back()))
       undoLast();
+    marked.pop();
   }
 }