Skip to content

Commit

Permalink
Merge pull request #2133 from alicevision/mug/panoDownscales
Browse files Browse the repository at this point in the history
[nodes] new exportLevels option in PanoramaPostProcessing
  • Loading branch information
cbentejac authored Jul 31, 2023
2 parents 24b60b3 + 0136c93 commit e8f1c03
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 27 deletions.
17 changes: 16 additions & 1 deletion meshroom/nodes/aliceVision/PanoramaPostProcessing.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.0"
__version__ = "2.0"

import json
import os
Expand Down Expand Up @@ -31,6 +31,21 @@ class PanoramaPostProcessing(desc.CommandLineNode):
value=False,
uid=[0],
),
desc.BoolParam(
name="exportLevels",
label="Export Downscaled Levels",
description="Export downscaled panorama levels.",
value=False,
uid=[0],
),
desc.IntParam(
name="lastLevelMaxSize",
label="Last Level Max Size",
description="Maximum width of smallest downscaled panorama level.",
value=3840,
range=(1, 100000),
uid=[0],
),
desc.IntParam(
name="previewSize",
label="Panorama Preview Width",
Expand Down
27 changes: 14 additions & 13 deletions meshroom/pipelines/panoramaFisheyeHdr.mg
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
"header": {
"nodesVersions": {
"SfMTransform": "3.1",
"FeatureExtraction": "1.3",
"LdrToHdrSampling": "4.0",
"PanoramaPostProcessing": "1.0",
"PanoramaMerging": "1.0",
"FeatureMatching": "2.0",
"Publish": "1.3",
"PanoramaPrepareImages": "1.1",
"PanoramaEstimation": "1.0",
"ImageMatching": "2.0",
"PanoramaWarping": "1.1",
"PanoramaInit": "2.0",
"PanoramaMerging": "1.0",
"PanoramaCompositing": "2.0",
"ImageMatching": "2.0",
"LdrToHdrCalibration": "3.0",
"PanoramaSeams": "2.0",
"LdrToHdrSampling": "4.0",
"PanoramaPrepareImages": "1.1",
"FeatureMatching": "2.0",
"LdrToHdrMerge": "4.1",
"PanoramaPostProcessing": "2.0",
"CameraInit": "9.0",
"LdrToHdrMerge": "4.1"
"LdrToHdrCalibration": "3.0",
"Publish": "1.3",
"PanoramaInit": "2.0",
"FeatureExtraction": "1.3",
"PanoramaSeams": "2.0"
},
"releaseVersion": "2023.3.0-develop",
"fileVersion": "1.1",
Expand Down Expand Up @@ -156,7 +156,8 @@
],
"inputs": {
"inputPanorama": "{PanoramaMerging_1.outputPanorama}",
"fillHoles": true
"fillHoles": true,
"exportLevels": true
}
},
"PanoramaPrepareImages_1": {
Expand Down
27 changes: 14 additions & 13 deletions meshroom/pipelines/panoramaHdr.mg
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
"header": {
"nodesVersions": {
"SfMTransform": "3.1",
"FeatureExtraction": "1.3",
"LdrToHdrSampling": "4.0",
"PanoramaPostProcessing": "1.0",
"PanoramaMerging": "1.0",
"FeatureMatching": "2.0",
"Publish": "1.3",
"PanoramaPrepareImages": "1.1",
"PanoramaEstimation": "1.0",
"ImageMatching": "2.0",
"PanoramaWarping": "1.1",
"PanoramaInit": "2.0",
"PanoramaMerging": "1.0",
"PanoramaCompositing": "2.0",
"ImageMatching": "2.0",
"LdrToHdrCalibration": "3.0",
"PanoramaSeams": "2.0",
"LdrToHdrSampling": "4.0",
"PanoramaPrepareImages": "1.1",
"FeatureMatching": "2.0",
"LdrToHdrMerge": "4.1",
"PanoramaPostProcessing": "2.0",
"CameraInit": "9.0",
"LdrToHdrMerge": "4.1"
"LdrToHdrCalibration": "3.0",
"Publish": "1.3",
"PanoramaInit": "2.0",
"FeatureExtraction": "1.3",
"PanoramaSeams": "2.0"
},
"releaseVersion": "2023.3.0-develop",
"fileVersion": "1.1",
Expand Down Expand Up @@ -151,7 +151,8 @@
],
"inputs": {
"inputPanorama": "{PanoramaMerging_1.outputPanorama}",
"fillHoles": true
"fillHoles": true,
"exportLevels": true
}
},
"PanoramaPrepareImages_1": {
Expand Down

0 comments on commit e8f1c03

Please sign in to comment.