3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-06 10:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

[wip] Change sfmData handling in panorama viewer

Browse source
This commit is contained in:
Landrodie 2021-07-13 11:22:54 +02:00 • committed by Fabien Castan
parent 20b208454d
commit 2635e51f67
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meshroom/ui/qml/Viewer/FloatImage.qml
View file

@ -15,6 +15,10 @@ AliceVision.FloatImageViewer {
height: textureSize.height height: textureSize.height
visible: (status === Image.Ready) visible: (status === Image.Ready)
property var sfmData
surface.msfmData : sfmData
// paintedWidth / paintedHeight / status for compatibility with standard Image // paintedWidth / paintedHeight / status for compatibility with standard Image
property int paintedWidth: textureSize.width property int paintedWidth: textureSize.width
property int paintedHeight: textureSize.height property int paintedHeight: textureSize.height

3
meshroom/ui/qml/Viewer/PanoramaViewer.qml
View file

@ -40,6 +40,8 @@ AliceVision.PanoramaViewer {
property int mouseMultiplier: 1 property int mouseMultiplier: 1
property var sfmData: null
onIsHighlightableChanged:{ onIsHighlightableChanged:{
for (var i = 0; i < repeater.model; i++) { for (var i = 0; i < repeater.model; i++) {
repeater.itemAt(i).item.onChangedHighlightState(isHighlightable); repeater.itemAt(i).item.onChangedHighlightState(isHighlightable);
@ -248,6 +250,7 @@ AliceVision.PanoramaViewer {
'channelModeString': Qt.binding(function() { return hdrImageToolbar.channelModeValue; }), 'channelModeString': Qt.binding(function() { return hdrImageToolbar.channelModeValue; }),
'downscaleLevel' : Qt.binding(function() { return downscale; }), 'downscaleLevel' : Qt.binding(function() { return downscale; }),
'source': Qt.binding(function() { return cSource; }), 'source': Qt.binding(function() { return cSource; }),
'sfmData': Qt.binding(function() { return sfmData }),
'sfmRequired': true, 'sfmRequired': true,
'canBeHovered': true 'canBeHovered': true
}) })

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

@ -309,7 +309,8 @@ FocusScope {
'isEditable': Qt.binding(function(){ return panoramaViewerToolbar.enableEdit;}), 'isEditable': Qt.binding(function(){ return panoramaViewerToolbar.enableEdit;}),
'isHighlightable': Qt.binding(function(){ return panoramaViewerToolbar.enableHover;}), 'isHighlightable': Qt.binding(function(){ return panoramaViewerToolbar.enableHover;}),
'displayGridPano': Qt.binding(function(){ return panoramaViewerToolbar.displayGrid;}), 'displayGridPano': Qt.binding(function(){ return panoramaViewerToolbar.displayGrid;}),
'mouseMultiplier': Qt.binding(function(){ return panoramaViewerToolbar.mouseSpeed;}) 'mouseMultiplier': Qt.binding(function(){ return panoramaViewerToolbar.mouseSpeed;}),
'sfmData': Qt.binding(function() { return msfmDataLoader.status === Loader.Ready ? msfmDataLoader.item : null; }),
}) })
} else { } else {
// Force the unload (instead of using Component.onCompleted to load it once and for all) is necessary since Qt 5.14 // Force the unload (instead of using Component.onCompleted to load it once and for all) is necessary since Qt 5.14
@ -640,7 +641,7 @@ FocusScope {
Loader { Loader {
id: mtracksLoader id: mtracksLoader
property bool isUsed: displayFeatures.checked || displaySfmStatsView.checked || displaySfmDataGlobalStats.checked property bool isUsed: displayFeatures.checked || displaySfmStatsView.checked || displaySfmDataGlobalStats.checked || displayPanoramaViewer.checked
property var activeNode: root.aliceVisionPluginAvailable ? _reconstruction.activeNodes.get('FeatureMatching').node : null property var activeNode: root.aliceVisionPluginAvailable ? _reconstruction.activeNodes.get('FeatureMatching').node : null
property bool isComputed: activeNode && activeNode.isComputed property bool isComputed: activeNode && activeNode.isComputed