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

[Panorama Viewer] Use msfmData from PanoramaViewer (WIP)

Browse source
This commit is contained in:
Thomas Zorroche 2021-07-23 17:00:21 +02:00 • committed by Fabien Castan
parent b6be11f39f
commit 223a389748
3 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,11 +15,6 @@ AliceVision.FloatImageViewer {
height: textureSize.height height: textureSize.height
visible: (status === Image.Ready) visible: (status === Image.Ready)
property var sfmData
onSfmDataChanged: {
root.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

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

@ -196,12 +196,6 @@ AliceVision.PanoramaViewer {
} }
} }
function updateSfmPath() {
var activeNode = _reconstruction.activeNodes.get('SfMTransform').node;
root.sfmPath = (activeNode) ? activeNode.attribute("input").value : "";
}
property var pathList : [] property var pathList : []
property var idList : [] property var idList : []
property int imagesLoaded: 0 property int imagesLoaded: 0
@ -209,6 +203,7 @@ AliceVision.PanoramaViewer {
function loadRepeaterImages(index) function loadRepeaterImages(index)
{ {
console.warn("LOAD IMG " + index)
if (index < repeater.model) if (index < repeater.model)
repeater.itemAt(index).loadItem(); repeater.itemAt(index).loadItem();
else else
@ -265,7 +260,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 }), 'surface.msfmData': Qt.binding(function() { return root.msfmData }),
'sfmRequired': true, 'sfmRequired': true,
'canBeHovered': true 'canBeHovered': true
}) })
@ -285,6 +280,7 @@ AliceVision.PanoramaViewer {
onImagesDataChanged: { onImagesDataChanged: {
root.imagesLoaded = 0; root.imagesLoaded = 0;
// Retrieve downscale value from C++ // Retrieve downscale value from C++
panoramaViewerToolbar.updateDownscaleValue(root.downscale) panoramaViewerToolbar.updateDownscaleValue(root.downscale)

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

@ -284,7 +284,7 @@ FocusScope {
'surface.subdivisions' : Qt.binding(function(){ return root.useFloatImageViewer ? 1 : lensDistortionImageToolbar.subdivisionsValue;}), 'surface.subdivisions' : Qt.binding(function(){ return root.useFloatImageViewer ? 1 : lensDistortionImageToolbar.subdivisionsValue;}),
'viewerTypeString': Qt.binding(function(){ return displayLensDistortionViewer.checked ? "distortion" : "hdr";}), 'viewerTypeString': Qt.binding(function(){ return displayLensDistortionViewer.checked ? "distortion" : "hdr";}),
'sfmRequired': Qt.binding(function(){ return displayLensDistortionViewer.checked ? true : false;}), 'sfmRequired': Qt.binding(function(){ return displayLensDistortionViewer.checked ? true : false;}),
'sfmData': Qt.binding(function() { return (msfmDataLoader.status === Loader.Ready && msfmDataLoader.item.status === 2) ? msfmDataLoader.item : null; }), 'msfmData': Qt.binding(function() { return (msfmDataLoader.status === Loader.Ready && msfmDataLoader.item.status === 2) ? msfmDataLoader.item : null; }),
'canBeHovered': false 'canBeHovered': false
}) })
} else { } else {
@ -311,7 +311,7 @@ FocusScope {
'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 'msfmData': Qt.binding(function() { return (msfmDataLoader.status === Loader.Ready
&& msfmDataLoader.item.status === 2) ? msfmDataLoader.item : null; }), && msfmDataLoader.item.status === 2) ? msfmDataLoader.item : null; }),
}) })
} else { } else {
@ -320,9 +320,6 @@ FocusScope {
displayPanoramaViewer.checked = false; displayPanoramaViewer.checked = false;
} }
} }
onLoaded: {
panoramaViewerLoader.item.updateSfmPath();
}
} }
// Simple QML Image Viewer (using Qt or qtOIIO to load images) // Simple QML Image Viewer (using Qt or qtOIIO to load images)