M17 demod: implemented BERT ratios graph display

2022-07-08 01:39:38 +02:00 · 2022-07-08 01:39:38 +02:00 · 3d00755438
commit 3d00755438
--- a/plugins/channelrx/demodm17/m17demodgui.cpp
+++ b/plugins/channelrx/demodm17/m17demodgui.cpp
@ -300,6 +300,17 @@ void M17DemodGUI::on_curButton_toggled(bool checked)
    ui->totButton->blockSignals(false);
 }

+void M17DemodGUI::on_berHistory_valueChanged(int value)
+{
+    m_berHistory = value*20;
+    ui->berHistoryText->setText(tr("%1").arg(m_berHistory/2));
+}
+
+void M17DemodGUI::on_berButton_toggled(bool checked)
+{
+    m_showBERNumbersOrRates = !checked;
+}
+
 void M17DemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
 {
    (void) widget;
@ -379,7 +390,9 @@ M17DemodGUI::M17DemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 	m_tickCount(0),
    m_lastBERErrors(0),
    m_lastBERBits(0),
-    m_showBERTotalOrCurrent(true)
+    m_showBERTotalOrCurrent(true),
+    m_showBERNumbersOrRates(true),
+    m_berHistory(120)
 {
 	setAttribute(Qt::WA_DeleteOnClose, true);
    m_helpURL = "plugins/channelrx/demodm17/readme.md";
@ -445,13 +458,16 @@ M17DemodGUI::M17DemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban

    ui->dcdLabel->setPixmap(QIcon(":/carrier.png").pixmap(QSize(20, 20)));
    ui->lockLabel->setPixmap(QIcon(":/locked.png").pixmap(QSize(20, 20)));
+    ui->berHistoryText->setText(tr("%1").arg(m_berHistory/2));
+    ui->berHistory->setValue(m_berHistory/20);

    m_berChart.setTheme(QChart::ChartThemeDark);
    m_berChart.legend()->hide();
    ui->berChart->setChart(&m_berChart);
    ui->berChart->setRenderHint(QPainter::Antialiasing);
    m_berChart.addAxis(&m_berChartXAxis, Qt::AlignBottom);
-    m_berChart.addAxis(&m_berChartYAxis, Qt::AlignLeft);
+    QValueAxis *berChartYAxis = new QValueAxis();
+    m_berChart.addAxis(berChartYAxis, Qt::AlignLeft);
    m_berChart.layout()->setContentsMargins(0, 0, 0, 0);
    m_berChart.setMargins(QMargins(1, 1, 1, 1));

@ -534,6 +550,9 @@ void M17DemodGUI::displaySettings()
    ui->totButton->setChecked(m_showBERTotalOrCurrent);
    ui->curButton->setChecked(!m_showBERTotalOrCurrent);

+    ui->berHistory->setValue(m_berHistory/20);
+    ui->berHistoryText->setText(tr("%1").arg(m_berHistory/2));
+
    updateIndexLabel();

    getRollupContents()->restoreState(m_rollupState);
@ -705,6 +724,10 @@ void M17DemodGUI::tick()
            m_lastBERErrors = bertErrors;
            m_lastBERBits = bertBits;

+            while (m_berPoints.size() >= (int) m_berHistory) {
+                m_berPoints.pop_front();
+            }
+
            m_berPoints.append(BERPoint{
                QDateTime::currentDateTime(),
                bertErrors,
@ -714,13 +737,19 @@ void M17DemodGUI::tick()
            });
            m_currentErrors.append(bertErrorsDelta);

-            uint32_t maxY;
            QLineSeries *series;
+            uint32_t min, max;
+            qreal fmin, fmax;

            if (m_showBERTotalOrCurrent)
            {
                ui->berCounts->setText(tr("%1/%2").arg(bertErrors).arg(bertBits));
-                series = addBERSeries(true, maxY);
+
+                if (m_showBERNumbersOrRates) {
+                    series = addBERSeries(true, min, max);
+                } else {
+                    series = addBERSeriesRate(true, fmin, fmax);
+                }

                if (bertBits > 0) {
                    ui->berRatio->setText(tr("%1").arg((double) bertErrors / (double) bertBits, 0, 'e', 2));
@ -729,7 +758,12 @@ void M17DemodGUI::tick()
            else
            {
                ui->berCounts->setText(tr("%1/%2").arg(bertErrorsDelta).arg(bertBitsDelta));
-                series = addBERSeries(false, maxY);
+
+                if (m_showBERNumbersOrRates) {
+                    series = addBERSeries(false, min, max);
+                } else {
+                    series = addBERSeriesRate(false, fmin, fmax);
+                }

                if (bertBitsDelta > 0) {
                    ui->berRatio->setText(tr("%1").arg((double) bertErrorsDelta / (double) bertBitsDelta, 0, 'e', 2));
@ -740,7 +774,8 @@ void M17DemodGUI::tick()
            {
                m_berChart.removeAllSeries();
                m_berChart.removeAxis(&m_berChartXAxis);
-                m_berChart.removeAxis(&m_berChartYAxis);
+                QAbstractAxis *berChartYAxis = m_berChart.axes(Qt::Vertical).at(0);
+                m_berChart.removeAxis(berChartYAxis);

                m_berChart.addSeries(series);

@ -749,9 +784,36 @@ void M17DemodGUI::tick()
                m_berChart.addAxis(&m_berChartXAxis, Qt::AlignBottom);
                series->attachAxis(&m_berChartXAxis);

-                m_berChartYAxis.setRange(0, maxY == 0 ? 1 : maxY);
-                m_berChart.addAxis(&m_berChartYAxis, Qt::AlignLeft);
-                series->attachAxis(&m_berChartYAxis);
+                if (m_showBERNumbersOrRates)
+                {
+                    berChartYAxis = new QValueAxis();
+
+                    if (min != 0) {
+                        ((QValueAxis*) berChartYAxis)->setMin(min);
+                    }
+
+                    if (max != 0) {
+                        ((QValueAxis*) berChartYAxis)->setMax(max);
+                    }
+                }
+                else
+                {
+                    berChartYAxis = new QLogValueAxis();
+                    ((QLogValueAxis*) berChartYAxis)->setLabelFormat("%.2e");
+                    ((QLogValueAxis*) berChartYAxis)->setBase(10.0);
+                    ((QLogValueAxis*) berChartYAxis)->setMinorTickCount(-1);
+
+                    if (fmin != 0) {
+                        ((QLogValueAxis*) berChartYAxis)->setMin(fmin);
+                    }
+
+                    if (fmax != 0) {
+                        ((QLogValueAxis*) berChartYAxis)->setMax(fmax);
+                    }
+                }
+
+                m_berChart.addAxis(berChartYAxis, Qt::AlignLeft);
+                series->attachAxis(berChartYAxis);
            }
        }
        else
@ -795,7 +857,7 @@ QString M17DemodGUI::getStatus(int status, int sync_word_type, bool streamElsePa
    }
 }

-QLineSeries *M17DemodGUI::addBERSeries(bool total, uint32_t& maxVal)
+QLineSeries *M17DemodGUI::addBERSeries(bool total, uint32_t& min, uint32_t& max)
 {
    if (m_berPoints.size() < 2) {
        return nullptr;
@ -803,10 +865,15 @@ QLineSeries *M17DemodGUI::addBERSeries(bool total, uint32_t& maxVal)

    QLineSeries *series = new QLineSeries();

-    if (!total) {
-        maxVal = *std::max_element(m_currentErrors.begin(), m_currentErrors.end());
-    } else {
-        maxVal = m_berPoints.back().m_totalErrors;
+    if (total)
+    {
+        min = m_berPoints.front().m_totalErrors;
+        max = m_berPoints.back().m_totalErrors;
+    }
+    else
+    {
+        min = *std::min_element(m_currentErrors.begin(), m_currentErrors.end());
+        max = *std::max_element(m_currentErrors.begin(), m_currentErrors.end());
    }

    for (auto berPoint : m_berPoints)
@ -826,6 +893,45 @@ QLineSeries *M17DemodGUI::addBERSeries(bool total, uint32_t& maxVal)
    return series;
 }

+QLineSeries *M17DemodGUI::addBERSeriesRate(bool total, qreal& min, qreal& max)
+{
+    if (m_berPoints.size() < 2) {
+        return nullptr;
+    }
+
+    QLineSeries *series = new QLineSeries();
+    min = 0;
+    max = 0;
+
+    for (auto berPoint : m_berPoints)
+    {
+        qreal x = berPoint.m_dateTime.toMSecsSinceEpoch();
+
+        if (total)
+        {
+            if ((berPoint.m_totalErrors != 0) && (berPoint.m_totalBits != 0))
+            {
+                qreal y = ((qreal) berPoint.m_totalErrors) / ((qreal) berPoint.m_totalBits);
+                min = std::min(min, y);
+                max = std::max(max, y);
+                series->append(x, y);
+            }
+        }
+        else
+        {
+            if ((berPoint.m_currentErrors != 0) && (berPoint.m_currentBits != 0))
+            {
+                qreal y = ((qreal) berPoint.m_currentErrors) / ((qreal) berPoint.m_currentBits);
+                min = std::min(min, y);
+                max = std::max(max, y);
+                series->append(x, y);
+            }
+        }
+    }
+
+    return series;
+}
+
 void M17DemodGUI::makeUIConnections()
 {
    QObject::connect(ui->deltaFrequency, &ValueDialZ::changed, this, &M17DemodGUI::on_deltaFrequency_changed);
@ -845,6 +951,8 @@ void M17DemodGUI::makeUIConnections()
    QObject::connect(ui->aprsClearTable, &QPushButton::clicked, this, &M17DemodGUI::on_aprsClearTable_clicked);
    QObject::connect(ui->totButton, &ButtonSwitch::toggled, this, &M17DemodGUI::on_totButton_toggled);
    QObject::connect(ui->curButton, &ButtonSwitch::toggled, this, &M17DemodGUI::on_curButton_toggled);
+    QObject::connect(ui->berButton, &ButtonSwitch::toggled, this, &M17DemodGUI::on_berButton_toggled);
+    QObject::connect(ui->berHistory, &QDial::valueChanged, this, &M17DemodGUI::on_berHistory_valueChanged);
 }

 void M17DemodGUI::updateAbsoluteCenterFrequency()
--- a/plugins/channelrx/demodm17/m17demodgui.h
+++ b/plugins/channelrx/demodm17/m17demodgui.h
@ -106,12 +106,13 @@ private:
    uint32_t m_lastBERErrors;
    uint32_t m_lastBERBits;
    bool m_showBERTotalOrCurrent;
+    bool m_showBERNumbersOrRates;

    QChart m_berChart;
    QDateTimeAxis m_berChartXAxis;
-    QValueAxis m_berChartYAxis;
    QList<BERPoint> m_berPoints;
    QList<uint32_t> m_currentErrors;
+    uint32_t m_berHistory;

 	float m_myLatitude;
 	float m_myLongitude;
@ -132,7 +133,8 @@ private:
    void updateAbsoluteCenterFrequency();
    QString getStatus(int status, int sync_word_type, bool streamElsePacket, int packetProtocol);
    void packetReceived(QByteArray packet);
-    QLineSeries *addBERSeries(bool total, uint32_t& maxVal);
+    QLineSeries *addBERSeries(bool total, uint32_t& min, uint32_t& max);
+    QLineSeries *addBERSeriesRate(bool total, qreal& min, qreal& max);

 	void leaveEvent(QEvent*);
 	void enterEvent(QEvent*);
@ -154,6 +156,8 @@ private slots:
    void on_aprsClearTable_clicked();
    void on_totButton_toggled(bool checked);
    void on_curButton_toggled(bool checked);
+    void on_berButton_toggled(bool checked);
+    void on_berHistory_valueChanged(int value);
    void onWidgetRolled(QWidget* widget, bool rollDown);
    void onMenuDialogCalled(const QPoint& p);
    void on_viewStatusLog_clicked();
--- a/plugins/channelrx/demodm17/m17demodgui.ui
+++ b/plugins/channelrx/demodm17/m17demodgui.ui
@ -1673,43 +1673,18 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <property name="text">
-         <string>0/1000000</string>
+         <string>0/0</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
-       <widget class="QLabel" name="berLabel">
-        <property name="geometry">
-         <rect>
-          <x>230</x>
-          <y>10</y>
-          <width>30</width>
-          <height>28</height>
-         </rect>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>30</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Total BER</string>
-        </property>
-        <property name="text">
-         <string>BER</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-       </widget>
       <widget class="QLabel" name="berRatio">
        <property name="geometry">
         <rect>
          <x>265</x>
          <y>10</y>
-          <width>85</width>
+          <width>70</width>
          <height>28</height>
         </rect>
        </property>
@ -1777,6 +1752,101 @@
         </rect>
        </property>
       </widget>
+       <widget class="QLabel" name="berHistoryLabel">
+        <property name="geometry">
+         <rect>
+          <x>340</x>
+          <y>10</y>
+          <width>21</width>
+          <height>28</height>
+         </rect>
+        </property>
+        <property name="text">
+         <string>His</string>
+        </property>
+       </widget>
+       <widget class="QDial" name="berHistory">
+        <property name="geometry">
+         <rect>
+          <x>365</x>
+          <y>10</y>
+          <width>24</width>
+          <height>24</height>
+         </rect>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>24</width>
+          <height>28</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Maximum BER history on the graph (seconds)</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>360</number>
+        </property>
+        <property name="pageStep">
+         <number>1</number>
+        </property>
+        <property name="value">
+         <number>6</number>
+        </property>
+        <property name="sliderPosition">
+         <number>6</number>
+        </property>
+       </widget>
+       <widget class="QLabel" name="berHistoryText">
+        <property name="geometry">
+         <rect>
+          <x>395</x>
+          <y>10</y>
+          <width>31</width>
+          <height>28</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string>Maximum BER history on the graph (seconds)</string>
+        </property>
+        <property name="text">
+         <string>0000</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+       <widget class="QLabel" name="berHistoryUnits">
+        <property name="geometry">
+         <rect>
+          <x>428</x>
+          <y>10</y>
+          <width>16</width>
+          <height>28</height>
+         </rect>
+        </property>
+        <property name="text">
+         <string>s</string>
+        </property>
+       </widget>
+       <widget class="ButtonSwitch" name="berButton">
+        <property name="geometry">
+         <rect>
+          <x>225</x>
+          <y>5</y>
+          <width>36</width>
+          <height>35</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string>Toggle BER or error values display on graph</string>
+        </property>
+        <property name="text">
+         <string>BER</string>
+        </property>
+       </widget>
      </widget>
     </widget>
    </item>
--- a/plugins/channelrx/demodm17/m17demodprocessor.cpp
+++ b/plugins/channelrx/demodm17/m17demodprocessor.cpp
@ -138,7 +138,7 @@ void M17DemodProcessor::diagnostic_callback(
        qDebug() << "M17DemodProcessor::diagnostic_callback: " << oss.str().c_str();
    }

-    if (!dcd && m_this->m_prbs.sync()) { // Seems like there should be a better way to do this.
+    if ((!dcd) || (status == 0)) { // && m_this->m_prbs.sync()) { // Seems like there should be a better way to do this.
        m_this->m_prbs.reset();
    }