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

[ui] remove references to qtOIIO plugin

Browse source
This commit is contained in:
Loïc Vital 2022-11-25 11:38:05 +01:00
parent 1b65283fb0
commit 9931459cdb
2 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +0,0 @@
import DepthMapEntity 2.1
import QtQuick 2.7
/**
* To evaluate if the QtOIIO plugin is available.
* DepthMapEntity is in the same plugin than the imageformats plugin, that we cannot check from qml.
*/
Item {
id: root
}

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

@ -54,21 +54,13 @@ FocusScope {
source: "TestAliceVisionPlugin.qml" source: "TestAliceVisionPlugin.qml"
} }
Loader {
id: oiioPluginLoader
active: true
source: "TestOIIOPlugin.qml"
}
readonly property bool aliceVisionPluginAvailable: aliceVisionPluginLoader.status === Component.Ready readonly property bool aliceVisionPluginAvailable: aliceVisionPluginLoader.status === Component.Ready
readonly property bool oiioPluginAvailable: oiioPluginLoader.status === Component.Ready
Component.onCompleted: { Component.onCompleted: {
if(!aliceVisionPluginAvailable) { if(!aliceVisionPluginAvailable) {
console.warn("Missing plugin qtAliceVision.") console.warn("Missing plugin qtAliceVision.")
displayHDR.checked = false displayHDR.checked = false
} }
if(!oiioPluginAvailable)
console.warn("Missing plugin qtOIIO.")
} }
property string loadingModules: { property string loadingModules: {
@ -471,7 +463,7 @@ FocusScope {
} }
} }
// Simple QML Image Viewer (using Qt or qtOIIO to load images) // Simple QML Image Viewer (using Qt or qtAliceVisionImageIO to load images)
Loader { Loader {
id: qtImageViewerLoader id: qtImageViewerLoader
active: !floatImageViewerLoader.active && !panoramaViewerLoader.active active: !floatImageViewerLoader.active && !panoramaViewerLoader.active
@ -1168,7 +1160,7 @@ FocusScope {
} }
MaterialToolButton { MaterialToolButton {
property var activeNode: root.oiioPluginAvailable && _reconstruction ? _reconstruction.activeNodes.get('allDepthMap').node : null property var activeNode: root.aliceVisionPluginAvailable && _reconstruction ? _reconstruction.activeNodes.get('allDepthMap').node : null
enabled: activeNode enabled: activeNode
ToolTip.text: "View Depth Map in 3D (" + (activeNode ? activeNode.label : "No DepthMap Node Selected") + ")" ToolTip.text: "View Depth Map in 3D (" + (activeNode ? activeNode.label : "No DepthMap Node Selected") + ")"
text: MaterialIcons.input text: MaterialIcons.input