3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-01 15:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui/core] Order last node of type according to node's depth and name

Browse source
This commit is contained in:
Aurore LAFAURIE 2024-05-17 10:27:32 +02:00
parent 4e8c0c2cf8
commit 663b6b66d4
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
meshroom/core/graph.py
View file

@ -930,10 +930,6 @@ class Graph(BaseObject):
for edge in self.getEdges(dependenciesOnly=dependenciesOnly): for edge in self.getEdges(dependenciesOnly=dependenciesOnly):
nodeEdges[edge.src.node].add(edge.dst.node) nodeEdges[edge.src.node].add(edge.dst.node)
# sort the edges
for node in nodeEdges:
nodeEdges[node] = sorted(nodeEdges[node], key=lambda item: item.name)
return nodeEdges return nodeEdges
def dfs(self, visitor, startNodes=None, longestPathFirst=False): def dfs(self, visitor, startNodes=None, longestPathFirst=False):
@ -1114,7 +1110,7 @@ class Graph(BaseObject):
self._computationBlocked.clear() self._computationBlocked.clear()
compatNodes = [] compatNodes = []
visitor = Visitor(reverse=False, dependenciesOnly=True) visitor = Visitor(reverse=False, dependenciesOnly=False)
def discoverVertex(vertex, graph): def discoverVertex(vertex, graph):
# initialize depths # initialize depths

2
meshroom/ui/reconstruction.py
View file

@ -665,6 +665,8 @@ class Reconstruction(UIGraph):
nodes = self._graph.dfsOnDiscover(startNodes=[startNode], filterTypes=nodeTypes, reverse=True)[0] nodes = self._graph.dfsOnDiscover(startNodes=[startNode], filterTypes=nodeTypes, reverse=True)[0]
if not nodes: if not nodes:
return None return None
# order the nodes according to their depth in the graph, then according to their name
nodes.sort(key=lambda n: (n.depth, n.name))
node = nodes[-1] node = nodes[-1]
if preferredStatus: if preferredStatus:
node = next((n for n in reversed(nodes) if n.getGlobalStatus() == preferredStatus), node) node = next((n for n in reversed(nodes) if n.getGlobalStatus() == preferredStatus), node)