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

[PanoramaViewer] fix loader problem

Browse source
This commit is contained in:
Landrodie 2021-01-20 15:23:03 +01:00 • committed by Fabien Castan
parent 44b25e00d7
commit e134ad8308
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,6 @@ AliceVision.PanoramaViewer {
(root.sourceSize.width <= 0)) (root.sourceSize.width <= 0))
return Image.Null; return Image.Null;
root.defaultControlPoints(); root.defaultControlPoints();
console.warn("Panorama is ready")
return Image.Ready; return Image.Ready;
} }

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

@ -251,7 +251,7 @@ FocusScope {
if(active) { if(active) {
setSource("PanoramaViewer.qml", { setSource("PanoramaViewer.qml", {
'source': Qt.binding(function() { return getImageFile(imageType.type); }), 'source': Qt.binding(function() { return getImageFile(imageType.type); }),
'channelModeString': Qt.binding(function() { return lensDistortionImageToolbar.channelModeValue; }), }) })
} 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
setSource("", {}) setSource("", {})
@ -262,7 +262,7 @@ FocusScope {
// Simple QML Image Viewer (using Qt or qtOIIO to load images) // Simple QML Image Viewer (using Qt or qtOIIO to load images)
Loader { Loader {
id: qtImageViewerLoader id: qtImageViewerLoader
active: !floatImageViewerLoader.active active: !floatImageViewerLoader.active && !panoramaViewerLoader.active
anchors.centerIn: parent anchors.centerIn: parent
sourceComponent: Image { sourceComponent: Image {
id: qtImageViewer id: qtImageViewer
@ -296,9 +296,10 @@ FocusScope {
property var image: { property var image: {
//qtImageViewerLoader.active ? qtImageViewerLoader.item : floatImageViewerLoader.item
if (floatImageViewerLoader.active) if (floatImageViewerLoader.active)
floatImageViewerLoader.item floatImageViewerLoader.item
else if (panoramaViewerLoader.active)
panoramaViewerLoader.item
else else
qtImageViewerLoader.item qtImageViewerLoader.item
} }