3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-02 10:52:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

[GraphEditor] Implementation of Recompute Button

Browse source 
Allows to do Delete data + Compute in less clicks
This commit is contained in:
Aurore LAFAURIE 2024-07-22 11:44:18 +02:00 • committed by Candice Bentéjac
parent ea5894f67e
commit 72201a80ff
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
meshroom/ui/qml/GraphEditor/GraphEditor.qml
View file

@ -29,6 +29,8 @@ Item {
signal computeRequest(var nodes) signal computeRequest(var nodes)
signal submitRequest(var nodes) signal submitRequest(var nodes)
signal dataDeleted()
property int nbMeshroomScenes: 0 property int nbMeshroomScenes: 0
property int nbDraggedFiles: 0 property int nbDraggedFiles: 0
// Files have been dropped // Files have been dropped
@ -67,6 +69,13 @@ Item {
} }
} }
onDataDeleted: {
if (computeMenuItem.recompute) {
computeRequest(uigraph.selectedNodes)
computeMenuItem.recompute = false
}
}
/// Duplicate a node and optionally all the following ones /// Duplicate a node and optionally all the following ones
function duplicateNode(duplicateFollowingNodes) { function duplicateNode(duplicateFollowingNodes) {
var nodes var nodes
@ -443,11 +452,20 @@ Item {
property bool canComputeNode: currentNode != null && uigraph.graph.canCompute(currentNode) property bool canComputeNode: currentNode != null && uigraph.graph.canCompute(currentNode)
//canSubmitOrCompute: return int n : 0 >= n <= 3 | n=0 cannot submit or compute | n=1 can compute | n=2 can submit | n=3 can compute & submit //canSubmitOrCompute: return int n : 0 >= n <= 3 | n=0 cannot submit or compute | n=1 can compute | n=2 can submit | n=3 can compute & submit
property int canSubmitOrCompute: currentNode != null && uigraph.graph.canSubmitOrCompute(currentNode) property int canSubmitOrCompute: currentNode != null && uigraph.graph.canSubmitOrCompute(currentNode)
property bool isComputed: {
for (var i = 0; i < uigraph.selectedNodes.count; ++i) {
if (!uigraph.selectedNodes.at(i).isComputed)
return false
}
return uigraph.selectedNodes.count > 0
}
width: 220 width: 220
onClosed: currentNode = null onClosed: currentNode = null
MenuItem { MenuItem {
text: "Compute" id: computeMenuItem
property bool recompute: false
text: nodeMenu.isComputed ? "Recompute" : "Compute"
visible: { visible: {
for (var i = 0; i < uigraph.selectedNodes.count; ++i) { for (var i = 0; i < uigraph.selectedNodes.count; ++i) {
if (!uigraph.selectedNodes.at(i).isComputable) if (!uigraph.selectedNodes.at(i).isComputable)
@ -464,12 +482,17 @@ Item {
canCompute = true canCompute = true
} }
} }
return canCompute //canSubmit if canSubmitOrCompute == 1(can compute) or 3(can compute & submit) return canCompute || nodeMenu.isComputed //canSubmit if canSubmitOrCompute == 1(can compute) or 3(can compute & submit)
} }
onTriggered: { onTriggered: {
computeRequest(uigraph.selectedNodes) if (nodeMenu.isComputed) {
recompute = true
deleteDataMenuItem.showConfirmationDialog(false)
} else {
computeRequest(uigraph.selectedNodes)
}
} }
} }
MenuItem { MenuItem {
@ -584,6 +607,7 @@ Item {
visible: nodeMenu.currentNode ? nodeMenu.currentNode.isComputable : false visible: nodeMenu.currentNode ? nodeMenu.currentNode.isComputable : false
} }
MenuItem { MenuItem {
id: deleteDataMenuItem
text: "Delete Data" + (deleteFollowingButton.hovered ? " From Here" : "" ) + "..." text: "Delete Data" + (deleteFollowingButton.hovered ? " From Here" : "" ) + "..."
visible: nodeMenu.currentNode ? nodeMenu.currentNode.isComputable : false visible: nodeMenu.currentNode ? nodeMenu.currentNode.isComputable : false
height: visible ? implicitHeight : 0 height: visible ? implicitHeight : 0
@ -645,6 +669,8 @@ Item {
uigraph.clearDataFrom(uigraph.selectedNodes) uigraph.clearDataFrom(uigraph.selectedNodes)
else else
uigraph.clearData(uigraph.selectedNodes) uigraph.clearData(uigraph.selectedNodes)
root.dataDeleted()
} }
onClosed: destroy() onClosed: destroy()
} }