VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-01 12:37:11 -05:00
Code Issues Projects Releases Wiki Activity

BFM demod: RDS GUI part #3:various display optimizations

Browse Source
This commit is contained in:
f4exb 2015-12-14 04:01:41 +01:00
parent fd8e771543
commit 8717efef92
3 changed files with 108 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Readme.md
View File

@ -185,6 +185,7 @@ For Debian Jessie or Stretch:
- DSB option for SSB - DSB option for SSB
- Mute option for NFM channel - Mute option for NFM channel
- New Broadcast FM demodulator with stereo support - New Broadcast FM demodulator with stereo support
- RDS support in Broadcast FM demodulator
<h2>Major redesign</h2> <h2>Major redesign</h2>
@ -213,7 +214,6 @@ For Debian Jessie or Stretch:
- Allow arbitrary sample rate for channelizers and demodulators (not multiple of 48 kHz). Prerequisite for polyphase channelizer - Allow arbitrary sample rate for channelizers and demodulators (not multiple of 48 kHz). Prerequisite for polyphase channelizer
- Implement polyphase channelizer - Implement polyphase channelizer
- Level calibration - Level calibration
- Enhance Broadcast FM with RDS
- Even more demods ... - Even more demods ...
<h1>Developper's notes</h1> <h1>Developper's notes</h1>

8
plugins/channel/bfm/bfmdemodgui.cpp
View File

