Support Map plugin for Qt 6.5.

CMakeLists.txt

@@ -593,7 +593,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Qt requirements
 # See: https://doc-snapshots.qt.io/qt6-dev/cmake-qt5-and-qt6-compatibility.html
 if(ENABLE_QT6)
-    # Qt6 doesn't currently support Location
     find_package(Qt6
                    COMPONENTS
                      Core
@@ -657,7 +656,8 @@ if (BUILD_GUI)
                             WebEngineQuick
                             WebEngineCore
                             WebEngineWidgets
-                            TextToSpeech)
+                            TextToSpeech
+                            Location)
         else()
             find_package(Qt5
                            REQUIRED COMPONENTS
@@ -947,6 +947,7 @@ if (BUILD_GUI)
           ${OPENGL_LIBRARIES}
           Qt::Widgets
           Qt::Multimedia
+          Qt::Quick
           sdrbase
           sdrgui
           logging

app/main.cpp

@@ -29,6 +29,9 @@
 #ifdef ANDROID
 #include "util/android.h"
 #endif
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
+#include <QQuickWindow>
+#endif
 
 #include "loggerwithfile.h"
 #include "mainwindow.h"
@@ -52,6 +55,14 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) && (QT_VERSION <= QT_VERSION_CHECK(6, 0, 0))
     QApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
 #endif
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
+    // Only use OpenGL, to easily combine QOpenGLWidget, QQuickWidget and QWebEngine
+    // in a single window
+    // See https://www.qt.io/blog/qt-quick-and-widgets-qt-6.4-edition
+    // This prevents Direct3D/Vulcan being used on Windows/Mac though for QQuickWidget
+    // and QWebEngine, so possibly should be reviewed in the future
+    QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
+#endif
 #ifndef ANDROID
      QApplication::setAttribute(Qt::AA_DontUseNativeDialogs); // Don't use on Android, otherwise we can't access files on internal storage
 #endif

plugins/feature/map/CMakeLists.txt

@@ -22,11 +22,13 @@ set(map_HEADERS
     webserver.h
 )
 
-if(Qt${QT_DEFAULT_MAJOR_VERSION}WebEngine_FOUND)
+# WebEngine on Qt5, WebEngineCore on Qt6
+if(Qt${QT_DEFAULT_MAJOR_VERSION}WebEngine_FOUND OR Qt${QT_DEFAULT_MAJOR_VERSION}WebEngineCore_FOUND)
     add_compile_definitions(QT_WEBENGINE_FOUND)
     configure_file(mapguiwebengine.ui mapgui.ui)
 else()
     configure_file(mapguinowebengine.ui mapgui.ui)
+    message(STATUS "Not building 3D map (Qt${QT_DEFAULT_MAJOR_VERSION}WebEngine_FOUND=${Qt${QT_DEFAULT_MAJOR_VERSION}WebEngine_FOUND} Qt${QT_DEFAULT_MAJOR_VERSION}WebEngineCore_FOUND=${Qt${QT_DEFAULT_MAJOR_VERSION}WebEngineCore_FOUND})")
 endif()
 set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -84,7 +86,9 @@ if(NOT SERVER_MODE)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 
-    if(Qt${QT_DEFAULT_MAJOR_VERSION}WebEngine_FOUND)
+    if(Qt${QT_DEFAULT_MAJOR_VERSION}WebEngineCore_FOUND)
+        set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::Location Qt::WebEngineCore Qt::WebEngineWidgets)
+    elseif(Qt${QT_DEFAULT_MAJOR_VERSION}WebEngine_FOUND)
         set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::Location Qt::WebEngine Qt::WebEngineCore Qt::WebEngineWidgets)
     else()
         set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::Location)

plugins/feature/map/map.qrc

@@ -1,7 +1,8 @@
 <RCC>
   <qresource prefix="/map/">
     <file>map/map.qml</file>
-    <file>map/map_5_12.qml</file>
+    <file>map/map_6.qml</file>
+    <file>map/ModifiedMapView.qml</file>
     <file>map/antenna.png</file>
     <file>map/antennatime.png</file>
     <file>map/antennadab.png</file>

plugins/feature/map/map/ModifiedMapView.qml

