From 5ccfbb0ef1b4c99140ac9bb2da5ba0702c95a066 Mon Sep 17 00:00:00 2001
From: Edouard Griffiths <egriffiths@amadeus.com>
Date: Thu, 18 Aug 2016 13:35:11 +0200
Subject: [PATCH] Refactoring: DSD plugin: implement generic symbol
 synchrnization quality metric

---
 plugins/channel/demoddsd/dsddecoder.h    |  2 +-
 plugins/channel/demoddsd/dsddemodgui.cpp |  2 +-
 plugins/channel/demoddsd/dsddemodgui.ui  | 43 +++++++++++++++++++++---
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/plugins/channel/demoddsd/dsddecoder.h b/plugins/channel/demoddsd/dsddecoder.h
index 0cfb496ed..f3ba19f3f 100644
--- a/plugins/channel/demoddsd/dsddecoder.h
+++ b/plugins/channel/demoddsd/dsddecoder.h
@@ -41,7 +41,7 @@ public:
     int getInLevel() const { return m_decoder.getInLevel(); }
     int getCarrierPos() const { return m_decoder.getCarrierPos(); }
     int getZeroCrossingPos() const { return m_decoder.getZeroCrossingPos(); }
-    int getNumFlips() const { return m_decoder.getNumFlips(); }
+    int getSymbolSyncQuality() const { return m_decoder.getSymbolSyncQuality(); }
     int getSamplesPerSymbol() const { return m_decoder.getSamplesPerSymbol(); }
     DSDcc::DSDDecoder::DSDSyncType getSyncType() const { return m_decoder.getSyncType(); }
     DSDcc::DSDDecoder::DSDStationType getStationType() const { return m_decoder.getStationType(); }
diff --git a/plugins/channel/demoddsd/dsddemodgui.cpp b/plugins/channel/demoddsd/dsddemodgui.cpp
index 51f7b2c7f..7a4a5bb0e 100644
--- a/plugins/channel/demoddsd/dsddemodgui.cpp
+++ b/plugins/channel/demoddsd/dsddemodgui.cpp
@@ -497,7 +497,7 @@ void DSDDemodGUI::tick()
 	    ui->inLevelText->setText(QString::number(m_dsdDemod->getDecoder().getInLevel()));
         ui->inCarrierPosText->setText(QString::number(m_dsdDemod->getDecoder().getCarrierPos()));
         ui->zcPosText->setText(QString::number(m_dsdDemod->getDecoder().getZeroCrossingPos()));
-        ui->syncNumFlipsText->setText(QString::number(m_dsdDemod->getDecoder().getNumFlips()));
+        ui->symbolSyncQualityText->setText(QString::number(m_dsdDemod->getDecoder().getSymbolSyncQuality()));
 	    ui->syncText->setText(QString(m_dsdDemod->getDecoder().getFrameTypeText()));
 
 	    formatStatusText();
diff --git a/plugins/channel/demoddsd/dsddemodgui.ui b/plugins/channel/demoddsd/dsddemodgui.ui
index 2f327f519..018f29839 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>
@@ -250,7 +259,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="syncNumFlipsText">
+       <widget class="QLabel" name="symbolSyncQualityText">
         <property name="minimumSize">
          <size>
           <width>20</width>
@@ -258,7 +267,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Number of active re-synchronization symbol flips per 32 symbol period</string>
+         <string>Symbol synchronization quality (%)</string>
         </property>
         <property name="text">
          <string>00</string>
@@ -752,7 +761,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>
@@ -799,6 +817,23 @@
  </customwidgets>
  <resources>
   <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+  <include location="../../../sdrbase/resources/res.qrc"/>
  </resources>
  <connections/>
 </ui>