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

[ui] change the management of ActiveNodes

Browse source
This commit is contained in:
Fabien Castan 2024-06-15 17:41:05 +02:00
parent 4e3f718786
commit 1958b5f8c0
1 changed files with 52 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
meshroom/ui/reconstruction.py
View file

@ -14,7 +14,7 @@ import meshroom.common
from meshroom import multiview
from meshroom.common.qt import QObjectListModel
from meshroom.core import Version
from meshroom.core.node import Node, CompatibilityNode, Status, Position
from meshroom.core.node import Node, CompatibilityNode, Status, Position, CompatibilityIssue
from meshroom.ui.graph import UIGraph
from meshroom.ui.utils import makeProperty
from meshroom.ui.components.filepath import FilepathHelper
@ -487,9 +487,9 @@ class Reconstruction(UIGraph):
def initActiveNodes(self):
# Create all possible entries
for category, _ in self.activeNodeCategories.items():
self._activeNodes.add(ActiveNode(category, self))
self._activeNodes.add(ActiveNode(category, parent=self))
for nodeType, _ in meshroom.core.nodesDesc.items():
self._activeNodes.add(ActiveNode(nodeType, self))
self._activeNodes.add(ActiveNode(nodeType, parent=self))
def clearActiveNodes(self):
for key in self._activeNodes.keys():
@ -499,6 +499,7 @@ class Reconstruction(UIGraph):
# Update active nodes when CameraInit changes
nodes = self._graph.dfsOnDiscover(startNodes=[self._cameraInit], reverse=True)[0]
self.setActiveNodes(nodes)
self.resetActiveNodePerCategory()
@Slot()
@Slot(str)
@ -570,14 +571,13 @@ class Reconstruction(UIGraph):
""" React to the change of the internal graph. """
self._liveSfmManager.reset()
self.selectedViewId = "-1"
self.sfm = None
self.tempCameraInit = None
self.updateCameraInits()
self.sfm = self.lastSfmNode()
self.resetActiveNodePerCategory()
if not self._graph:
return
self.setSfm(self.lastSfmNode())
# TODO: listen specifically for cameraInit creation/deletion
self._graph.nodes.countChanged.connect(self.updateCameraInits)
@ -616,6 +616,12 @@ class Reconstruction(UIGraph):
def setCameraInitIndex(self, idx):
camInit = self._cameraInits[idx] if self._cameraInits else None
self.cameraInit = camInit
# Update the active viewpoint accordingly
if self.viewpoints:
self.setSelectedViewId(self.viewpoints[0].viewId.value)
def setCameraInitNode(self, node):
self.setCameraInitIndex(self._cameraInits.indexOf(node))
@Slot()
def clearTempCameraInit(self):
@ -637,7 +643,7 @@ class Reconstruction(UIGraph):
self.tempCameraInit = tmpCameraInit
rootNode = self.graph.dfsOnFinish([node])[0][0]
if rootNode.nodeType == "CameraInit":
self.setCameraInitIndex(self._cameraInits.indexOf(rootNode))
self.setCameraInitNode(rootNode)
@Slot(QObject, result=QVector3D)
def getAutoFisheyeCircle(self, panoramaInit):
@ -999,20 +1005,24 @@ class Reconstruction(UIGraph):
liveSfmManager = Property(QObject, lambda self: self._liveSfmManager, constant=True)
@Slot(QObject)
def setActiveNode(self, node):
""" Set node as the active node of its type. """
def setActiveNode(self, node, categories=True, inputs=True):
""" Set node as the active node of its type and of its categories.
Also upgrade related input nodes.
"""
if categories:
for category, nodeTypes in self.activeNodeCategories.items():
if node.nodeType in nodeTypes:
self.activeNodes.get(category).node = node
self.activeNodes.getr(category).node = node
if category == 'sfm':
if category == "sfmData":
self.setSfm(node)
# if the active node is a CameraInit node, update the camera init index
if node.nodeType == "CameraInit":
self.setCameraInitIndex(self._cameraInits.indexOf(node))
# get all nodes that are input nodes of the active node
# if the active node is a CameraInit node, update the camera init index
self.setCameraInitNode(node)
elif inputs:
# Update the input node to ensure that it is part of the dependency of the new active node.
# Retrieve all nodes that are input nodes of the new active node
inputNodes = node.getInputNodes(recursive=True, dependenciesOnly=True)
inputCameraInitNodes = [n for n in inputNodes if n.nodeType == "CameraInit"]
# if the current camera init node is not the same as the camera init node of the active node
@ -1021,30 +1031,27 @@ class Reconstruction(UIGraph):
# if multiple camera init, select one arbitrarily (the one with more viewpoints)
inputCameraInitNodes.sort(key=lambda n: len(n.viewpoints.value), reverse=True)
cameraInitNode = inputCameraInitNodes[0]
self.setCameraInitIndex(self._cameraInits.indexOf(cameraInitNode))
self.setSelectedViewId(self.viewpoints[0].viewId.value)
self.setCameraInitNode(cameraInitNode)
# Set the new active node (if it is not an unknown type)
unknownType = isinstance(node, CompatibilityNode) and node.issue == CompatibilityIssue.UnknownNodeType
if not unknownType:
self.activeNodes.get(node.nodeType).node = node
@Slot(QObject)
def setActiveNodes(self, nodes):
""" Set node as the active node of its type. """
for node in nodes:
if node is None:
continue
self.setActiveNode(node, categories=False, inputs=False)
def resetActiveNodePerCategory(self):
# Setup the active node per category only once, on the last one
nodesByCategory = {}
for node in nodes:
if node is None:
continue
for category, nodeTypes in self.activeNodeCategories.items():
if node.nodeType in nodeTypes:
nodesByCategory[category] = node
for category, node in nodesByCategory.items():
node = self.lastNodeOfType(nodeTypes, self._cameraInit, Status.SUCCESS)
self.activeNodes.get(category).node = node
if category == 'sfm' and not self._graph.dirtyTopology:
self.setActiveNode(self.lastSfmNode())
for node in nodes:
if node is None:
continue
if not isinstance(node, CompatibilityNode):
self.activeNodes.get(node.nodeType).node = node
def updateSfMResults(self):
"""