From 3a6f27474d15713e89fc374b431a3dbf8c0a4cc1 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 27 Sep 2016 19:56:42 +0200
Subject: [PATCH] DSD demod: extend status text to 82 characters. D-Star: add
 locator space to status text

---
 plugins/channel/demoddsd/dsddemodgui.cpp | 12 ++++++------
 plugins/channel/demoddsd/dsddemodgui.h   |  2 +-
 plugins/channel/demoddsd/dsddemodgui.ui  | 24 +++++++++++++++++++++---
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/plugins/channel/demoddsd/dsddemodgui.cpp b/plugins/channel/demoddsd/dsddemodgui.cpp
index df39021a9..83e01a0f3 100644
--- a/plugins/channel/demoddsd/dsddemodgui.cpp
+++ b/plugins/channel/demoddsd/dsddemodgui.cpp
@@ -498,9 +498,9 @@ void DSDDemodGUI::formatStatusText()
         if (m_signalFormat != signalFormatDStar)
         {
                                      //           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
-            strcpy(m_formatStatusText, "________/____>________|________>________|____________________|___/_____._");
-                                     // MY            UR       RPT1     RPT2     Info                 Target
+                                     // 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0..
+            strcpy(m_formatStatusText, "________/____>________|________>________|____________________|______ ___/_____._");
+                                     // MY            UR       RPT1     RPT2     Info                 Loc    Target
         }
 
         {
@@ -524,7 +524,7 @@ void DSDDemodGUI::formatStatusText()
             memcpy(&m_formatStatusText[41], m_dsdDemod->getDecoder().getDStarDecoder().getInfoText(), 20);
         }
 
-        m_formatStatusText[80] = '\0';
+        m_formatStatusText[82] = '\0';
         m_signalFormat = signalFormatDStar;
         break;
     case DSDcc::DSDDecoder::DSDSyncDPMR:
@@ -537,7 +537,7 @@ void DSDDemodGUI::formatStatusText()
         break;
     case DSDcc::DSDDecoder::DSDSyncYSF:
         //           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
     	if (m_dsdDemod->getDecoder().getYSFDecoder().getFICHError() == DSDcc::DSDYSF::FICHNoError)
     	{
@@ -593,7 +593,7 @@ void DSDDemodGUI::formatStatusText()
         break;
     }
 
-    m_formatStatusText[80] = '\0'; // guard
+    m_formatStatusText[82] = '\0'; // guard
 }
 
 void DSDDemodGUI::tick()
diff --git a/plugins/channel/demoddsd/dsddemodgui.h b/plugins/channel/demoddsd/dsddemodgui.h
index bbc72f690..ec95bb3c1 100644
--- a/plugins/channel/demoddsd/dsddemodgui.h
+++ b/plugins/channel/demoddsd/dsddemodgui.h
@@ -94,7 +94,7 @@ private:
 	ChannelMarker m_channelMarker;
 	bool m_basicSettingsShown;
 	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;
 
 	ThreadedSampleSink* m_threadedChannelizer;
diff --git a/plugins/channel/demoddsd/dsddemodgui.ui b/plugins/channel/demoddsd/dsddemodgui.ui
index b7959b3c3..2b8dfb1da 100644
--- a/plugins/channel/demoddsd/dsddemodgui.ui
+++ b/plugins/channel/demoddsd/dsddemodgui.ui
@@ -59,7 +59,16 @@
     <property name="spacing">
      <number>3</number>
     </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>
     </property>
     <item>
@@ -818,7 +827,7 @@
          <number>2</number>
         </property>
         <property name="text">
-         <string>A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789I</string>
+         <string>A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789I12</string>
         </property>
        </widget>
       </item>
@@ -858,7 +867,16 @@
     <string>Discriminator Scope</string>
    </property>
    <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>
     </property>
     <item>