From b98c1e57edb9c0f2b5ca3253fd4c64baabc693ac Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Fri, 20 Mar 2020 17:59:32 +0100 Subject: [PATCH] [ui] Viewer2D: fisheye circle is enabled only when the option is activated --- meshroom/ui/qml/Viewer/Viewer2D.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meshroom/ui/qml/Viewer/Viewer2D.qml b/meshroom/ui/qml/Viewer/Viewer2D.qml index 84236030..23c30772 100644 --- a/meshroom/ui/qml/Viewer/Viewer2D.qml +++ b/meshroom/ui/qml/Viewer/Viewer2D.qml @@ -253,7 +253,8 @@ FocusScope { sourceComponent: CircleGizmo { x: _reconstruction.panoramaInit.attribute("fisheyeCenterOffset.fisheyeCenterOffset_x").value y: _reconstruction.panoramaInit.attribute("fisheyeCenterOffset.fisheyeCenterOffset_y").value - radius: (imgContainer.image ? Math.min(imgContainer.image.width, imgContainer.image.height) : 1.0) * 0.5 * (_reconstruction.panoramaInit.attribute("fisheyeRadius").value * 0.01) + property real fisheyeRadius: _reconstruction.panoramaInit.attribute("fisheyeRadius").value + radius: (imgContainer.image ? Math.min(imgContainer.image.width, imgContainer.image.height) : 1.0) * 0.5 * (fisheyeRadius * 0.01) border.width: Math.max(1, (3.0 / imgContainer.scale)) onMoved: { @@ -411,8 +412,8 @@ FocusScope { Layout.minimumWidth: 0 checkable: true checked: false - enabled: _reconstruction.panoramaInit - visible: enabled + enabled: _reconstruction.panoramaInit && _reconstruction.panoramaInit.attribute("useFisheye").value + visible: _reconstruction.panoramaInit } Label {