mirror of
https://github.com/alicevision/Meshroom.git
synced 2025-07-23 11:37:28 +02:00
[ui] introduce UIGraph + ChunksMonitor
* extract UIGraph from Reconstruction: base class that wraps a core.Graph, without knowledge of photogrammetry pipeline * ChunksMonitor: watch NodeChunks status files for external changes to keep UI updated even when the graph is being computed externally * Reconstruction inherits UIGraph with photogrammetry specific features
This commit is contained in:
Yann Lanthony
parent
5b1b5a1b32
commit
0e08291f8a
3 changed files with 325 additions and 152 deletions
|
|
@ -2,159 +2,50 @@ import logging
|
|||
import os
|
||||
from threading import Thread
|
||||
|
||||
from PySide2.QtCore import QObject, Slot, Property, Signal, QJsonValue, QUrl
|
||||
from PySide2.QtCore import QObject, Slot, Property, Signal
|
||||
|
||||
from meshroom import multiview
|
||||
from meshroom.core import graph, defaultCacheFolder, cacheFolderName
|
||||
from meshroom.ui import commands
|
||||
from meshroom.core import graph
|
||||
from meshroom.ui.graph import UIGraph
|
||||
|
||||
|
||||
class Reconstruction(QObject):
|
||||
|
||||
def __init__(self, graphFilepath="", parent=None):
|
||||
super(Reconstruction, self).__init__(parent)
|
||||
self._graph = None
|
||||
self._undoStack = commands.UndoStack(self)
|
||||
self._computeThread = Thread()
|
||||
self._filepath = graphFilepath
|
||||
if self._filepath:
|
||||
self.load(self._filepath)
|
||||
class Reconstruction(UIGraph):
|
||||
"""
|
||||
Specialization of a UIGraph designed to manage a 3D reconstruction.
|
||||
"""
|
||||
def __init__(self, graphFilepath='', parent=None):
|
||||
super(Reconstruction, self).__init__(graphFilepath, parent)
|
||||
self._buildIntrinsicsThread = None
|
||||
self._endChunk = None
|
||||
self._meshFile = ''
|
||||
self.intrinsicsBuilt.connect(self.onIntrinsicsAvailable)
|
||||
self.graphChanged.connect(self.onGraphChanged)
|
||||
if graphFilepath:
|
||||
self.onGraphChanged()
|
||||
else:
|
||||
self.new()
|
||||
|
||||
self._buildIntrinsicsThread = None
|
||||
self.intrinsicsBuilt.connect(self.onIntrinsicsAvailable)
|
||||
|
||||
@Slot()
|
||||
def new(self):
|
||||
self.clear()
|
||||
self._graph = multiview.photogrammetryPipeline()
|
||||
self._graph.cacheDir = defaultCacheFolder
|
||||
self._graph.update()
|
||||
self.graphChanged.emit()
|
||||
""" Create a new photogrammetry pipeline. """
|
||||
self.setGraph(multiview.photogrammetryPipeline())
|
||||
|
||||
def clear(self):
|
||||
if self._graph:
|
||||
self._graph.clear()
|
||||
self._graph.deleteLater()
|
||||
self._graph = None
|
||||
self.setFilepath("")
|
||||
self._undoStack.clear()
|
||||
def onGraphChanged(self):
|
||||
""" React to the change of the internal graph. """
|
||||
self._endChunk = None
|
||||
self.setMeshFile('')
|
||||
|
||||
def setFilepath(self, path):
|
||||
if self._filepath == path:
|
||||
if not self._graph:
|
||||
return
|
||||
self._filepath = path
|
||||
self.filepathChanged.emit()
|
||||
|
||||
def push(self, command):
|
||||
""" Try and push the given command to the undo stack.
|
||||
|
||||
Args:
|
||||
command (commands.UndoCommand): the command to push
|
||||
"""
|
||||
self._undoStack.tryAndPush(command)
|
||||
|
||||
def groupedGraphModification(self, title):
|
||||
""" Get a GroupedGraphModification for this Reconstruction.
|
||||
|
||||
Args:
|
||||
title (str): the title of the macro command
|
||||
|
||||
Returns:
|
||||
GroupedGraphModification: the instantiated context manager
|
||||
"""
|
||||
return commands.GroupedGraphModification(self._graph, self._undoStack, title)
|
||||
|
||||
@Slot(str)
|
||||
def addNode(self, nodeType):
|
||||
self.push(commands.AddNodeCommand(self._graph, nodeType))
|
||||
|
||||
@Slot(graph.Node)
|
||||
def removeNode(self, node):
|
||||
self.push(commands.RemoveNodeCommand(self._graph, node))
|
||||
|
||||
@Slot(graph.Attribute, graph.Attribute)
|
||||
def addEdge(self, src, dst):
|
||||
if isinstance(dst, graph.ListAttribute):
|
||||
with self.groupedGraphModification("Insert and Add Edge on {}".format(dst.fullName())):
|
||||
self.appendAttribute(dst)
|
||||
self.push(commands.AddEdgeCommand(self._graph, src, dst[-1]))
|
||||
else:
|
||||
self.push(commands.AddEdgeCommand(self._graph, src, dst))
|
||||
|
||||
@Slot(graph.Edge)
|
||||
def removeEdge(self, edge):
|
||||
if isinstance(edge.dst.root, graph.ListAttribute):
|
||||
with self.groupedGraphModification("Remove Edge and Delete {}".format(edge.dst.fullName())):
|
||||
self.push(commands.RemoveEdgeCommand(self._graph, edge))
|
||||
self.removeAttribute(edge.dst)
|
||||
else:
|
||||
self.push(commands.RemoveEdgeCommand(self._graph, edge))
|
||||
|
||||
@Slot(graph.Attribute, "QVariant")
|
||||
def setAttribute(self, attribute, value):
|
||||
self.push(commands.SetAttributeCommand(self._graph, attribute, value))
|
||||
|
||||
@Slot(graph.Attribute, QJsonValue)
|
||||
def appendAttribute(self, attribute, value=QJsonValue()):
|
||||
if value.isArray():
|
||||
pyValue = value.toArray().toVariantList()
|
||||
else:
|
||||
pyValue = None if value.isNull() else value.toObject()
|
||||
self.push(commands.ListAttributeAppendCommand(self._graph, attribute, pyValue))
|
||||
|
||||
@Slot(graph.Attribute)
|
||||
def removeAttribute(self, attribute):
|
||||
self.push(commands.ListAttributeRemoveCommand(self._graph, attribute))
|
||||
|
||||
def load(self, filepath):
|
||||
self.clear()
|
||||
self._graph = graph.Graph("")
|
||||
self._graph.load(filepath)
|
||||
self.setFilepath(filepath)
|
||||
self.graphChanged.emit()
|
||||
|
||||
@Slot(QUrl)
|
||||
def loadUrl(self, url):
|
||||
self.load(url.toLocalFile())
|
||||
|
||||
@Slot(QUrl)
|
||||
def saveAs(self, url):
|
||||
self.setFilepath(url.toLocalFile())
|
||||
self.save()
|
||||
|
||||
@Slot()
|
||||
def save(self):
|
||||
self._graph.save(self._filepath)
|
||||
self._graph.cacheDir = os.path.join(os.path.dirname(self._filepath), cacheFolderName)
|
||||
self._undoStack.setClean()
|
||||
|
||||
@Slot(graph.Node)
|
||||
def execute(self, node=None):
|
||||
if self.computing:
|
||||
return
|
||||
nodes = [node] if node else self._graph.getLeaves()
|
||||
self._computeThread = Thread(target=self._execute, args=(nodes,))
|
||||
self._computeThread.start()
|
||||
|
||||
def _execute(self, nodes):
|
||||
self.computingChanged.emit()
|
||||
try:
|
||||
graph.execute(self._graph, nodes)
|
||||
except Exception as e:
|
||||
import traceback
|
||||
logging.error("Error during Graph execution: {}".format(traceback.format_exc()))
|
||||
finally:
|
||||
self.computingChanged.emit()
|
||||
|
||||
@Slot()
|
||||
def stopExecution(self):
|
||||
if not self.computing:
|
||||
return
|
||||
self._graph.stopExecution()
|
||||
self._computeThread.join()
|
||||
self.computingChanged.emit()
|
||||
endNode = self._graph.findNode("Texturing")
|
||||
self._endChunk = endNode.getChunks()[0] # type: graph.NodeChunk
|
||||
endNode.outputMesh.valueChanged.connect(self.updateMeshFile)
|
||||
self._endChunk.statusChanged.connect(self.updateMeshFile)
|
||||
self.updateMeshFile()
|
||||
except KeyError:
|
||||
self._endChunk = None
|
||||
|
||||
@staticmethod
|
||||
def runAsync(func, args=(), kwargs=None):
|
||||
|
|
@ -162,13 +53,17 @@ class Reconstruction(QObject):
|
|||
thread.start()
|
||||
return thread
|
||||
|
||||
undoStack = Property(QObject, lambda self: self._undoStack, constant=True)
|
||||
graphChanged = Signal()
|
||||
graph = Property(graph.Graph, lambda self: self._graph, notify=graphChanged)
|
||||
computingChanged = Signal()
|
||||
computing = Property(bool, lambda self: self._computeThread.is_alive(), notify=computingChanged)
|
||||
filepathChanged = Signal()
|
||||
filepath = Property(str, lambda self: self._filepath, notify=filepathChanged)
|
||||
def updateMeshFile(self):
|
||||
if self._endChunk and self._endChunk.status.status == graph.Status.SUCCESS:
|
||||
self.setMeshFile(self._endChunk.node.outputMesh.value)
|
||||
else:
|
||||
self.setMeshFile('')
|
||||
|
||||
def setMeshFile(self, mf):
|
||||
if self._meshFile == mf:
|
||||
return
|
||||
self._meshFile = mf
|
||||
self.meshFileChanged.emit()
|
||||
|
||||
@Slot(QObject)
|
||||
def handleFilesDrop(self, drop):
|
||||
|
|
@ -217,8 +112,13 @@ class Reconstruction(QObject):
|
|||
self.setAttribute(cameraInit.viewpoints, views)
|
||||
self.setAttribute(cameraInit.intrinsics, intrinsics)
|
||||
|
||||
intrinsicsBuilt = Signal(list, list)
|
||||
def isBuildingIntrinsics(self):
|
||||
""" Whether intrinsics are being built """
|
||||
return self._buildIntrinsicsThread and self._buildIntrinsicsThread.isAlive()
|
||||
|
||||
intrinsicsBuilt = Signal(list, list)
|
||||
buildingIntrinsicsChanged = Signal()
|
||||
buildingIntrinsics = Property(bool, lambda self: self._buildIntrinsicsThread and self._buildIntrinsicsThread.isAlive(),
|
||||
notify=buildingIntrinsicsChanged)
|
||||
buildingIntrinsics = Property(bool, isBuildingIntrinsics, notify=buildingIntrinsicsChanged)
|
||||
meshFileChanged = Signal()
|
||||
meshFile = Property(str, lambda self: self._meshFile, notify=meshFileChanged)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue