[ui] TO SQUASH add new patterns to load images in viewer2D

alicevision · Apr 17, 2023 · 6072542 · 6072542
1 parent 0a1f049
commit 6072542
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/meshroom/ui/components/filepath.py b/meshroom/ui/components/filepath.py
@@ -53,7 +53,7 @@ def extension(self, path):
     @Slot(QUrl, result=str)
     def removeExtension(self, path):
         """ Returns the pathname without its extension (.ext)"""
-        return os.path.splitext(path)[0]
+        return os.path.splitext(self.asStr(path))[0]
 
     @Slot(str, result=bool)
     @Slot(QUrl, result=bool)

diff --git a/meshroom/ui/qml/Viewer/Viewer2D.qml b/meshroom/ui/qml/Viewer/Viewer2D.qml
@@ -224,11 +224,11 @@ FocusScope {
 
         var viewId = -1;
         var intrinsicId = -1;
-        var fileName = -1;
+        var fileName = "";
         if (_reconstruction) {
             viewId = _reconstruction.selectedViewId;
             intrinsicId = getViewpointAttribute("intrinsicId", viewId);
-            fileName = Filepath.removeExtension(Filepath.basename(Filepath.stringToUrl(getViewpointAttribute("path",viewId))));
+            fileName = Filepath.removeExtension(Filepath.basename(getViewpointAttribute("path",viewId)));
         }
         var patterns = {"<VIEW_ID>": viewId,"<INTRINSIC_ID>": intrinsicId, "<FILENAME>": fileName}
         return getFileAttributePath(displayedNode, outputAttribute.name,patterns);
@@ -262,7 +262,7 @@ FocusScope {
                 return vp.childAttribute(attributeName).value;
             }
         }
-        return "";
+        return undefined;
     }
 
     function getViewpointMetadata(viewId) {