Merge pull request #2000 from srcejon/freq_scanner

A variety of updates

.appveyor.yml

@@ -84,7 +84,7 @@ for:
             qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
             qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \
             libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \
-            libqt5charts5-dev libqt5texttospeech5-dev libqt5gamepad5-dev libfaad-dev zlib1g-dev \
+            libqt5charts5-dev libqt5texttospeech5-dev libqt5gamepad5-dev libqt5svg5-dev libfaad-dev zlib1g-dev \
             libusb-1.0-0-dev libhidapi-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \
             libxml2-dev bison flex ffmpeg  libpostproc-dev libavcodec-dev libavformat-dev \
             libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \

CMakeLists.txt

@@ -396,6 +396,10 @@ if(VS2019)
   set(LIBSIGMF_LIBRARIES_DEBUG "${EXTERNAL_LIBRARY_FOLDER}/libsigmf/lib/libsigmfd.lib" DbgHelp CACHE INTERNAL "")
   set(LIBSIGMF_DLL_DIR "${EXTERNAL_LIBRARY_FOLDER}/libsigmf/lib/" CACHE INTERNAL "")
 
+  set(LIBACARS_FOUND ON CACHE INTERNAL "")
+  set(LIBACARS_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/libacars/include/libacars-2" CACHE INTERNAL "")
+  set(LIBACARS_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/libacars/lib/acars-2.lib" CACHE INTERNAL "")
+
   # used on fixup_bundle phase
   set(WINDOWS_FIXUP_BUNDLE_LIB_DIRS
     "${EXTERNAL_LIBRARY_FOLDER}/fftw-3"
@@ -654,7 +658,8 @@ if (BUILD_GUI)
                             Quick
                             QuickWidgets
                             TextToSpeech
-                            Svg)
+                            Svg
+                            SvgWidgets)
         else()
             find_package(Qt5
                            REQUIRED COMPONENTS
@@ -677,6 +682,8 @@ if (BUILD_GUI)
                             OpenGLWidgets
                             Quick
                             QuickWidgets
+                            Svg
+                            SvgWidgets
                            OPTIONAL_COMPONENTS
                             WebEngineQuick
                             WebEngineCore
@@ -691,6 +698,7 @@ if (BUILD_GUI)
                             QuickWidgets
                             Location
                             TextToSpeech
+                            Svg
                            OPTIONAL_COMPONENTS
                             WebEngine
                             WebEngineCore

debian/control

@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9),
  libqt5quick5,
  libqt5texttospeech5-dev,
  libqt5gamepad5-dev,
+ libqt5svg5-dev,
  qml-module-qtlocation,
  qml-module-qtpositioning,
  qml-module-qtquick-window2,
@@ -64,6 +65,7 @@ Depends: ${shlibs:Depends},
  libgl1-mesa-glx,
  libqt5multimedia5-plugins,
  libqt5gamepad5,
+ libqt5svg5,
  qtspeech5-speechd-plugin,
  pulseaudio,
  ffmpeg,

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -4875,8 +4875,11 @@ ADSBDemodGUI::ADSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
     ui->map->rootContext()->setContextProperty("airportModel", &m_airportModel);
     ui->map->rootContext()->setContextProperty("airspaceModel", &m_airspaceModel);
     ui->map->rootContext()->setContextProperty("navAidModel", &m_navAidModel);
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     ui->map->setSource(QUrl(QStringLiteral("qrc:/map/map.qml")));
-
+#else
+    ui->map->setSource(QUrl(QStringLiteral("qrc:/map/map_6.qml")));
+#endif
     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
 
     m_adsbDemod = reinterpret_cast<ADSBDemod*>(rxChannel); //new ADSBDemod(m_deviceUISet->m_deviceSourceAPI);

plugins/channelrx/demodadsb/map.qrc

@@ -1,6 +1,8 @@
 <RCC>
   <qresource prefix="/">
     <file>map/map.qml</file>
+    <file>map/map_6.qml</file>
+    <file>map/ModifiedMapView.qml</file>
     <file>map/MapStation.qml</file>
     <file>map/aircraft_2engine.png</file>
     <file>map/aircraft_2enginesmall.png</file>

plugins/channelrx/demodadsb/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()
+        }
+    }
+}