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

[tests] update node duplication test

Browse source
This commit is contained in:
ChemicalXandco 2021-02-03 22:29:31 +00:00
parent acf1bf2116
commit 55b16bc6d3
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
meshroom/ui/graph.py
View file

@ -679,14 +679,12 @@ class UIGraph(QObject):
self._selectedNodes.append(n) self._selectedNodes.append(n)
self.selectedNodesChanged.emit() self.selectedNodesChanged.emit()
def clearNodeSelection(self):
""" Clear node selection. """
self.selectedNode = None
@Slot() @Slot()
def clearNodesSelections(self): def clearNodeSelection(self):
""" Clear multiple nodes selection. """ """Clear all node selection."""
self.selectedNode = None
self._selectedNodes.clear() self._selectedNodes.clear()
self.selectedNodeChanged.emit()
self.selectedNodesChanged.emit() self.selectedNodesChanged.emit()
def clearNodeHover(self): def clearNodeHover(self):

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

@ -112,8 +112,7 @@ Item {
onPressed: { onPressed: {
if (mouse.button != Qt.MiddleButton && mouse.modifiers == Qt.NoModifier) { if (mouse.button != Qt.MiddleButton && mouse.modifiers == Qt.NoModifier) {
selectNode(null) uigraph.clearNodeSelection()
uigraph.clearNodesSelections()
} }
if (mouse.button == Qt.LeftButton && (mouse.modifiers == Qt.NoModifier || mouse.modifiers == Qt.ControlModifier)) { if (mouse.button == Qt.LeftButton && (mouse.modifiers == Qt.NoModifier || mouse.modifiers == Qt.ControlModifier)) {
boxSelect.startX = mouseX boxSelect.startX = mouseX
@ -460,11 +459,11 @@ Item {
} else if (mouse.modifiers & Qt.AltModifier) { } else if (mouse.modifiers & Qt.AltModifier) {
duplicateNode(node, true) duplicateNode(node, true)
} else if (!mainSelected && !selected) { } else if (!mainSelected && !selected) {
uigraph.clearNodesSelections() uigraph.clearNodeSelection()
} }
} else if (mouse.button == Qt.RightButton) { } else if (mouse.button == Qt.RightButton) {
if (!mainSelected && !selected) { if (!mainSelected && !selected) {
uigraph.clearNodesSelections() uigraph.clearNodeSelection()
} }
nodeMenu.currentNode = node nodeMenu.currentNode = node
nodeMenu.popup() nodeMenu.popup()

3
tests/test_graph.py
View file

@ -264,7 +264,8 @@ def test_duplicate_nodes():
n3 = g.addNewNode('AppendFiles', input=n1.output, input2=n2.output) n3 = g.addNewNode('AppendFiles', input=n1.output, input2=n2.output)
# duplicate from n1 # duplicate from n1
nMap = g.duplicateNodesFromNode(fromNode=n1) nodes_to_duplicate, _ = g.dfsOnDiscover(startNodes=[n1], reverse=True, dependenciesOnly=True)
nMap = g.duplicateNodes(srcNodes=nodes_to_duplicate)
for s, d in nMap.items(): for s, d in nMap.items():
assert s.nodeType == d.nodeType assert s.nodeType == d.nodeType