@ -414,11 +414,11 @@ void BFMDemodGUI::channelSampleRateChanged()
void BFMDemodGUI::rdsUpdate() void BFMDemodGUI::rdsUpdate()
{ {
// Quality metrics // Quality metrics
ui->demodQText->setText(QString::number(m_bfmDemod->getDemodQua(), 'f', 0)); ui->demodQText->setText(QString("%1 %").arg(m_bfmDemod->getDemodQua(), 0, 'f', 0));
ui->decoderQText->setText(QString("%1").arg(m_bfmDemod->getDecoderQua())); ui->decoderQText->setText(QString("%1 %").arg(m_bfmDemod->getDecoderQua(), 0, 'f', 0));
Real accDb = CalcDb::dbPower(std::fabs(m_bfmDemod->getDemodAcc())); Real accDb = CalcDb::dbPower(std::fabs(m_bfmDemod->getDemodAcc()));
ui->accumText->setText(QString::number(accDb, 'f', 1)); ui->accumText->setText(QString("%1 dB").arg(accDb, 0, 'f', 1));
ui->fclkText->setText(QString::number(m_bfmDemod->getDemodFclk(), 'f', 2)); ui->fclkText->setText(QString("%1 Hz").arg(m_bfmDemod->getDemodFclk(), 0, 'f', 2));
// PI group // PI group
if (m_rdsParser.m_pi_updated) if (m_rdsParser.m_pi_updated)

188
plugins/channel/bfm/bfmdemodgui.ui
View File

@ -470,7 +470,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Dem Q</string> <string>Dem</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -478,43 +478,27 @@
<widget class="QLabel" name="demodQText"> <widget class="QLabel" name="demodQText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>40</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>20</width> <width>40</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Demodulator (DBPSK) quality </string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0 %</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="demodQUnits">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>10</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>%</string>
</property>
</widget>
</item>
<item> <item>
<widget class="Line" name="sep1"> <widget class="Line" name="sep1">
<property name="orientation"> <property name="orientation">
@ -537,7 +521,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Dec Q</string> <string>Dec</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -545,43 +529,27 @@
<widget class="QLabel" name="decoderQText"> <widget class="QLabel" name="decoderQText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>40</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>20</width> <width>40</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Decoder (sync) quality</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0 %</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="decoderQUnits">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>10</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>%</string>
</property>
</widget>
</item>
<item> <item>
<widget class="Line" name="sep2"> <widget class="Line" name="sep2">
<property name="orientation"> <property name="orientation">
@ -612,43 +580,27 @@
<widget class="QLabel" name="accumText"> <widget class="QLabel" name="accumText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>40</width> <width>60</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>40</width> <width>60</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Sample symbol power</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0 dB</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="accumUnits">
<property name="minimumSize">
<size>
<width>15</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>15</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>dB</string>
</property>
</widget>
</item>
<item> <item>
<widget class="Line" name="sep3"> <widget class="Line" name="sep3">
<property name="orientation"> <property name="orientation">
@ -679,18 +631,21 @@
<widget class="QLabel" name="fclkText"> <widget class="QLabel" name="fclkText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>80</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>60</width> <width>80</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Symbol clock frequency</string>
</property>
<property name="text"> <property name="text">
<string>1187.50</string> <string>1187.50 Hz</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -698,23 +653,17 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="fclkUnits"> <spacer name="horizontalSpacer_2">
<property name="minimumSize"> <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>15</width> <width>40</width>
<height>0</height> <height>20</height>
</size> </size>
</property> </property>
<property name="maximumSize"> </spacer>
<size>
<width>15</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Hz</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -736,6 +685,9 @@
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="piCountText"> <widget class="QLabel" name="piCountText">
<property name="toolTip">
<string>PI groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -750,6 +702,9 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLabel" name="g00CountText"> <widget class="QLabel" name="g00CountText">
<property name="toolTip">
<string>G0 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -771,6 +726,9 @@
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QLabel" name="g01CountText"> <widget class="QLabel" name="g01CountText">
<property name="toolTip">
<string>G1 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -785,6 +743,9 @@
</item> </item>
<item row="1" column="3"> <item row="1" column="3">
<widget class="QLabel" name="g02CountText"> <widget class="QLabel" name="g02CountText">
<property name="toolTip">
<string>G2 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -806,6 +767,9 @@
</item> </item>
<item row="1" column="4"> <item row="1" column="4">
<widget class="QLabel" name="g03CountText"> <widget class="QLabel" name="g03CountText">
<property name="toolTip">
<string>G3 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -820,6 +784,9 @@
</item> </item>
<item row="1" column="5"> <item row="1" column="5">
<widget class="QLabel" name="g04CountText"> <widget class="QLabel" name="g04CountText">
<property name="toolTip">
<string>G4 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -834,6 +801,9 @@
</item> </item>
<item row="1" column="6"> <item row="1" column="6">
<widget class="QLabel" name="g05CountText"> <widget class="QLabel" name="g05CountText">
<property name="toolTip">
<string>G5 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -848,6 +818,9 @@
</item> </item>
<item row="1" column="7"> <item row="1" column="7">
<widget class="QLabel" name="g06CountText"> <widget class="QLabel" name="g06CountText">
<property name="toolTip">
<string>G6 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -855,6 +828,9 @@
</item> </item>
<item row="1" column="8"> <item row="1" column="8">
<widget class="QLabel" name="g07CountText"> <widget class="QLabel" name="g07CountText">
<property name="toolTip">
<string>G7 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -862,6 +838,9 @@
</item> </item>
<item row="1" column="9"> <item row="1" column="9">
<widget class="QLabel" name="g08CountText"> <widget class="QLabel" name="g08CountText">
<property name="toolTip">
<string>G8 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -876,6 +855,9 @@
</item> </item>
<item row="1" column="10"> <item row="1" column="10">
<widget class="QLabel" name="g09CountText"> <widget class="QLabel" name="g09CountText">
<property name="toolTip">
<string>G9 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -890,6 +872,9 @@
</item> </item>
<item row="1" column="11"> <item row="1" column="11">
<widget class="QLabel" name="g14CountText"> <widget class="QLabel" name="g14CountText">
<property name="toolTip">
<string>G14 groups count</string>
</property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
@ -914,6 +899,9 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>PI updated</string>
</property>
<property name="text"> <property name="text">
<string>PI</string> <string>PI</string>
</property> </property>
@ -934,6 +922,9 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>PI hex code</string>
</property>
<property name="text"> <property name="text">
<string>0000</string> <string>0000</string>
</property> </property>
@ -954,6 +945,9 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Traffic Program</string>
</property>
<property name="text"> <property name="text">
<string>TP</string> <string>TP</string>
</property> </property>
@ -961,6 +955,9 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="piType"> <widget class="QLabel" name="piType">
<property name="toolTip">
<string>Program type</string>
</property>
<property name="text"> <property name="text">
<string>None</string> <string>None</string>
</property> </property>
@ -968,6 +965,9 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="piCoverage"> <widget class="QLabel" name="piCoverage">
<property name="toolTip">
<string>Program coverage</string>
</property>
<property name="text"> <property name="text">
<string>Local</string> <string>Local</string>
</property> </property>
@ -985,6 +985,9 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Group 0 updated</string>
</property>
<property name="text"> <property name="text">
<string>G00</string> <string>G00</string>
</property> </property>
@ -1005,6 +1008,9 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Program Service Name</string>
</property>
<property name="text"> <property name="text">
<string>........</string> <string>........</string>
</property> </property>
@ -1025,6 +1031,9 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Traffic Announcement</string>
</property>
<property name="text"> <property name="text">
<string>TA</string> <string>TA</string>
</property> </property>
@ -1038,6 +1047,9 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Music/Speech</string>
</property>
<property name="text"> <property name="text">
<string>Music</string> <string>Music</string>
</property> </property>
@ -1051,6 +1063,9 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Mono/Stereo</string>
</property>
<property name="text"> <property name="text">
<string>Mono</string> <string>Mono</string>
</property> </property>
@ -1058,6 +1073,9 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="g00AltFrequencies"> <widget class="QLabel" name="g00AltFrequencies">
<property name="toolTip">
<string>Alternate frequencies (MHz)</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>