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

[PanoramaViewer] add Panorama Viewer button and loader

Browse source
This commit is contained in:
Landrodie 2021-01-20 14:53:57 +01:00 • committed by Fabien Castan
parent bc1542e946
commit 43d15b16f0
2 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ FocusScope {
property Component panoramaViewerComp: Qt.createComponent("PanoramaViewer.qml")
property alias useFloatImageViewer: displayHDR.checked
property alias useLensDistortionViewer: displayLensDistortionViewer.checked
property alias usePanoramaViewer: displayPanoramaViewer.checked
Loader {
id: aliceVisionPluginLoader
@ -239,6 +240,25 @@ FocusScope {
}
// qtAliceVision Panorama Viewer
Loader {
id: panoramaViewerLoader
active: root.aliceVisionPluginAvailable && root.usePanoramaViewer && !floatImageViewerLoader.active
visible: (panoramaViewerLoader.status === Loader.Ready)
anchors.centerIn: parent
onActiveChanged: {
if(active) {
setSource("PanoramaViewer.qml", {
'source': Qt.binding(function() { return getImageFile(imageType.type); }),
'channelModeString': Qt.binding(function() { return lensDistortionImageToolbar.channelModeValue; }), })
} else {
// Force the unload (instead of using Component.onCompleted to load it once and for all) is necessary since Qt 5.14
setSource("", {})
}
}
}
// Simple QML Image Viewer (using Qt or qtOIIO to load images)
Loader {
id: qtImageViewerLoader
@ -274,6 +294,7 @@ FocusScope {
}
}
property var image: {
//qtImageViewerLoader.active ? qtImageViewerLoader.item : floatImageViewerLoader.item
if (floatImageViewerLoader.active)
@ -670,6 +691,25 @@ FocusScope {
}
}
}
MaterialToolButton {
id: displayPanoramaViewer
// property var activeNode: root.aliceVisionPluginAvailable ? _reconstruction.activeNodes.get('sfm').node : null
// property bool isComputed: activeNode && activeNode.isComputed
ToolTip.text: "Panorama Viewer"
text: MaterialIcons.panorama_wide_angle
font.pointSize: 16
padding: 0
Layout.minimumWidth: 0
checkable: true
checked: false
enabled: root.aliceVisionPluginAvailable
onCheckedChanged : {
// if(displayHDR.checked && checked){
// displayHDR.checked = false;
// }
}
}
MaterialToolButton {
id: displayFeatures
ToolTip.text: "Display Features"