Merge pull request #1083 from srcejon/status_opengl_version

Display OpenGL version in status bar.

app/main.cpp

@@ -40,6 +40,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
 	QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); // Needed for WebGL in QWebEngineView and MainWindow::openGLVersion
 #endif
 
 	QApplication a(argc, argv);

plugins/channelrx/demodadsb/adsbdemod.cpp

@@ -150,6 +150,10 @@ bool ADSBDemod::handleMessage(const Message& cmd)
         DSPSignalNotification* rep = new DSPSignalNotification(notif); // make a copy
         qDebug() << "ADSBDemod::handleMessage: DSPSignalNotification";
         m_basebandSink->getInputMessageQueue()->push(rep);
+        // Forward to GUI if any
+        if (m_guiMessageQueue) {
+            m_guiMessageQueue->push(new DSPSignalNotification(notif));
+        }
 
         return true;
     }

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -46,6 +46,7 @@
 #include "gui/crightclickenabler.h"
 #include "gui/clickablelabel.h"
 #include "dsp/dspengine.h"
+#include "dsp/dspcommands.h"
 #include "mainwindow.h"
 
 #include "adsbdemodreport.h"
@@ -1535,7 +1536,20 @@ QString ADSBDemodGUI::subAircraftString(Aircraft *aircraft, const QString &strin
 
 bool ADSBDemodGUI::handleMessage(const Message& message)
 {
-    if (ADSBDemodReport::MsgReportADSB::match(message))
+if (DSPSignalNotification::match(message))
+    {
+        DSPSignalNotification& notif = (DSPSignalNotification&) message;
+        bool srTooLow = notif.getSampleRate() < 2000000;
+        ui->warning->setVisible(srTooLow);
+        if (srTooLow) {
+            ui->warning->setText("Sample rate must be >= 2000000");
+        } else {
+            ui->warning->setText("");
+        }
+        arrangeRollups();
+        return true;
+    }
+    else if (ADSBDemodReport::MsgReportADSB::match(message))
     {
         ADSBDemodReport::MsgReportADSB& report = (ADSBDemodReport::MsgReportADSB&) message;
         handleADSB(
@@ -2542,6 +2556,9 @@ ADSBDemodGUI::ADSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
 
     ui->channelPowerMeter->setColorTheme(LevelMeterSignalDB::ColorGreenAndBlue);
 
+    ui->warning->setVisible(false);
+    ui->warning->setStyleSheet("QLabel { background-color: red; }");
+
     ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
     ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
     ui->deltaFrequency->setValueRange(false, 7, -9999999, 9999999);

plugins/channelrx/demodadsb/adsbdemodgui.ui

@@ -744,6 +744,13 @@
       </item>
      </layout>
     </item>
+    <item>
+     <widget class="QLabel" name="warning">
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="dataContainer" native="true">
@@ -1276,11 +1283,6 @@
    <extends>QToolButton</extends>
    <header>gui/buttonswitch.h</header>
   </customwidget>
-  <customwidget>
-   <class>ClickableLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/clickablelabel.h</header>
-  </customwidget>
   <customwidget>
    <class>ValueDialZ</class>
    <extends>QWidget</extends>
@@ -1293,6 +1295,11 @@
    <header>gui/levelmeter.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/clickablelabel.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>deltaFrequency</tabstop>

plugins/channelrx/demoddab/dabdemodgui.cpp

@@ -35,7 +35,6 @@
 #include "gui/audioselectdialog.h"
 #include "gui/basicchannelsettingsdialog.h"
 #include "gui/devicestreamselectiondialog.h"
-#include "dsp/dspengine.h"
 #include "gui/crightclickenabler.h"
 #include "channel/channelwebapiutils.h"
 #include "maincore.h"
@@ -202,6 +201,14 @@ bool DABDemodGUI::handleMessage(const Message& message)
     {
         DSPSignalNotification& notif = (DSPSignalNotification&) message;
         m_basebandSampleRate = notif.getSampleRate();
+        bool srTooLow = m_basebandSampleRate < 2048000;
+        ui->warning->setVisible(srTooLow);
+        if (srTooLow) {
+            ui->warning->setText("Sample rate must be >= 2048000");
+        } else {
+            ui->warning->setText("");
+        }
+        arrangeRollups();
         return true;
     }
     else if (DABDemod::MsgDABEnsembleName::match(message))
@@ -450,6 +457,9 @@ DABDemodGUI::DABDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 
     connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
 
+    ui->warning->setVisible(false);
+    ui->warning->setStyleSheet("QLabel { background-color: red; }");
+
     ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
     ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
     ui->deltaFrequency->setValueRange(false, 7, -9999999, 9999999);

plugins/channelrx/demoddab/dabdemodgui.ui

@@ -43,7 +43,7 @@
      <x>0</x>
      <y>0</y>
      <width>390</width>
-     <height>131</height>
+     <height>151</height>
     </rect>
    </property>
    <property name="minimumSize">
@@ -610,13 +610,20 @@
       </item>
      </layout>
     </item>
+    <item>
+     <widget class="QLabel" name="warning">
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="programContainer" native="true">
    <property name="geometry">
     <rect>
      <x>0</x>
-     <y>140</y>
+     <y>160</y>
      <width>381</width>
      <height>211</height>
     </rect>

sdrgui/mainwindow.cpp

@@ -865,14 +865,43 @@ void MainWindow::saveCommandSettings()
 {
 }
 
+QString MainWindow::openGLVersion()
+{
+    QOpenGLContext *glCurrentContext = QOpenGLContext::globalShareContext();
+    if (glCurrentContext)
+    {
+        if (glCurrentContext->isValid())
+        {
+            int major = glCurrentContext->format().majorVersion();
+            int minor = glCurrentContext->format().minorVersion();
+            bool es = glCurrentContext->isOpenGLES();
+            QString version = QString("%1.%2%3").arg(major).arg(minor).arg(es ? " ES" : "");
+            // Waterfall doesn't work if major version is less than 3, so display in red
+            if (major < 3) {
+                version = "<span style=\"color:red\">" + version + "</span>";
+            }
+            return version;
+        }
+        else
+        {
+            return "N/A";
+        }
+    }
+    else
+    {
+        return "N/A";
+    }
+}
+
 void MainWindow::createStatusBar()
 {
     QString qtVersionStr = QString("Qt %1 ").arg(QT_VERSION_STR);
+    QString openGLVersionStr = QString("OpenGL %1 ").arg(openGLVersion());
 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-    m_showSystemWidget = new QLabel("SDRangel " + qApp->applicationVersion() + " " + qtVersionStr
+    m_showSystemWidget = new QLabel("SDRangel " + qApp->applicationVersion() + " " + qtVersionStr + openGLVersionStr
             + QSysInfo::currentCpuArchitecture() + " " + QSysInfo::prettyProductName(), this);
 #else
-    m_showSystemWidget = new QLabel("SDRangel " + qApp->applicationVersion() + " " + qtVersionStr, this);
+    m_showSystemWidget = new QLabel("SDRangel " + qApp->applicationVersion() + " " + qtVersionStr + openGLVersionStr, this);
 #endif
     statusBar()->addPermanentWidget(m_showSystemWidget);
 

sdrgui/mainwindow.h

@@ -129,6 +129,7 @@ private:
 	void saveFeatureSetPresetSettings(FeatureSetPreset* preset, int featureSetIndex);
 	void saveCommandSettings();
 
+	QString openGLVersion();
 	void createStatusBar();
 	void closeEvent(QCloseEvent*);
 	void updatePresetControls();