VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-21 15:51:47 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1082 from srcejon/check_sample_rate

Browse Source 
Display warnings in ADS-B and DAB if sample rate is too low
This commit is contained in:
Edouard Griffiths 2021-12-13 10:48:49 +01:00 committed by GitHub
commit 023ca69156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channelrx/demodadsb/adsbdemod.cpp
View File

@ -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;
}

19
plugins/channelrx/demodadsb/adsbdemodgui.cpp
View File

@ -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);

17
plugins/channelrx/demodadsb/adsbdemodgui.ui
View File

@ -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>

12
plugins/channelrx/demoddab/dabdemodgui.cpp
View File

@ -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);

11
plugins/channelrx/demoddab/dabdemodgui.ui
View File

@ -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>