Create dev release candidate

QOpenHD.pro

@@ -102,6 +102,7 @@ LinuxBuild {
 SOURCES += \
     app/logging/hudlogmessagesmodel.cpp \
     app/logging/logmessagesmodel.cpp \
+    app/util/mousehelper.cpp \
     app/util/qopenhd.cpp \
     app/util/WorkaroundMessageBox.cpp \
     app/util/qrenderstats.cpp \
@@ -116,6 +117,7 @@ HEADERS += \
     app/logging/hudlogmessagesmodel.h \
     app/logging/loghelper.h \
     app/logging/logmessagesmodel.h \
+    app/util/mousehelper.h \
     app/util/qopenhd.h \
     app/util/WorkaroundMessageBox.h \
     app/util/qrenderstats.h \
@@ -134,7 +136,6 @@ SOURCES += \
     app/osd/altitudeladder.cpp \
     app/osd/flightpathvector.cpp \
     app/osd/aoagauge.cpp \
-    app/osd/performancehorizonladder.cpp \
 
 HEADERS += \
     app/osd/headingladder.h \
@@ -144,7 +145,6 @@ HEADERS += \
     app/osd/flightpathvector.h \
     app/osd/debug_overdraw.hpp \
     app/osd/aoagauge.h \
-    app/osd/performancehorizonladder.h \
 
 
 RESOURCES += qml/qml.qrc

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.openhd.openhd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="v13" android:versionCode="13" android:installLocation="auto">
+<manifest package="com.openhd.openhd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="v14" android:versionCode="14" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

app/logging/logmessagesmodel.cpp

@@ -7,16 +7,23 @@
 
 #include "hudlogmessagesmodel.h"
 
-LogMessagesModel &LogMessagesModel::instanceOHD()
+
+LogMessagesModel &LogMessagesModel::instanceGround()
+{
+    static LogMessagesModel instance;
+    return instance;
+}
+
+LogMessagesModel &LogMessagesModel::instanceOHDAir()
 {
-    static LogMessagesModel* instance=new LogMessagesModel();
-    return *instance;
+    static LogMessagesModel instance;
+    return instance;
 }
 
 LogMessagesModel &LogMessagesModel::instanceFC()
 {
-    static LogMessagesModel* instance_fc=new LogMessagesModel();
-    return *instance_fc;
+    static LogMessagesModel instance;
+    return instance;
 }
 
 LogMessagesModel::LogMessagesModel(QObject *parent) :

app/logging/logmessagesmodel.h

@@ -17,8 +17,8 @@ class LogMessagesModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    // Instance for all OpenHD air / ground messages
-    static LogMessagesModel& instanceOHD();
+    static LogMessagesModel& instanceGround();
+    static LogMessagesModel& instanceOHDAir();
     // We have a seperate model for the FC log messages
     static LogMessagesModel& instanceFC();
 

app/main.cpp

@@ -26,13 +26,14 @@ const QVector<QString> permissions({"android.permission.INTERNET",
 #include "telemetry/models/rcchannelsmodel.h"
 #include "telemetry/settings/mavlinksettingsmodel.h"
 #include "telemetry/settings/wblinksettingshelper.h"
+#include "telemetry/settings/frequencyhelper.h"
+#include "telemetry/settings/pollutionhelper.h"
 #include "osd/speedladder.h"
 #include "osd/altitudeladder.h"
 #include "osd/headingladder.h"
 #include "osd/horizonladder.h"
 #include "osd/flightpathvector.h"
 #include "osd/aoagauge.h"
-#include "osd/performancehorizonladder.h"
 
 // Video - annyoing ifdef crap is needed for all the different platforms / configurations
 #include "decodingstatistcs.h"
@@ -60,6 +61,7 @@ const QVector<QString> permissions({"android.permission.INTERNET",
 #include "logging/logmessagesmodel.h"
 #include "logging/hudlogmessagesmodel.h"
 #include "util/qopenhd.h"
+#include "util/mousehelper.h"
 #include "util/WorkaroundMessageBox.h"
 #include "util/restartqopenhdmessagebox.h"
 
@@ -169,15 +171,47 @@ static void write_platform_context_properties(QQmlApplicationEngine& engine){
 #endif
 }
 
+static void android_check_permissions(){
+#if defined(__android__)
+    qDebug()<<"Android request permissions";
+    for(const QString &permission : permissions) {
+        auto result = QtAndroid::checkPermission(permission);
+        if (result == QtAndroid::PermissionResult::Denied) {
+            auto resultHash = QtAndroid::requestPermissionsSync(QStringList({permission}));
+            if (resultHash[permission] == QtAndroid::PermissionResult::Denied) {
+                LogMessagesModel::instanceGround().add_message_warn("QOpenHD","Android - missing permissions");
+                return;
+            }
+        }
+    }
+#endif
+}
 
 int main(int argc, char *argv[]) {
 
     QCoreApplication::setOrganizationName("OpenHD");
     QCoreApplication::setOrganizationDomain("openhd");
     QCoreApplication::setApplicationName("QOpenHD");
+    {// Original screen resoluton before setting anything
+        //QApplication a(argc, argv);
+        const auto screen=QGuiApplication::primaryScreen();
+        if(screen){
+            const auto actual_size=screen->size();
+            QRenderStats::instance().set_screen_width_height(actual_size.width(),actual_size.height());
+        }
+        // a is deleted again
+    }
 
     QSettings settings;
-
+    qDebug()<<"Storing settings at ["<<settings.fileName()<<"]";
+    // RPI only - set a smaller default screen scale, for whatever reason thats needed
+    if(QOpenHD::instance().is_platform_rpi()){
+        if(!settings.value("qopenhd_custom_default_screen_has_been_set",false).toBool()){
+            qDebug()<<"Setting initial rpi screen scale";
+            settings.setValue("qopenhd_custom_default_screen_has_been_set",true);
+            settings.setValue("global_scale",0.7);
+        }
+    }
     const int screen_custom_font_dpi = settings.value("screen_custom_font_dpi").toInt();
     if (screen_custom_font_dpi) {
         QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
@@ -187,22 +221,11 @@ int main(int argc, char *argv[]) {
         QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     }
     //QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
-
-    // From https://stackoverflow.com/questions/63473541/how-to-dynamically-toggle-vsync-in-a-qt-application-at-runtime
-    // Get rid of VSYNC if possible. Might / might not work. On my ubuntu nvidia & intel laptop, this at least seems to
-    // result in tripple buffering with unlimited fps, a bit "better" regarding latency than default.
-    if(settings.value("dev_set_swap_interval_zero",false).toBool()){
-        qDebug()<<"Request swap interval of 0";
-        QSurfaceFormat format=QSurfaceFormat::defaultFormat();
-        format.setSwapInterval(0);
-        QSurfaceFormat::setDefaultFormat(format);
-    }
-
+    //QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
     const double global_scale = settings.value("global_scale", 1.0).toDouble();
     const std::string global_scale_s = std::to_string(global_scale);
     QByteArray scaleAsQByteArray(global_scale_s.c_str(), global_scale_s.length());
     qputenv("QT_SCALE_FACTOR", scaleAsQByteArray);
-    qDebug()<<"Storing settings at ["<<settings.fileName()<<"]";
 
     // https://doc.qt.io/qt-6/qtquick-visualcanvas-scenegraph-renderer.html
     //qputenv("QSG_VISUALIZE", "overdraw");
@@ -217,10 +240,18 @@ int main(int argc, char *argv[]) {
     //QLoggingCategory::setFilterRules("qt.qpa.eglfs.*=true");
     //QLoggingCategory::setFilterRules("qt.qpa.egl*=true");
 
+    // From https://stackoverflow.com/questions/63473541/how-to-dynamically-toggle-vsync-in-a-qt-application-at-runtime
+    // Get rid of VSYNC if possible. Might / might not work. On my ubuntu nvidia & intel laptop, this at least seems to
+    // result in tripple buffering with unlimited fps, a bit "better" regarding latency than default.
+    if(settings.value("dev_set_swap_interval_zero",false).toBool()){
+        qDebug()<<"Request swap interval of 0";
+        QSurfaceFormat format=QSurfaceFormat::defaultFormat();
+        format.setSwapInterval(0);
+        QSurfaceFormat::setDefaultFormat(format);
+    }
+
     QApplication app(argc, argv);
-    // Customize cursor if needed
-    QOpenHD::instance().customize_cursor_from_settings();
-    {
+    {  // This includes dpi adjustment
         QScreen* screen=app.primaryScreen();
         if(screen){
             QRenderStats::instance().set_display_width_height(screen->size().width(),screen->size().height());
@@ -234,20 +265,8 @@ int main(int argc, char *argv[]) {
     applePlatform->registerNotifications();
 #endif
 
-  QOpenHD::instance().keep_screen_on(true);
-#if defined(__android__)
-    qDebug()<<"Android request permissions";
-    for(const QString &permission : permissions) {
-        auto result = QtAndroid::checkPermission(permission);
-        if (result == QtAndroid::PermissionResult::Denied) {
-            auto resultHash = QtAndroid::requestPermissionsSync(QStringList({permission}));
-            if (resultHash[permission] == QtAndroid::PermissionResult::Denied) {
-                return 0;
-            }
-        }
-    }
-#endif
-
+    QOpenHD::instance().keep_screen_on(true);
+    android_check_permissions();
     load_fonts();
 
     qmlRegisterType<SpeedLadder>("OpenHD", 1, 0, "SpeedLadder");
@@ -256,8 +275,6 @@ int main(int argc, char *argv[]) {
     qmlRegisterType<HorizonLadder>("OpenHD", 1, 0, "HorizonLadder");
     qmlRegisterType<FlightPathVector>("OpenHD", 1, 0, "FlightPathVector");
     qmlRegisterType<AoaGauge>("OpenHD", 1, 0, "AoaGauge");
-    qmlRegisterType<PerformanceHorizonLadder>("OpenHD", 1, 0, "PerformanceHorizonLadder");
-
 
     QQmlApplicationEngine engine;
     engine.rootContext()->setContextProperty("_qopenhd", &QOpenHD::instance());
@@ -269,11 +286,15 @@ int main(int argc, char *argv[]) {
     // Needs to be registered first, otherwise we can have threading issue(s)
     engine.rootContext()->setContextProperty("_messageBoxInstance", &WorkaroundMessageBox::instance());
     engine.rootContext()->setContextProperty("_restartqopenhdmessagebox", &RestartQOpenHDMessageBox::instance());
+    engine.rootContext()->setContextProperty("_mouseHelper", &MouseHelper::instance());
 
     engine.rootContext()->setContextProperty("_qrenderstats", &QRenderStats::instance());
 
-    engine.rootContext()->setContextProperty("_ohdlogMessagesModel", &LogMessagesModel::instanceOHD());
-    engine.rootContext()->setContextProperty("_fclogMessagesModel", &LogMessagesModel::instanceFC());
+    //engine.rootContext()->setContextProperty("_ohdlogMessagesModel", &LogMessagesModel::instanceOHD());
+    //engine.rootContext()->setContextProperty("_fclogMessagesModel", &LogMessagesModel::instanceFC());
+    engine.rootContext()->setContextProperty("_logGround", &LogMessagesModel::instanceGround());
+    engine.rootContext()->setContextProperty("_logOpenhdAir", &LogMessagesModel::instanceOHDAir());
+    engine.rootContext()->setContextProperty("_logFC", &LogMessagesModel::instanceFC());
     engine.rootContext()->setContextProperty("_hudLogMessagesModel", &HUDLogMessagesModel::instance());
 
     // Telemetry - first all the models
@@ -282,6 +303,8 @@ int main(int argc, char *argv[]) {
     engine.rootContext()->setContextProperty("_ohdSystemAirSettingsModel", &MavlinkSettingsModel::instanceAir());
     engine.rootContext()->setContextProperty("_ohdSystemGroundSettings", &MavlinkSettingsModel::instanceGround());
     engine.rootContext()->setContextProperty("_wbLinkSettingsHelper", &WBLinkSettingsHelper::instance());
+    engine.rootContext()->setContextProperty("_frequencyHelper", &FrequencyHelper::instance());
+    engine.rootContext()->setContextProperty("_pollutionHelper", &PollutionHelper::instance());
     engine.rootContext()->setContextProperty("_fcMavlinkSystem", &FCMavlinkSystem::instance());
     engine.rootContext()->setContextProperty("_fcMavlinkAction", &FCAction::instance());
     engine.rootContext()->setContextProperty("_fcMavlinkMissionItemsModel", &FCMavlinkMissionItemsModel::instance());
@@ -373,7 +396,7 @@ int main(int argc, char *argv[]) {
 
     QRenderStats::instance().register_to_root_window(engine);
 
-    LogMessagesModel::instanceOHD().addLogMessage("QOpenHD","running");
+    LogMessagesModel::instanceGround().addLogMessage("QOpenHD","running");
     const int retval = app.exec();
 
     return retval;

app/osd/altitudeladder.cpp

@@ -7,6 +7,8 @@
 
 #include "debug_overdraw.hpp"
 
+static constexpr int DEFAULT_FONT_PIXEL_SIZE=11;
+
 AltitudeLadder::AltitudeLadder(QQuickItem *parent): QQuickPaintedItem(parent) {
     qDebug() << "AltitudeLadder::AltitudeLadder()";
     setRenderTarget(RenderTarget::FramebufferObject);
@@ -19,8 +21,6 @@ void AltitudeLadder::paint(QPainter* painter) {
         setFillColor(QColor::fromRgb(0,255,0,128));
     }
 
-    QFont font("sans-serif", 10, QFont::Bold, false);
-
     painter->setFont(m_font);
 
     auto alt = m_altitude;
@@ -121,6 +121,13 @@ void AltitudeLadder::setAltitudeRange(int altitudeRange) {
 void AltitudeLadder::setFontFamily(QString fontFamily) {
     m_fontFamily = fontFamily;
     emit fontFamilyChanged(m_fontFamily);
-    m_font = QFont(m_fontFamily, 11, QFont::Bold, false);
+    m_font = QFont(m_fontFamily, DEFAULT_FONT_PIXEL_SIZE*m_custom_font_scale, QFont::Bold, false);
+    update();
+}
+
+void AltitudeLadder::set_custom_font_scale(double custom_font_scale)
+{
+    m_custom_font_scale=custom_font_scale;
+    m_font.setPointSize(DEFAULT_FONT_PIXEL_SIZE*m_custom_font_scale);
     update();
 }

app/osd/altitudeladder.h

@@ -2,6 +2,8 @@
 #include <QQuickPaintedItem>
 #include <QPainter>
 
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
+
 class AltitudeLadder : public QQuickPaintedItem {
     Q_OBJECT
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
@@ -10,7 +12,8 @@ class AltitudeLadder : public QQuickPaintedItem {
     // actual altitude, unit - less
     Q_PROPERTY(int altitude MEMBER m_altitude WRITE set_altitude NOTIFY altitude_changed)
     Q_PROPERTY(QString fontFamily MEMBER m_fontFamily WRITE setFontFamily NOTIFY fontFamilyChanged)
-
+public:
+    Q_PROPERTY(double custom_font_scale WRITE set_custom_font_scale)
 public:
     explicit AltitudeLadder(QQuickItem* parent = nullptr);
 
@@ -25,6 +28,7 @@ public slots:
     void setAltitudeRange(int altitudeRange);
     void set_altitude(double alt);
     void setFontFamily(QString fontFamily);
+    void set_custom_font_scale(double custom_font_scale);
 signals:
     void colorChanged(QColor color);
     void glowChanged(QColor glow);
@@ -43,4 +47,6 @@ public slots:
     QString m_fontFamily;
     QFont m_font;
 
+    double m_custom_font_scale=1.0;
+
 };

app/osd/aoagauge.h

@@ -2,7 +2,6 @@
 #include <QQuickPaintedItem>
 #include <QPainter>
 
-
 class AoaGauge : public QQuickPaintedItem {
     Q_OBJECT
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

app/osd/debug_overdraw.hpp

@@ -4,4 +4,5 @@
 // Such that we can enable / disable the "overdraw debugging" with just a single variable change
 static constexpr bool ENABLE_DEBUG_OVERDRAW=false;
 
+
 #endif // DEBUG_OVERDRAW_HPP

app/osd/flightpathvector.h

@@ -2,7 +2,6 @@
 #include <QQuickPaintedItem>
 #include <QPainter>
 
-
 class FlightPathVector : public QQuickPaintedItem {
     Q_OBJECT
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

app/osd/headingladder.cpp

@@ -6,6 +6,8 @@
 
 #include "debug_overdraw.hpp"
 
+static constexpr int DEFAULT_FONT_PIXEL_SIZE=11;
+
 HeadingLadder::HeadingLadder(QQuickItem *parent): QQuickPaintedItem(parent) {
     qDebug() << "HeadingLadder::HeadingLadder()";
     setRenderTarget(RenderTarget::FramebufferObject);
@@ -235,6 +237,13 @@ void HeadingLadder::setHomeHeading(int homeHeading) {
 void HeadingLadder::setFontFamily(QString fontFamily) {
     m_fontFamily = fontFamily;
     emit fontFamilyChanged(m_fontFamily);
-    m_font = QFont(m_fontFamily, 11, QFont::Bold, false);
+     m_font = QFont(m_fontFamily, DEFAULT_FONT_PIXEL_SIZE*m_custom_font_scale, QFont::Bold, false);
+    update();
+}
+
+void HeadingLadder::set_custom_font_scale(double custom_font_scale)
+{
+    m_custom_font_scale=custom_font_scale;
+    m_font.setPointSize(DEFAULT_FONT_PIXEL_SIZE*m_custom_font_scale);
     update();
 }