Merge pull request #2573 from alicevision/dev/panoramaDisplay

Update panorama display
alicevision · Oct 20, 2024 · 88f9d4b · 88f9d4b
2 parents 1bcfdc1 + ef5130e
commit 88f9d4b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/meshroom/nodes/aliceVision/PanoramaInit.py b/meshroom/nodes/aliceVision/PanoramaInit.py
@@ -142,6 +142,15 @@ class PanoramaInit(desc.AVCommandLineNode):
     ]
 
     outputs = [
+        desc.File(
+            name="contactSheet",
+            label="Contact sheet",
+            semantic="image",
+            description="Contact sheet path.",
+            value=desc.Node.internalFolder + "contactSheetImage.jpg",
+            group="",  # do not export on the command line
+            enabled=lambda node: node.buildContactSheet.enabled
+        ),
         desc.File(
             name="outSfMData",
             label="SfMData File",

diff --git a/meshroom/nodes/aliceVision/PanoramaPostProcessing.py b/meshroom/nodes/aliceVision/PanoramaPostProcessing.py
@@ -102,20 +102,20 @@ class PanoramaPostProcessing(desc.CommandLineNode):
     ]
 
     outputs = [
-        desc.File(
-            name="outputPanorama",
-            label="Output Panorama",
-            description="Generated panorama in EXR format.",
-            semantic="image",
-            value=lambda attr: desc.Node.internalFolder + attr.node.panoramaName.value,
-        ),
         desc.File(
             name="outputPanoramaPreview",
             label="Output Panorama Preview",
             description="Preview of the generated panorama in JPG format.",
             semantic="image",
             value=lambda attr: desc.Node.internalFolder + attr.node.previewName.value,
         ),
+        desc.File(
+            name="outputPanorama",
+            label="Output Panorama",
+            description="Generated panorama in EXR format.",
+            semantic="image",
+            value=lambda attr: desc.Node.internalFolder + attr.node.panoramaName.value,
+        ),
         desc.File(
             name="downscaledPanoramaLevels",
             label="Downscaled Panorama Levels",