Skip to content

SG-41208: Add softDeleted paint node property to support undo, redo and clear actions in Live Review #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eloisebrosseau merged 4 commits into from
Dec 18, 2025
Merged

SG-41208: Add softDeleted paint node property to support undo, redo and clear actions in Live Review #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16711eb
Add softDeleted property on stroke
eloisebrosseau Dec 16, 2025
c88b604
Send internal events for undo, clear and clear actions
eloisebrosseau Dec 16, 2025
c101b1c
Remove unnecessary name property from OTIO Paint schema
eloisebrosseau Dec 16, 2025
96b7b56
Update clear buttons just before showing the dropdown
eloisebrosseau Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 115 additions & 18 deletions src/plugins/rv-packages/annotate/annotate_mode.mu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,10 +567,13 @@ class: AnnotateMinorMode : MinorMode

let uuid = generateUuid();
let uuidProperty = "%s.uuid" % n;

newProperty(uuidProperty, StringType, 1);
setStringProperty(uuidProperty, string[] {uuid}, true);

let softDeletedProperty = "%s.softDeleted" % n;
newProperty(softDeletedProperty, IntType, 1);
setIntProperty(softDeletedProperty, int[] {0}, true);

let stroke = n.split(".").back();

if (!propertyExists(orderName))
Expand Down Expand Up @@ -709,6 +712,10 @@ class: AnnotateMinorMode : MinorMode
newProperty(uuidProperty, StringType, 1);
setStringProperty(uuidProperty, string[] {uuid}, true);

let softDeletedProperty = "%s.softDeleted" % n;
newProperty(softDeletedProperty, IntType, 1);
setIntProperty(softDeletedProperty, int[] {0}, true);

let stroke = n.split(".").back();

if (!propertyExists(orderName))
Expand Down Expand Up @@ -1596,19 +1603,29 @@ class: AnnotateMinorMode : MinorMode
// clearAllUndo format: ["clearAllFrames", "node1", "stroke1", "node2", "stroke2"]
if (clearAllUndo.size() > 1 && clearAllUndo[0] == "clearAllFrames")
{
string[] affectedStrokes;

beginCompoundStateChange();

for (int i = 1; i < clearAllUndo.size(); i += 2)
{
let node = clearAllUndo[i];
let uuid = clearAllUndo[i + 1];

affectedStrokes.push_back(uuid);

let stroke = findStrokeByUuid(node, frame(), uuid);
if (stroke != "")
{
let parts = stroke.split(":"); // Stroke format: type:id:frame:user_processId
let frame = int(parts[2]);

let softDeleted = "%s.%s.softDeleted" % (node, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {0}, true);
}

let orderName = frameOrderName(node, frame);

if (!propertyExists(orderName))
Expand All @@ -1629,6 +1646,13 @@ class: AnnotateMinorMode : MinorMode
setStringProperty(clearAllUndoProperty, string[] {}, true);

endCompoundStateChange();

if (affectedStrokes.size() > 0)
{
string eventContents = string.join(affectedStrokes, "|");
sendInternalEvent("undo-paint", eventContents);
}

return;
}
}
Expand Down Expand Up @@ -1669,6 +1693,12 @@ class: AnnotateMinorMode : MinorMode
let stroke = findStrokeByUuid(_currentNode, frame, uuid);
if (stroke != "")
{
let softDeleted = "%s.%s.softDeleted" % (_currentNode, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {1}, true);
}

for_index(i; order)
{
if (order[i] == stroke)
Expand Down Expand Up @@ -1705,6 +1735,13 @@ class: AnnotateMinorMode : MinorMode
{
affectedStrokes.push_back(uuid);
let stroke = findStrokeByUuid(_currentNode, frame, uuid);

let softDeleted = "%s.%s.softDeleted" % (_currentNode, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {0}, true);
}

order.push_back(stroke);
}

