Skip to content

Commit ab39112

Browse files
committed
[ui] NodeActions : Replace the recompute by delete node data
1 parent d993e9a commit ab39112

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

meshroom/ui/qml/Controls/NodeActions.qml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Item {
2020
// Signals
2121
signal computeRequest(var node)
2222
signal stopComputeRequest(var node)
23-
signal reComputeRequest(var node)
23+
signal deleteDataRequest(var node)
2424
signal submitRequest(var node)
2525

2626
SystemPalette { id: activePalette }
@@ -41,7 +41,7 @@ Item {
4141
enum ButtonState {
4242
LAUNCHABLE,
4343
STOPPABLE,
44-
RELAUNCHABLE,
44+
DELETABLE,
4545
DISABLED
4646
}
4747

@@ -110,7 +110,7 @@ Item {
110110
property string computeButtonIcon: {
111111
switch (computeButtonState) {
112112
case NodeActions.ButtonState.STOPPABLE: return MaterialIcons.cancel_schedule_send
113-
case NodeActions.ButtonState.RELAUNCHABLE: return MaterialIcons.autorenew
113+
case NodeActions.ButtonState.DELETABLE: return MaterialIcons.delete_
114114
default: return MaterialIcons.send
115115
}
116116
}
@@ -127,7 +127,7 @@ Item {
127127
case "KILLED":
128128
return NodeActions.ButtonState.LAUNCHABLE
129129
case "SUCCESS":
130-
return NodeActions.ButtonState.RELAUNCHABLE
130+
return NodeActions.ButtonState.DELETABLE
131131
}
132132
return NodeActions.ButtonState.DISABLED
133133
}
@@ -213,8 +213,11 @@ Item {
213213
if (!computeButton.enabled) return activePalette.button
214214
switch (actionHeader.computeButtonState) {
215215
case NodeActions.ButtonState.STOPPABLE:
216-
if (computeButton.hovered) return Colors.statusColors["STOPPED"]
217-
return Qt.darker(Colors.statusColors["STOPPED"], 1.3)
216+
if (computeButton.hovered) return Colors.orange
217+
return Qt.darker(Colors.orange, 1.3)
218+
case NodeActions.ButtonState.DELETABLE:
219+
if (computeButton.hovered) return Colors.red
220+
return Qt.darker(Colors.red, 1.3)
218221
default: break
219222
}
220223
if (computeButton.hovered) return activePalette.highlight
@@ -233,8 +236,8 @@ Item {
233236
case NodeActions.ButtonState.LAUNCHABLE:
234237
root.computeRequest(actionHeader.selectedNode)
235238
break
236-
case NodeActions.ButtonState.RELAUNCHABLE:
237-
root.reComputeRequest(actionHeader.selectedNode)
239+
case NodeActions.ButtonState.DELETABLE:
240+
root.deleteDataRequest(actionHeader.selectedNode)
238241
break
239242
default: break
240243
}

meshroom/ui/qml/GraphEditor/GraphEditor.qml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,12 +1090,8 @@ Item {
10901090
uigraph.stopNodeComputation(node)
10911091
}
10921092

1093-
onReComputeRequest: function(node) {
1094-
// Only triggered if the node is already computed
1095-
// so we don't have to check if we should erase the data
1096-
if (node.canBeStopped) uigraph.stopNodeComputation(node)
1093+
onDeleteDataRequest: function(node) {
10971094
uigraph.clearSelectedNodesData();
1098-
root.computeRequest([node])
10991095
}
11001096

11011097
onSubmitRequest: function(node) {

0 commit comments

Comments
 (0)