3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-17 19:16:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] TaskManager: change removeNode() and add containsNodeName()

Browse source
This commit is contained in:
Julien-Haudegond 2020-08-31 11:38:50 +02:00
parent 11bf6821ae
commit f502625c0b
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
meshroom/core/taskManager.py
View file

@ -157,13 +157,26 @@ class TaskManager(BaseObject):
def contains(self, node): def contains(self, node):
return node in self._nodes.values() return node in self._nodes.values()
def removeNode(self, node): def containsNodeName(self, name):
""" Remove node from the Task Manager. """ """ Check if a node with the argument name belongs to the display list. """
if self._nodes.contains(node): if name in self._nodes.keys():
return True
return False
def removeNode(self, node, displayList=True, processList=False, externList=False):
""" Remove node from the Task Manager.
Args:
node (Node): node to remove.
displayList (bool): remove from the display list.
processList (bool): remove from the nodesToProcess list.
externList (bool): remove from the nodesExtern list.
"""
if displayList and self._nodes.contains(node):
self._nodes.pop(node.name) self._nodes.pop(node.name)
if node in self._nodesToProcess: if processList and node in self._nodesToProcess:
self._nodesToProcess.remove(node) self._nodesToProcess.remove(node)
if node in self._nodesExtern: if externList and node in self._nodesExtern:
self._nodesExtern.remove(node) self._nodesExtern.remove(node)
def clear(self): def clear(self):

4
meshroom/ui/graph.py
View file

@ -410,11 +410,11 @@ class UIGraph(QObject):
# Status from SUBMITTED to NONE # Status from SUBMITTED to NONE
# Make sure to remove the nodes from the Task Manager list # Make sure to remove the nodes from the Task Manager list
node.clearSubmittedChunks() node.clearSubmittedChunks()
self._taskManager.removeNode(node) self._taskManager.removeNode(node, displayList=True, processList=True)
for n in node.getOutputNodes(recursive=True): for n in node.getOutputNodes(recursive=True):
n.clearSubmittedChunks() n.clearSubmittedChunks()
self._taskManager.removeNode(n) self._taskManager.removeNode(n, displayList=True, processList=True)
@Slot(Node) @Slot(Node)
def submit(self, node=None): def submit(self, node=None):