From 0fc1c2f6251e3181e50c69bea81801ad70cb6548 Mon Sep 17 00:00:00 2001 From: Aurore LAFAURIE Date: Mon, 3 Jun 2024 15:28:23 +0200 Subject: [PATCH 1/3] [core] Fix assign file date when saving file When saving file we need to assign the new file date to prevent modified file popup --- meshroom/core/graph.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meshroom/core/graph.py b/meshroom/core/graph.py index 2f0bc3f9..b720ff8a 100644 --- a/meshroom/core/graph.py +++ b/meshroom/core/graph.py @@ -1320,6 +1320,9 @@ class Graph(BaseObject): if path != self._filepath and setupProjectFile: self._setFilepath(path) + # update the file date version + self._fileDateVersion = os.path.getmtime(path) + def getNonDefaultInputAttributes(self): """ Instead of getting all the inputs and internal attribute keys, only get the keys of From 569c94c6a7d635ba382803e80162b681a4d0eb84 Mon Sep 17 00:00:00 2001 From: Aurore LAFAURIE Date: Mon, 3 Jun 2024 15:33:16 +0200 Subject: [PATCH 2/3] [nodes] Fix ImageProcessing node to --- meshroom/nodes/aliceVision/ImageProcessing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshroom/nodes/aliceVision/ImageProcessing.py b/meshroom/nodes/aliceVision/ImageProcessing.py index aa439daa..62b07467 100644 --- a/meshroom/nodes/aliceVision/ImageProcessing.py +++ b/meshroom/nodes/aliceVision/ImageProcessing.py @@ -12,7 +12,7 @@ def outputImagesValueFunct(attr): outputExt = ('.' + attr.node.extension.value) if attr.node.extension.value else None if inputExt in ['.abc', '.sfm']: - fileStem = '' if attr.node.keepImageFilename.value else '' + fileStem = '' if attr.node.keepImageFilename.value else '' # If we have an SfM in input return desc.Node.internalFolder + fileStem + (outputExt or '.*') From 82dbad16324f6f45930b588cd6ce3b27f9601e1a Mon Sep 17 00:00:00 2001 From: Aurore LAFAURIE Date: Mon, 3 Jun 2024 15:36:55 +0200 Subject: [PATCH 3/3] [ui] Add replacement --- meshroom/ui/components/filepath.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meshroom/ui/components/filepath.py b/meshroom/ui/components/filepath.py index 0db0bb8e..610fce5f 100644 --- a/meshroom/ui/components/filepath.py +++ b/meshroom/ui/components/filepath.py @@ -110,6 +110,7 @@ class FilepathHelper(QObject): "": vp.childAttribute("path").value, "": FilepathHelper.basename(FilepathHelper, vp.childAttribute("path").value), "": FilepathHelper.removeExtension(FilepathHelper, FilepathHelper.basename(FilepathHelper, vp.childAttribute("path").value)), + "": FilepathHelper.extension(FilepathHelper, vp.childAttribute("path").value), } resolved = path