From bbfa4dfd17209a3a26fb71bb86e377cb7443d6a6 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 1 Apr 2016 05:29:54 +0200
Subject: [PATCH] Scope GUI: show currently displayed trace sample rate

---
 sdrbase/gui/glscopegui.cpp |  2 ++
 sdrbase/gui/glscopegui.ui  | 42 +++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/sdrbase/gui/glscopegui.cpp b/sdrbase/gui/glscopegui.cpp
index 4fe9721c5..6b2053a0e 100644
--- a/sdrbase/gui/glscopegui.cpp
+++ b/sdrbase/gui/glscopegui.cpp
@@ -485,6 +485,7 @@ void GLScopeGUI::on_scope_traceSizeChanged(int)
 void GLScopeGUI::on_scope_sampleRateChanged(int)
 {
 	m_sampleRate = m_glScope->getSampleRate();
+	ui->sampleRateText->setText(tr("%1\nkS/s").arg(m_sampleRate / 1000.0f, 0, 'f', 2));
 	setTimeScaleDisplay();
 	setTraceLenDisplay();
 	setTimeOfsDisplay();
@@ -796,6 +797,7 @@ void GLScopeGUI::on_memIndex_valueChanged(int value)
 		ui->trigLevelFine->setDisabled(value != 0);
 		ui->trigDelay->setDisabled(value != 0);
 		ui->trigPre->setDisabled(value != 0);
+		// Set value
 		m_glScope->setMemHistoryShift(value);
 		emit traceMemoryChanged(value);
 	}
diff --git a/sdrbase/gui/glscopegui.ui b/sdrbase/gui/glscopegui.ui
index c99920812..25a31d419 100644
--- a/sdrbase/gui/glscopegui.ui
+++ b/sdrbase/gui/glscopegui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>583</width>
-    <height>118</height>
+    <width>656</width>
+    <height>214</height>
    </rect>
   </property>
   <property name="font">
@@ -23,16 +23,7 @@
    <property name="spacing">
     <number>3</number>
    </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
@@ -411,6 +402,33 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="sampleRateText">
+       <property name="minimumSize">
+        <size>
+         <width>52</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Currently displayed trace sample rate (kS/s)</string>
+       </property>
+       <property name="text">
+        <string>00000.00
+kS/s</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>