Expand Down Expand Up @@ -1742,19 +1779,29 @@ class: AnnotateMinorMode : MinorMode
// clearAllRedo format: ["clearAllFrames", "node1", "stroke1", "node2", "stroke2"]
if (clearAllRedo.size() > 1 && clearAllRedo[0] == "clearAllFrames")
{
string[] affectedStrokes;

beginCompoundStateChange();

for (int i = 1; i < clearAllRedo.size(); i += 2)
{
let node = clearAllRedo[i];
let uuid = clearAllRedo[i + 1];

affectedStrokes.push_back(uuid);

let stroke = findStrokeByUuid(node, frame(), uuid);
if (stroke != "")
{
let parts = stroke.split(":"); // Stroke format: type:id:frame:user_processId
let frame = int(parts[2]);

let softDeleted = "%s.%s.softDeleted" % (node, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {1}, true);
}

let orderName = frameOrderName(node, frame);
if (propertyExists(orderName))
{
Expand All @@ -1781,6 +1828,13 @@ class: AnnotateMinorMode : MinorMode
setStringProperty(clearAllRedoProperty, string[] {}, true);

endCompoundStateChange();

if (affectedStrokes.size() > 0)
{
string eventContents = string.join(affectedStrokes, "|");
sendInternalEvent("redo-paint", eventContents);
}

return;
}
}
Expand Down Expand Up @@ -1821,6 +1875,12 @@ class: AnnotateMinorMode : MinorMode
let stroke = findStrokeByUuid(_currentNode, frame, uuid);
if (stroke != "")
{
let softDeleted = "%s.%s.softDeleted" % (_currentNode, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {0}, true);
}

order.push_back(stroke);

undo.push_back(uuid);
Expand Down Expand Up @@ -1850,6 +1910,13 @@ class: AnnotateMinorMode : MinorMode
{
affectedStrokes.push_back(uuid);
let stroke = findStrokeByUuid(_currentNode, frame, uuid);

let softDeleted = "%s.%s.softDeleted" % (_currentNode, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {1}, true);
}

for_index(i; order)
{
if (order[i] == stroke)
Expand Down Expand Up @@ -1917,6 +1984,7 @@ class: AnnotateMinorMode : MinorMode
{
string[] undo;
string[] redo;
string[] affectedStrokes;

for_each(stroke; order)
{
Expand All @@ -1926,6 +1994,13 @@ class: AnnotateMinorMode : MinorMode
{
let uuid = getStringProperty(uuidProperty).front();
undo.push_back(uuid);
affectedStrokes.push_back(uuid);

let softDeleted = "%s.%s.softDeleted" % (node, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {1}, true);
}
}
}
undo.push_back(string(order.size()));
Expand All @@ -1952,6 +2027,12 @@ class: AnnotateMinorMode : MinorMode
clearAllUsersUndoRedoStacks(node, frame, excludeUser);

endCompoundStateChange();

if (affectedStrokes.size() > 0)
{
string eventContents = string.join(affectedStrokes, "|");
sendInternalEvent("clear-paint", eventContents);
}
}
}
}
Expand All @@ -1960,6 +2041,7 @@ class: AnnotateMinorMode : MinorMode
{
string[] clearAllActions;
clearAllActions.push_back("clearAllFrames");
string[] affectedStrokes;

beginCompoundStateChange();

Expand All @@ -1976,15 +2058,18 @@ class: AnnotateMinorMode : MinorMode
{
let uuidProperty = "%s.%s.uuid" % (node, stroke);

clearAllActions.push_back(node);
if (propertyExists(uuidProperty))
{
let uuid = getStringProperty(uuidProperty).front();
clearAllActions.push_back(node);
clearAllActions.push_back(uuid);
}
else
{
clearAllActions.push_back("");
affectedStrokes.push_back(uuid);

let softDeleted = "%s.%s.softDeleted" % (node, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {1}, true);
}
}
}

Expand All @@ -2002,15 +2087,18 @@ class: AnnotateMinorMode : MinorMode
{
let uuidProperty = "%s.%s.uuid" % (node, stroke);

clearAllActions.push_back(node);
if (propertyExists(uuidProperty))
{
let uuid = getStringProperty(uuidProperty).front();
clearAllActions.push_back(node);
clearAllActions.push_back(uuid);
}
else
{
clearAllActions.push_back("");
affectedStrokes.push_back(uuid);

let softDeleted = "%s.%s.softDeleted" % (node, stroke);
if (propertyExists(softDeleted))
{
setIntProperty(softDeleted, int[] {1}, true);
}
}
}

Expand Down Expand Up @@ -2041,6 +2129,13 @@ class: AnnotateMinorMode : MinorMode
}

endCompoundStateChange();

if (affectedStrokes.size() > 0)
{
string eventContents = string.join(affectedStrokes, "|");
sendInternalEvent("clear-all-paint", eventContents);
}

updateFrameDependentState();
redraw();
}
Expand Down Expand Up @@ -2165,13 +2260,6 @@ class: AnnotateMinorMode : MinorMode
return if _syncAutoStart then CheckedMenuState else UncheckedMenuState;
}

method: undoSlot (void; bool checked)
{
undoPaint();
updateFrameDependentState();
redraw();
}

method: clearSlot (void; bool checked)
{
clearPaint(_currentNode, _currentNodeInfo.frame);
Expand All @@ -2197,6 +2285,13 @@ class: AnnotateMinorMode : MinorMode
redraw();
}

method: undoSlot (void; bool checked)
{
undoPaint();
updateFrameDependentState();
redraw();
}

method: redoSlot (void; bool checked)
{
redoPaint();
Expand Down Expand Up @@ -3034,6 +3129,8 @@ class: AnnotateMinorMode : MinorMode
_clearButton.setMenu(clearMenu);
_clearButton.setPopupMode(QToolButton.InstantPopup);

connect(clearMenu, QMenu.aboutToShow, undoRedoClearUpdate);

connect(_clearFrameAct, QAction.triggered, clearSlot);
connect(_clearAllFramesAct, QAction.triggered, clearAllSlot);
_clearButton.setStyleSheet("QToolButton::menu-indicator { subcontrol-position: bottom right; top: -2px; }");
Expand Down
Loading
Loading