3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-24 14:36:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] GraphEditor : add "Clear Pending Status" tool at Graph level

Browse source 
* allow to clear status of all submitted nodes in the graph
* unify wording
This commit is contained in:
Yann Lanthony 2019-01-04 18:06:35 +01:00
parent b09068dc68
commit 34ca607261
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
meshroom/core/graph.py
View file

@ -999,6 +999,7 @@ class Graph(BaseObject):
for chunk in self.iterChunksByStatus(Status.RUNNING): for chunk in self.iterChunksByStatus(Status.RUNNING):
chunk.stopProcess() chunk.stopProcess()
@Slot()
def clearSubmittedNodes(self): def clearSubmittedNodes(self):
""" Reset the status of already submitted nodes to Status.NONE """ """ Reset the status of already submitted nodes to Status.NONE """
for node in self.nodes: for node in self.nodes:

4
meshroom/ui/qml/GraphEditor/NodeEditor.qml
View file

@ -54,7 +54,7 @@ Panel {
MenuSeparator {} MenuSeparator {}
MenuItem { MenuItem {
enabled: root.node !== null enabled: root.node !== null
text: "Clear Submitted Status" text: "Clear Pending Status"
onClicked: node.clearSubmittedChunks() onClicked: node.clearSubmittedChunks()
} }
} }
@ -115,7 +115,7 @@ Panel {
AttributeEditor { AttributeEditor {
Layout.fillWidth: true Layout.fillWidth: true
attributes: root.node.attributes attributes: root.node.attributes
readOnly: root.isCompatibilityNode readOnly: root.readOnly || root.isCompatibilityNode
onAttributeDoubleClicked: root.attributeDoubleClicked(attribute) onAttributeDoubleClicked: root.attributeDoubleClicked(attribute)
onUpgradeRequest: root.upgradeRequest() onUpgradeRequest: root.upgradeRequest()
} }

20
meshroom/ui/qml/main.qml
View file

@ -518,7 +518,25 @@ ApplicationWindow {
Layout.fillWidth: true Layout.fillWidth: true
padding: 4 padding: 4
title: "Graph Editor" title: "Graph Editor"
visible: settings_UILayout.showGraphEditor
headerBar: RowLayout {
MaterialToolButton {
text: MaterialIcons.more_vert
font.pointSize: 11
padding: 2
onClicked: graphEditorMenu.open()
Menu {
id: graphEditorMenu
y: parent.height
x: -width + parent.width
MenuItem {
text: "Clear Pending Status"
enabled: !_reconstruction.computingLocally
onTriggered: _reconstruction.graph.clearSubmittedNodes()
}
}
}
}
function displayAttribute(attr) { function displayAttribute(attr) {
if( attr.desc.type === "File" if( attr.desc.type === "File"