DATV demod: implemented gauge meters for MER and CNR. Implements #784

plugins/channelrx/demoddatv/datvdemod.h

@@ -68,6 +68,8 @@ public:
     void SetTVScreen(TVScreen *objScreen) { m_basebandSink->setTVScreen(objScreen); }
     void setMERLabel(QLabel *merLabel) { m_basebandSink->setMERLabel(merLabel); }
     void setCNRLabel(QLabel *cnrLabel) { m_basebandSink->setCNRLabel(cnrLabel); }
+    void setMERMeter(LevelMeterSignalDB *merMeter) { m_basebandSink->setMERMeter(merMeter); }
+    void setCNRMeter(LevelMeterSignalDB *cnrMeter) { m_basebandSink->setCNRMeter(cnrMeter); }
     DATVideostream *SetVideoRender(DATVideoRender *objScreen) { return m_basebandSink->SetVideoRender(objScreen); }
     bool audioActive() { return m_basebandSink->audioActive(); }
     bool audioDecodeOK() { return m_basebandSink->audioDecodeOK(); }

plugins/channelrx/demoddatv/datvdemodbaseband.h

@@ -88,6 +88,8 @@ public:
     void setTVScreen(TVScreen *tvScreen) { m_sink.setTVScreen(tvScreen); }
     void setMERLabel(QLabel *merLabel) { m_sink.setMERLabel(merLabel); }
     void setCNRLabel(QLabel *cnrLabel) { m_sink.setCNRLabel(cnrLabel); }
+    void setMERMeter(LevelMeterSignalDB *merMeter) { m_sink.setMERMeter(merMeter); }
+    void setCNRMeter(LevelMeterSignalDB *cnrMeter) { m_sink.setCNRMeter(cnrMeter); }
     void setMessageQueueToGUI(MessageQueue *messageQueue) { m_sink.setMessageQueueToGUI(messageQueue); }
     void setBasebandSampleRate(int sampleRate); //!< To be used when supporting thread is stopped
     DATVideostream *SetVideoRender(DATVideoRender *objScreen) { return m_sink.SetVideoRender(objScreen); }

plugins/channelrx/demoddatv/datvdemodgui.cpp

@@ -191,12 +191,22 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
     connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
 
+    ui->merMeter->setColorTheme(LevelMeterSignalDB::ColorCyanAndBlue);
+    ui->merMeter->setRange(0, 30);
+    ui->merMeter->setAverageSmoothing(2);
+
+    ui->cnrMeter->setColorTheme(LevelMeterSignalDB::ColorGreenAndBlue);
+    ui->cnrMeter->setRange(0, 30);
+    ui->cnrMeter->setAverageSmoothing(2);
+
     m_objDATVDemod = (DATVDemod*) rxChannel;
     m_objDATVDemod->setMessageQueueToGUI(getInputMessageQueue());
 
     m_objDATVDemod->SetTVScreen(ui->screenTV);
     m_objDATVDemod->setMERLabel(ui->merText);
     m_objDATVDemod->setCNRLabel(ui->cnrText);
+    m_objDATVDemod->setMERMeter(ui->merMeter);
+    m_objDATVDemod->setCNRMeter(ui->cnrMeter);
 
     connect(m_objDATVDemod->SetVideoRender(ui->screenTV_2), &DATVideostream::onDataPackets, this, &DATVDemodGUI::on_StreamDataAvailable);
     connect(ui->screenTV_2, &DATVideoRender::onMetaDataChanged, this, &DATVDemodGUI::on_StreamMetaDataChanged);
@@ -240,7 +250,6 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
 	CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute);
 	connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));
 
-
     resetToDefaults(); // does applySettings()
 }
 

plugins/channelrx/demoddatv/datvdemodgui.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>530</width>
-    <height>444</height>
+    <height>476</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -188,7 +188,7 @@
      <x>0</x>
      <y>40</y>
      <width>526</width>
-     <height>400</height>
+     <height>431</height>
     </rect>
    </property>
    <property name="minimumSize">
@@ -735,8 +735,8 @@
     <widget class="QWidget" name="horizontalLayoutWidget">
      <property name="geometry">
       <rect>
-       <x>10</x>
+       <x>0</x>
-       <y>260</y>
+       <y>310</y>
        <width>481</width>
        <height>33</height>
       </rect>
@@ -828,13 +828,16 @@
     <widget class="QWidget" name="horizontalLayoutWidget_2">
      <property name="geometry">
       <rect>
