Merge pull request #602 from OpenHD/consti-dev

Consti dev

QOpenHD.pro

@@ -134,7 +134,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 +143,6 @@ HEADERS += \
     app/osd/flightpathvector.h \
     app/osd/debug_overdraw.hpp \
     app/osd/aoagauge.h \
-    app/osd/performancehorizonladder.h \
 
 
 RESOURCES += qml/qml.qrc

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

@@ -32,7 +32,6 @@ const QVector<QString> permissions({"android.permission.INTERNET",
 #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"
@@ -256,8 +255,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());
@@ -272,8 +269,11 @@ int main(int argc, char *argv[]) {
 
     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
@@ -373,7 +373,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

@@ -19,8 +19,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 +119,6 @@ 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, 13, QFont::Bold, false);
     update();
 }