3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-06 10:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1896 from alicevision/fix/dragDropImages

Browse source 
[ui] Drag&Drop: Use a pool of threads for asynchronous intrinsics computations
This commit is contained in:
Fabien Castan 2023-02-14 21:23:27 +01:00 • committed by GitHub
commit 1fc2b228af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
meshroom/ui/reconstruction.py
View file

@ -3,6 +3,7 @@ import logging
import math import math
import os import os
from collections.abc import Iterable from collections.abc import Iterable
from multiprocessing.pool import ThreadPool
from threading import Thread from threading import Thread
from PySide2.QtCore import QObject, Slot, Property, Signal, QUrl, QSizeF from PySide2.QtCore import QObject, Slot, Property, Signal, QUrl, QSizeF
@ -437,6 +438,8 @@ class Reconstruction(UIGraph):
self._selectedViewpoint = None self._selectedViewpoint = None
self._liveSfmManager = LiveSfmManager(self) self._liveSfmManager = LiveSfmManager(self)
self._workerThreads = ThreadPool(processes=1)
# react to internal graph changes to update those variables # react to internal graph changes to update those variables
self.graphChanged.connect(self.onGraphChanged) self.graphChanged.connect(self.onGraphChanged)
@ -546,12 +549,6 @@ class Reconstruction(UIGraph):
# TODO: listen specifically for cameraInit creation/deletion # TODO: listen specifically for cameraInit creation/deletion
self._graph.nodes.countChanged.connect(self.updateCameraInits) self._graph.nodes.countChanged.connect(self.updateCameraInits)
@staticmethod
def runAsync(func, args=(), kwargs=None):
thread = Thread(target=func, args=args, kwargs=kwargs)
thread.start()
return thread
@Slot(QObject) @Slot(QObject)
def getViewpoints(self): def getViewpoints(self):
""" Return the Viewpoints model. """ """ Return the Viewpoints model. """
@ -705,7 +702,7 @@ class Reconstruction(UIGraph):
""" """
filesByType = self.getFilesByTypeFromDrop(drop) filesByType = self.getFilesByTypeFromDrop(drop)
if filesByType.images: if filesByType.images:
self.importImagesAsync(filesByType.images, cameraInit) self._workerThreads.apply_async(func=self.importImagesSync, args=(filesByType.images, cameraInit,))
if filesByType.videos: if filesByType.videos:
boundingBox = self.layout.boundingBox() boundingBox = self.layout.boundingBox()
keyframeNode = self.addNewNode("KeyframeSelection", position=Position(boundingBox[0], boundingBox[1] + boundingBox[3])) keyframeNode = self.addNewNode("KeyframeSelection", position=Position(boundingBox[0], boundingBox[1] + boundingBox[3]))
@ -795,7 +792,7 @@ class Reconstruction(UIGraph):
logging.debug("importImagesFromFolder: " + str(path)) logging.debug("importImagesFromFolder: " + str(path))
filesByType = multiview.findFilesByTypeInFolder(path, recursive) filesByType = multiview.findFilesByTypeInFolder(path, recursive)
if filesByType.images: if filesByType.images:
self.buildIntrinsics(self.cameraInit, filesByType.images) self._workerThreads.apply_async(func=self.importImagesSync, args=(filesByType.images, self.cameraInit,))
@Slot("QVariant") @Slot("QVariant")
def importImagesUrls(self, imagePaths, recursive=False): def importImagesUrls(self, imagePaths, recursive=False):
@ -810,13 +807,8 @@ class Reconstruction(UIGraph):
paths.append(p) paths.append(p)
self.importImagesFromFolder(paths) self.importImagesFromFolder(paths)
def importImagesAsync(self, images, cameraInit):
""" Add the given list of images to the Reconstruction. """
# Start the process of updating views and intrinsics
logging.debug("Import images: " + str(images))
self.runAsync(self.importImagesSync, args=(images, cameraInit,))
def importImagesSync(self, images, cameraInit): def importImagesSync(self, images, cameraInit):
""" Add the given list of images to the Reconstruction. """
try: try:
self.buildIntrinsics(cameraInit, images) self.buildIntrinsics(cameraInit, images)
except Exception as e: except Exception as e:
@ -885,7 +877,7 @@ class Reconstruction(UIGraph):
Args: Args:
cameraInit (Node): the CameraInit node cameraInit (Node): the CameraInit node
""" """
self.runAsync(self.buildIntrinsics, args=(cameraInit, (), True)) self._workerThreads.apply_async(func=self.buildIntrinsics, args=(cameraInit, (), True,))
def onIntrinsicsAvailable(self, cameraInit, views, intrinsics, rebuild=False): def onIntrinsicsAvailable(self, cameraInit, views, intrinsics, rebuild=False):
""" Update CameraInit with given views and intrinsics. """ """ Update CameraInit with given views and intrinsics. """