-       <x>10</x>
+       <x>0</x>
-       <y>300</y>
+       <y>250</y>
        <width>481</width>
        <height>31</height>
       </rect>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QHBoxLayout" name="merLayout">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
       <item>
        <widget class="QLabel" name="merLabel">
         <property name="text">
@@ -842,6 +845,31 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="LevelMeterSignalDB" name="merMeter" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>180</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <family>Liberation Mono</family>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string>SNR estimation</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="merText">
         <property name="minimumSize">
@@ -858,6 +886,21 @@
         </property>
        </widget>
       </item>
+     </layout>
+    </widget>
+    <widget class="QWidget" name="horizontalLayoutWidget_3">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>280</y>
+       <width>481</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <layout class="QHBoxLayout" name="cnrLayout">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
       <item>
        <widget class="QLabel" name="cnrLabel">
         <property name="text">
@@ -865,6 +908,31 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="LevelMeterSignalDB" name="cnrMeter" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>180</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <family>Liberation Mono</family>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string>SNR estimation</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="cnrText">
         <property name="minimumSize">
@@ -881,19 +949,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <spacer name="horizontalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </widget>
@@ -1199,6 +1254,12 @@
    <extends>QToolButton</extends>
    <header>gui/buttonswitch.h</header>
   </customwidget>
+  <customwidget>
+   <class>LevelMeterSignalDB</class>
+   <extends>QWidget</extends>
+   <header>gui/levelmeter.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../sdrgui/resources/res.qrc"/>

plugins/channelrx/demoddatv/datvdemodsink.cpp

@@ -39,6 +39,8 @@ DATVDemodSink::DATVDemodSink() :
     m_objRenderThread(nullptr),
     m_merLabel(nullptr),
     m_cnrLabel(nullptr),
+    m_merMeter(nullptr),
+    m_cnrMeter(nullptr),
     m_audioFifo(48000),
     m_blnRenderingVideo(false),
     m_blnStartStopVideo(false),
@@ -96,6 +98,14 @@ void DATVDemodSink::setCNRLabel(QLabel *cnrLabel) {
     m_cnrLabel = cnrLabel;
 }
 
+void DATVDemodSink::setMERMeter(LevelMeterSignalDB *merMeter) {
+    m_merMeter = merMeter;
+}
+
+void DATVDemodSink::setCNRMeter(LevelMeterSignalDB *cnrMeter) {
+    m_cnrMeter = cnrMeter;
+}
+
 DATVideostream *DATVDemodSink::SetVideoRender(DATVideoRender *objScreen)
 {
     m_objRegisteredVideoRender = objScreen;
@@ -783,12 +793,12 @@ void DATVDemodSink::InitDATVFramework()
         r_scope_symbols->calculate_cstln_points();
     }
 
