VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 05:22:25 -04:00
Code Issues Projects Releases Wiki Activity

Scope GUI: show currently displayed trace sample rate

Browse Source
This commit is contained in:
f4exb 2016-04-01 05:29:54 +02:00
parent 8eb29d9ce0
commit bbfa4dfd17
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrbase/gui/glscopegui.cpp
View File

@ -485,6 +485,7 @@ void GLScopeGUI::on_scope_traceSizeChanged(int)
void GLScopeGUI::on_scope_sampleRateChanged(int) void GLScopeGUI::on_scope_sampleRateChanged(int)
{ {
m_sampleRate = m_glScope->getSampleRate(); m_sampleRate = m_glScope->getSampleRate();
ui->sampleRateText->setText(tr("%1\nkS/s").arg(m_sampleRate / 1000.0f, 0, 'f', 2));
setTimeScaleDisplay(); setTimeScaleDisplay();
setTraceLenDisplay(); setTraceLenDisplay();
setTimeOfsDisplay(); setTimeOfsDisplay();
@ -796,6 +797,7 @@ void GLScopeGUI::on_memIndex_valueChanged(int value)
ui->trigLevelFine->setDisabled(value != 0); ui->trigLevelFine->setDisabled(value != 0);
ui->trigDelay->setDisabled(value != 0); ui->trigDelay->setDisabled(value != 0);
ui->trigPre->setDisabled(value != 0); ui->trigPre->setDisabled(value != 0);
// Set value
m_glScope->setMemHistoryShift(value); m_glScope->setMemHistoryShift(value);
emit traceMemoryChanged(value); emit traceMemoryChanged(value);
} }

42
sdrbase/gui/glscopegui.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>583</width> <width>656</width>
<height>118</height> <height>214</height>
</rect> </rect>
</property> </property>
<property name="font"> <property name="font">
@ -23,16 +23,7 @@
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -411,6 +402,33 @@
</property> </property>
</widget> </widget>
</item> </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> </layout>
</item> </item>
<item> <item>