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

Merge branch 'develop' of github.com:alicevision/meshroom into dev/nodesAndTaskManager

Browse source 
Conflicts:
	meshroom/core/graph.py
	meshroom/ui/qml/main.qml
This commit is contained in:
Fabien Castan 2020-12-01 20:02:43 +01:00
commit 1102ce84e0
61 changed files with 1241 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

14
meshroom/ui/reconstruction.py
View file

@ -111,7 +111,7 @@ class LiveSfmManager(QObject):
to include those images to the reconstruction.
"""
# Get all new images in the watched folder
imagesInFolder = multiview.findFilesByTypeInFolder(self._folder)
imagesInFolder = multiview.findFilesByTypeInFolder(self._folder).images
newImages = set(imagesInFolder).difference(self.allImages)
for imagePath in newImages:
# print('[LiveSfmManager] New image file : {}'.format(imagePath))
@ -484,12 +484,12 @@ class Reconstruction(UIGraph):
if p.lower() == "photogrammetry":
# default photogrammetry pipeline
self.setGraph(multiview.photogrammetry())
elif p.lower() == "hdri":
# default hdri pipeline
self.setGraph(multiview.hdri())
elif p.lower() == "hdrifisheye":
# default hdri pipeline
self.setGraph(multiview.hdriFisheye())
elif p.lower() == "panoramahdr":
# default panorama hdr pipeline
self.setGraph(multiview.panoramaHdr())
elif p.lower() == "panoramafisheyehdr":
# default panorama fisheye hdr pipeline
self.setGraph(multiview.panoramaFisheyeHdr())
else:
# use the user-provided default photogrammetry project file
self.load(p, setupProjectFile=False)