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

Merge pull request #2419 from alicevision/fix/variousFixes

Browse source 
[fix] Various fixes
This commit is contained in:
Fabien Castan 2024-06-06 00:00:59 +02:00 • committed by GitHub
commit 859a1bee1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meshroom/core/graph.py
View file

@ -1320,6 +1320,9 @@ class Graph(BaseObject):
if path != self._filepath and setupProjectFile: if path != self._filepath and setupProjectFile:
self._setFilepath(path) self._setFilepath(path)
# update the file date version
self._fileDateVersion = os.path.getmtime(path)
def getNonDefaultInputAttributes(self): def getNonDefaultInputAttributes(self):
""" """
Instead of getting all the inputs and internal attribute keys, only get the keys of Instead of getting all the inputs and internal attribute keys, only get the keys of

2
meshroom/nodes/aliceVision/ImageProcessing.py
View file

@ -12,7 +12,7 @@ def outputImagesValueFunct(attr):
outputExt = ('.' + attr.node.extension.value) if attr.node.extension.value else None outputExt = ('.' + attr.node.extension.value) if attr.node.extension.value else None
if inputExt in ['.abc', '.sfm']: if inputExt in ['.abc', '.sfm']:
fileStem = '<FILENAME>' if attr.node.keepImageFilename.value else '<VIEW_ID>' fileStem = '<FILESTEM>' if attr.node.keepImageFilename.value else '<VIEW_ID>'
# If we have an SfM in input # If we have an SfM in input
return desc.Node.internalFolder + fileStem + (outputExt or '.*') return desc.Node.internalFolder + fileStem + (outputExt or '.*')

1
meshroom/ui/components/filepath.py
View file

@ -110,6 +110,7 @@ class FilepathHelper(QObject):
"<PATH>": vp.childAttribute("path").value, "<PATH>": vp.childAttribute("path").value,
"<FILENAME>": FilepathHelper.basename(FilepathHelper, vp.childAttribute("path").value), "<FILENAME>": FilepathHelper.basename(FilepathHelper, vp.childAttribute("path").value),
"<FILESTEM>": FilepathHelper.removeExtension(FilepathHelper, FilepathHelper.basename(FilepathHelper, vp.childAttribute("path").value)), "<FILESTEM>": FilepathHelper.removeExtension(FilepathHelper, FilepathHelper.basename(FilepathHelper, vp.childAttribute("path").value)),
"<EXTENSION>": FilepathHelper.extension(FilepathHelper, vp.childAttribute("path").value),
} }
resolved = path resolved = path