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

DSD demod: increase length of informative text window to 80 characters. D-Star: display informative text (slow data)

This commit is contained in:
f4exb 2016-09-27 01:52:21 +02:00
parent b0ca6a7e5a
commit cf0ecfd7c3
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,7 +497,7 @@ void DSDDemodGUI::formatStatusText()
case DSDcc::DSDDecoder::DSDSyncDStarP: case DSDcc::DSDDecoder::DSDSyncDStarP:
if (m_signalFormat != signalFormatDStar) if (m_signalFormat != signalFormatDStar)
{ {
strcpy(m_formatStatusText, "RPT1: ________ RPT2: ________ YOUR: ________ MY: ________/____"); strcpy(m_formatStatusText, "R1: ________ R2: ________ UR: ________ MY: ________/____ ____________________");
} }
{ {
@ -507,20 +507,21 @@ void DSDDemodGUI::formatStatusText()
const std::string& yrSign = m_dsdDemod->getDecoder().getDStarDecoder().getYourSign(); const std::string& yrSign = m_dsdDemod->getDecoder().getDStarDecoder().getYourSign();
if (rpt1.length() > 0) { // 0 or 8 if (rpt1.length() > 0) { // 0 or 8
memcpy(&m_formatStatusText[6], rpt1.c_str(), 8); memcpy(&m_formatStatusText[4], rpt1.c_str(), 8);
} }
if (rpt2.length() > 0) { // 0 or 8 if (rpt2.length() > 0) { // 0 or 8
memcpy(&m_formatStatusText[21], rpt2.c_str(), 8); memcpy(&m_formatStatusText[17], rpt2.c_str(), 8);
} }
if (yrSign.length() > 0) { // 0 or 8 if (yrSign.length() > 0) { // 0 or 8
memcpy(&m_formatStatusText[36], yrSign.c_str(), 8); memcpy(&m_formatStatusText[30], yrSign.c_str(), 8);
} }
if (mySign.length() > 0) { // 0 or 13 if (mySign.length() > 0) { // 0 or 13
memcpy(&m_formatStatusText[49], mySign.c_str(), 13); memcpy(&m_formatStatusText[43], mySign.c_str(), 13);
} }
memcpy(&m_formatStatusText[57], m_dsdDemod->getDecoder().getDStarDecoder().getInfoText(), 20);
} }
m_formatStatusText[72] = '\0'; m_formatStatusText[80] = '\0';
m_signalFormat = signalFormatDStar; m_signalFormat = signalFormatDStar;
break; break;
case DSDcc::DSDDecoder::DSDSyncDPMR: case DSDcc::DSDDecoder::DSDSyncDPMR:
@ -589,7 +590,7 @@ void DSDDemodGUI::formatStatusText()
break; break;
} }
m_formatStatusText[72] = '\0'; // guard m_formatStatusText[80] = '\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[72+1]; //!< Fixed signal format dependent status text char m_formatStatusText[80+1]; //!< Fixed signal format dependent status text
SignalFormat m_signalFormat; SignalFormat m_signalFormat;
ThreadedSampleSink* m_threadedChannelizer; ThreadedSampleSink* m_threadedChannelizer;

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

@ -798,7 +798,7 @@
<widget class="QLabel" name="formatStatusText"> <widget class="QLabel" name="formatStatusText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>535</width> <width>595</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -818,7 +818,7 @@
<number>2</number> <number>2</number>
</property> </property>
<property name="text"> <property name="text">
<string>A123456789B123456789C123456789D123456789E123456789F123456789G123456789H1</string> <string>A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789I</string>
</property> </property>
</widget> </widget>
</item> </item>