@@ -0,0 +1,178 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+import QtQuick
+import QtLocation as QL
+import QtPositioning as QP
+import Qt.labs.animation
+/*!
+    \qmltype MapView
+    \inqmlmodule QtLocation
+    \brief An interactive map viewer component.
+
+    MapView wraps a Map and adds the typical interactive features:
+    changing the zoom level, panning and tilting the map.
+
+    The implementation is a QML assembly of smaller building blocks that are
+    available separately. In case you want to make changes in your own version
+    of this component, you can copy the QML, which is installed into the
+    \c qml/QtLocation module directory, and modify it as needed.
+
+    \sa Map
+*/
+Item {
+    /*!
+        \qmlproperty Map MapView::map
+
+        This property provides access to the underlying Map instance.
+    */
+    property alias map: map
+
+    /*!
+        \qmlproperty real minimumZoomLevel
+
+        The minimum zoom level according to the size of the view.
+
+        \sa Map::minimumZoomLevel
+    */
+    property real minimumZoomLevel: map.minimumZoomLevel
+
+    /*!
+        \qmlproperty real maximumZoomLevel
+
+        The maximum valid zoom level for the map.
+
+        \sa Map::maximumZoomLevel
+    */
+    property real maximumZoomLevel: map.maximumZoomLevel
+
+    // --------------------------------
+    // implementation
+    id: root
+    Component.onCompleted: map.resetPinchMinMax()
+
+    QL.Map {
+        id: map
+        width: parent.width
+        height: parent.height
+        tilt: tiltHandler.persistentTranslation.y / -5
+        property bool pinchAdjustingZoom: false
+
+        BoundaryRule on zoomLevel {
+            id: br
+            minimum: map.minimumZoomLevel
+            maximum: map.maximumZoomLevel
+        }
+
+        onZoomLevelChanged: {
+            br.returnToBounds();
+            if (!pinchAdjustingZoom) resetPinchMinMax()
+        }
+
+        function resetPinchMinMax() {
+            pinch.persistentScale = 1
+            pinch.scaleAxis.minimum = Math.pow(2, root.minimumZoomLevel - map.zoomLevel + 1)
+            pinch.scaleAxis.maximum = Math.pow(2, root.maximumZoomLevel - map.zoomLevel - 1)
+        }
+
+        PinchHandler {
+            id: pinch
+            target: null
+            property real rawBearing: 0
+            property QP.geoCoordinate startCentroid
+            onActiveChanged: if (active) {
+                flickAnimation.stop()
+                pinch.startCentroid = map.toCoordinate(pinch.centroid.position, false)
+            } else {
+                flickAnimation.restart(centroid.velocity)
+                map.resetPinchMinMax()
+            }
+            onScaleChanged: (delta) => {
+                map.pinchAdjustingZoom = true
+                map.zoomLevel += Math.log2(delta)
+                map.alignCoordinateToPoint(pinch.startCentroid, pinch.centroid.position)
+                map.pinchAdjustingZoom = false
+            }
+            onRotationChanged: (delta) => {
+                pinch.rawBearing -= delta
+                // snap to 0° if we're close enough
+                map.bearing = (Math.abs(pinch.rawBearing) < 5) ? 0 : pinch.rawBearing
+                map.alignCoordinateToPoint(pinch.startCentroid, pinch.centroid.position)
+            }
+            grabPermissions: PointerHandler.TakeOverForbidden
+        }
+        WheelHandler {
+            id: wheel
+            // workaround for QTBUG-87646 / QTBUG-112394 / QTBUG-112432:
+            // Magic Mouse pretends to be a trackpad but doesn't work with PinchHandler
+            // and we don't yet distinguish mice and trackpads on Wayland either
+            acceptedDevices: Qt.platform.pluginName === "cocoa" || Qt.platform.pluginName === "wayland"
+                             ? PointerDevice.Mouse | PointerDevice.TouchPad
+                             : PointerDevice.Mouse
+            onWheel: (event) => {
+                const loc = map.toCoordinate(wheel.point.position)
+                switch (event.modifiers) {
+                    case Qt.NoModifier:
+                        // jonb - Changed to make more like Qt5
+                        //map.zoomLevel += event.angleDelta.y / 120
+                        map.zoomLevel += event.angleDelta.y / 1000
+                        break
+                    case Qt.ShiftModifier:
+                        map.bearing += event.angleDelta.y / 15
+                        break
+                    case Qt.ControlModifier:
+                        map.tilt += event.angleDelta.y / 15
+                        break
+                }
+                map.alignCoordinateToPoint(loc, wheel.point.position)
+            }
+        }
+        DragHandler {
+            id: drag
+            signal flickStarted // for autotests only
+            signal flickEnded
+            target: null
+            onTranslationChanged: (delta) => map.pan(-delta.x, -delta.y)
+            onActiveChanged: if (active) {
+                flickAnimation.stop()
+            } else {
+                flickAnimation.restart(centroid.velocity)
+            }
+        }
+
+        property vector3d animDest
+        onAnimDestChanged: if (flickAnimation.running) {
+            const delta = Qt.vector2d(animDest.x - flickAnimation.animDestLast.x, animDest.y - flickAnimation.animDestLast.y)
+            map.pan(-delta.x, -delta.y)
+            flickAnimation.animDestLast = animDest
+        }
+
+        Vector3dAnimation on animDest {
+            id: flickAnimation
+            property vector3d animDestLast
+            from: Qt.vector3d(0, 0, 0)
+            duration: 500
+            easing.type: Easing.OutQuad
+            onStarted: drag.flickStarted()
+            onStopped: drag.flickEnded()
+
+            function restart(vel) {
+                stop()
+                map.animDest = Qt.vector3d(0, 0, 0)
+                animDestLast = Qt.vector3d(0, 0, 0)
+                to = Qt.vector3d(vel.x / duration * 100, vel.y / duration * 100, 0)
+                start()
+            }
+        }
+
+        DragHandler {
+            id: tiltHandler
+            minimumPointCount: 2
+            maximumPointCount: 2
+            target: null
+            xAxis.enabled: false
+            grabPermissions: PointerHandler.TakeOverForbidden
+            onActiveChanged: if (active) flickAnimation.stop()
+        }
+    }
+}