-    if (m_merLabel) {
+    if (m_merLabel && m_merMeter) {
-        r_merGauge = new leansdr::datvgaugelabel(m_objScheduler, *p_mer, m_merLabel);
+        r_merGauge = new leansdr::datvgauge(m_objScheduler, *p_mer, m_merLabel, m_merMeter);
     }
 
-    if (m_cnrLabel) {
+    if (m_cnrLabel && m_cnrMeter) {
-        r_cnrGauge = new leansdr::datvgaugelabel(m_objScheduler, *p_cnr, m_cnrLabel);
+        r_cnrGauge = new leansdr::datvgauge(m_objScheduler, *p_cnr, m_cnrLabel, m_cnrMeter);
     }
 
     // DECONVOLUTION AND SYNCHRONIZATION
@@ -1095,12 +1105,12 @@ void DATVDemodSink::InitDATVS2Framework()
         r_scope_symbols_dvbs2->calculate_cstln_points();
     }
 
-    if (m_merLabel) {
+    if (m_merLabel && m_merMeter) {
-        r_merGauge = new leansdr::datvgaugelabel(m_objScheduler, *p_mer, m_merLabel);
+        r_merGauge = new leansdr::datvgauge(m_objScheduler, *p_mer, m_merLabel, m_merMeter);
     }
 
-    if (m_cnrLabel) {
+    if (m_cnrLabel && m_cnrMeter) {
-        r_cnrGauge = new leansdr::datvgaugelabel(m_objScheduler, *p_cnr, m_cnrLabel);
+        r_cnrGauge = new leansdr::datvgauge(m_objScheduler, *p_cnr, m_cnrLabel, m_cnrMeter);
     }
 
     // Bit-flipping mode.

plugins/channelrx/demoddatv/datvdemodsink.h

@@ -28,7 +28,7 @@
 #include "leansdr/iess.h"
 
 #include "datvconstellation.h"
-#include "datvgaugelabel.h"
+#include "datvgauge.h"
 #include "datvdvbs2constellation.h"
 #include "datvvideoplayer.h"
 #include "datvideostream.h"
@@ -49,6 +49,7 @@
 class TVScreen;
 class DATVideoRender;
 class QLabel;
+class LevelMeterSignalDB;
 
 class DATVDemodSink : public ChannelSampleSink {
 public:
@@ -60,6 +61,8 @@ public:
     bool setTVScreen(TVScreen *objScreen);
     void setMERLabel(QLabel *merLabel);
     void setCNRLabel(QLabel *cnrLabel);
+    void setMERMeter(LevelMeterSignalDB *merMeter);
+    void setCNRMeter(LevelMeterSignalDB *cnrMeter);
     DATVideostream * SetVideoRender(DATVideoRender *objScreen);
     bool audioActive();
     bool audioDecodeOK();
@@ -275,8 +278,8 @@ private:
     //CONSTELLATION
     leansdr::datvconstellation<leansdr::f32> *r_scope_symbols;
     leansdr::datvdvbs2constellation<leansdr::f32> *r_scope_symbols_dvbs2;
-    leansdr::datvgaugelabel *r_merGauge;
+    leansdr::datvgauge *r_merGauge;
-    leansdr::datvgaugelabel *r_cnrGauge;
+    leansdr::datvgauge *r_cnrGauge;
 
     //*************** DATV PARAMETERS  ***************
     TVScreen *m_objRegisteredTVScreen;
@@ -286,6 +289,8 @@ private:
     DATVideoRenderThread *m_objRenderThread;
     QLabel *m_merLabel;
     QLabel *m_cnrLabel;
+    LevelMeterSignalDB *m_merMeter;
+    LevelMeterSignalDB *m_cnrMeter;
 
     // Audio
 	AudioFifo m_audioFifo;

plugins/channelrx/demoddatv/datvgauge.h

@@ -0,0 +1,83 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2021 Edouard Griffiths, F4EXB                                   //
+// using LeanSDR Framework (C) 2016 F4DAV                                        //
+//                                                                               //
+// This program is free software; you can redistribute it and/or modify          //
+// it under the terms of the GNU General Public License as published by          //
+// the Free Software Foundation as version 3 of the License, or                  //
+// (at your option) any later version.                                           //
+//                                                                               //
+// This program is distributed in the hope that it will be useful,               //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
+// GNU General Public License V3 for more details.                               //
+//                                                                               //
+// You should have received a copy of the GNU General Public License             //
+// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef DATVGAUGE_H
+#define DATVGAUGE_H
+
+#include <QLabel>
+#include <QString>
+
+#include "leansdr/framework.h"
+#include "leansdr/sdr.h"
+
+#include "gui/levelmeter.h"
+
+namespace leansdr {
+
+struct datvgauge: runnable
+{
+    leansdr::pipereader<leansdr::f32> m_in;
+    QLabel *m_label;
+    LevelMeterSignalDB *m_levelMeter;
+    static const int m_nbAvg = 5;
+    leansdr::f32 m_samples[m_nbAvg];
+    leansdr::f32 m_sum;
+    int m_index;
+
+    datvgauge(
+        scheduler *sch,
+        leansdr::pipebuf<leansdr::f32> &in,
+        QLabel *label = nullptr,
+        LevelMeterSignalDB *levelMeter = nullptr,
+        const char *_name = nullptr
+    ) :
+        runnable(sch, _name ? _name : in.name),
+        m_in(in),
+        m_label(label),
+        m_levelMeter(levelMeter)
+    {
+        std::fill(m_samples, m_samples+m_nbAvg, 0);
+        m_sum = 0;
+        m_index = 0;
+    }
+
+    virtual void run()
+    {
+        while (m_in.readable() >= 1)
+        {
+            leansdr::f32 *p = m_in.rd();
+            leansdr::f32& oldest = m_samples[m_index++];
+            m_sum += *p - oldest;
+            oldest = *p;
+            leansdr::f32 avg = m_sum/m_nbAvg;
+            m_index = (m_index + 1) % m_nbAvg;
+
+            m_levelMeter->levelChanged(avg/30.0, *p/30.0, m_nbAvg);
+            m_label->setText(QString("%1").arg(avg, 0, 'f', 1));
+            m_in.read(1);
+
+            if (m_index == m_nbAvg) {
+                m_index = 0;
+            }
+        }
+    }
+};
+
+} // namespace leansdr
+
+#endif // DATVGAUGE_H