VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DSD demod: extend status text to 82 characters. D-Star: add locator space to status text

This commit is contained in:
f4exb 2016-09-27 19:56:42 +02:00
parent 565d5be3e1
commit 3a6f27474d
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/channel/demoddsd/dsddemodgui.cpp
View File

@ -498,9 +498,9 @@ void DSDDemodGUI::formatStatusText()
if (m_signalFormat != signalFormatDStar) if (m_signalFormat != signalFormatDStar)
{ {
// 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 // 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8
// 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0 // 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
strcpy(m_formatStatusText, "________/____>________|________>________|____________________|___/_____._"); strcpy(m_formatStatusText, "________/____>________|________>________|____________________|______ ___/_____._");
// MY UR RPT1 RPT2 Info Target // MY UR RPT1 RPT2 Info Loc Target
} }
{ {
@ -524,7 +524,7 @@ void DSDDemodGUI::formatStatusText()
memcpy(&m_formatStatusText[41], m_dsdDemod->getDecoder().getDStarDecoder().getInfoText(), 20); memcpy(&m_formatStatusText[41], m_dsdDemod->getDecoder().getDStarDecoder().getInfoText(), 20);
} }
m_formatStatusText[80] = '\0'; m_formatStatusText[82] = '\0';
m_signalFormat = signalFormatDStar; m_signalFormat = signalFormatDStar;
break; break;
case DSDcc::DSDDecoder::DSDSyncDPMR: case DSDcc::DSDDecoder::DSDSyncDPMR:
@ -537,7 +537,7 @@ void DSDDemodGUI::formatStatusText()
break; break;
case DSDcc::DSDDecoder::DSDSyncYSF: case DSDcc::DSDDecoder::DSDSyncYSF:
// 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 // 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8
// 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0 // 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
// C V2 RI 0:7 WL000|ssssssssss>dddddddddd |UUUUUUUUUU>DDDDDDDDDD|44444 // C V2 RI 0:7 WL000|ssssssssss>dddddddddd |UUUUUUUUUU>DDDDDDDDDD|44444
if (m_dsdDemod->getDecoder().getYSFDecoder().getFICHError() == DSDcc::DSDYSF::FICHNoError) if (m_dsdDemod->getDecoder().getYSFDecoder().getFICHError() == DSDcc::DSDYSF::FICHNoError)
{ {
@ -593,7 +593,7 @@ void DSDDemodGUI::formatStatusText()
break; break;
} }
m_formatStatusText[80] = '\0'; // guard m_formatStatusText[82] = '\0'; // guard
} }
void DSDDemodGUI::tick() void DSDDemodGUI::tick()

2
plugins/channel/demoddsd/dsddemodgui.h
View File

@ -94,7 +94,7 @@ private:
ChannelMarker m_channelMarker; ChannelMarker m_channelMarker;
bool m_basicSettingsShown; bool m_basicSettingsShown;
bool m_doApplySettings; bool m_doApplySettings;
char m_formatStatusText[80+1]; //!< Fixed signal format dependent status text char m_formatStatusText[82+1]; //!< Fixed signal format dependent status text
SignalFormat m_signalFormat; SignalFormat m_signalFormat;
ThreadedSampleSink* m_threadedChannelizer; ThreadedSampleSink* m_threadedChannelizer;

24
plugins/channel/demoddsd/dsddemodgui.ui
View File

@ -59,7 +59,16 @@
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
@ -818,7 +827,7 @@
<number>2</number> <number>2</number>
</property> </property>
<property name="text"> <property name="text">
<string>A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789I</string> <string>A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789I12</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -858,7 +867,16 @@
<string>Discriminator Scope</string> <string>Discriminator Scope</string>
</property> </property>
<layout class="QVBoxLayout" name="scopeContainer"> <layout class="QVBoxLayout" name="scopeContainer">
<property name="margin"> <property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item> <item>