3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-03 16:58:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2282 from alicevision/fix/crfGraph

Browse source 
Use the correct response file to display the graph of the Camera Response Function
This commit is contained in:
Candice Bentéjac 2024-01-03 11:36:45 +01:00 • committed by GitHub
commit 0d24c1eabf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meshroom/nodes/aliceVision/LdrToHdrCalibration.py
View file

@ -1,4 +1,4 @@
__version__ = "3.0"
__version__ = "3.1"
import json
import math
@ -161,7 +161,7 @@ Calibrate LDR to HDR response curve from samples.
name="response",
label="Response File",
description="Path to the output response file.",
value=desc.Node.internalFolder + "response.csv",
value=desc.Node.internalFolder + "response_<INTRINSIC_ID>.csv",
uid=[],
)
]

6
meshroom/pipelines/hdrFusion.mg
View file

@ -3,11 +3,11 @@
"nodesVersions": {
"CameraInit": "9.0",
"LdrToHdrMerge": "4.1",
"LdrToHdrCalibration": "3.0",
"LdrToHdrCalibration": "3.1",
"LdrToHdrSampling": "4.0",
"Publish": "1.3"
},
"releaseVersion": "2023.3.0",
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true
},
@ -85,4 +85,4 @@
}
}
}
}
}

6
meshroom/pipelines/panoramaFisheyeHdr.mg
View file

@ -9,7 +9,7 @@
"PanoramaPostProcessing": "2.0",
"SfMTransform": "3.1",
"PanoramaWarping": "1.1",
"LdrToHdrCalibration": "3.0",
"LdrToHdrCalibration": "3.1",
"LdrToHdrSampling": "4.0",
"PanoramaCompositing": "2.0",
"Publish": "1.3",
@ -19,7 +19,7 @@
"ImageMatching": "2.0",
"PanoramaEstimation": "1.0"
},
"releaseVersion": "2023.3.0",
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true
},
@ -245,4 +245,4 @@
}
}
}
}
}

6
meshroom/pipelines/panoramaHdr.mg
View file

@ -9,7 +9,7 @@
"PanoramaPostProcessing": "2.0",
"SfMTransform": "3.1",
"PanoramaWarping": "1.1",
"LdrToHdrCalibration": "3.0",
"LdrToHdrCalibration": "3.1",
"LdrToHdrSampling": "4.0",
"PanoramaCompositing": "2.0",
"Publish": "1.3",
@ -19,7 +19,7 @@
"ImageMatching": "2.0",
"PanoramaEstimation": "1.0"
},
"releaseVersion": "2023.3.0",
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true
},
@ -240,4 +240,4 @@
}
}
}
}
}

5
meshroom/ui/qml/Viewer/CameraResponseGraph.qml
View file

@ -14,7 +14,7 @@ import DataObjects 1.0
FloatingPane {
id: root
property var ldrHdrCalibrationNode: null
property var responsePath: null
property color textColor: Colors.sysPalette.text
clip: true
@ -22,8 +22,7 @@ FloatingPane {
CsvData {
id: csvData
property bool hasAttr: (ldrHdrCalibrationNode && ldrHdrCalibrationNode.hasAttribute("response"))
filepath: hasAttr ? ldrHdrCalibrationNode.attribute("response").value : ""
filepath: responsePath
}
// To avoid interaction with components in background

11
meshroom/ui/qml/Viewer/Viewer2D.qml
View file

@ -1022,14 +1022,13 @@ FocusScope {
property var activeNode: _reconstruction ? _reconstruction.activeNodes.get('LdrToHdrCalibration').node : null
property var isEnabled: displayLdrHdrCalibrationGraph.checked && activeNode && activeNode.isComputed
// active: isEnabled
// Setting "active" from true to false creates a crash on linux with Qt 5.14.2.
// As a workaround, we clear the CameraResponseGraph with an empty node
// and hide the loader content.
visible: isEnabled
active: isEnabled
property var path: activeNode && activeNode.hasAttribute("response") ? activeNode.attribute("response").value : ""
property var vp: _reconstruction ? getViewpoint(_reconstruction.selectedViewId) : null
sourceComponent: CameraResponseGraph {
ldrHdrCalibrationNode: isEnabled ? activeNode : null
responsePath: resolve(path, vp)
}
}
}