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

New scope: UI cosmetic changes

This commit is contained in:
f4exb 2017-02-22 02:52:38 +01:00
parent 6bf430bc56
commit a0c3ffe5da
2 changed files with 120 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
sdrbase/gui/glscopenggui.cpp
View File

@ -790,8 +790,17 @@ void GLScopeNGGUI::setTrigCountDisplay()
void GLScopeNGGUI::setTimeScaleDisplay() void GLScopeNGGUI::setTimeScaleDisplay()
{ {
m_sampleRate = m_glScope->getSampleRate(); m_sampleRate = m_glScope->getSampleRate();
unsigned int n_samples = (m_glScope->getTraceSize() * 1.0) / (double) m_timeBase;
double t = (m_glScope->getTraceSize() * 1.0 / m_sampleRate) / (double) m_timeBase; double t = (m_glScope->getTraceSize() * 1.0 / m_sampleRate) / (double) m_timeBase;
if (n_samples < 1000) {
ui->timeText->setToolTip(tr("%1 S").arg(n_samples));
} else if (n_samples < 1000000) {
ui->timeText->setToolTip(tr("%1 kS").arg(n_samples/1000.0));
} else {
ui->timeText->setToolTip(tr("%1 MS").arg(n_samples/1000000.0));
}
if(t < 0.000001) if(t < 0.000001)
{ {
t = round(t * 100000000000.0) / 100.0; t = round(t * 100000000000.0) / 100.0;
@ -819,11 +828,11 @@ void GLScopeNGGUI::setTraceLenDisplay()
unsigned int n_samples = m_traceLenMult * ScopeVisNG::m_traceChunkSize; unsigned int n_samples = m_traceLenMult * ScopeVisNG::m_traceChunkSize;
if (n_samples < 1000) { if (n_samples < 1000) {
ui->traceLenText->setToolTip(tr("%1S").arg(n_samples)); ui->traceLenText->setToolTip(tr("%1 S").arg(n_samples));
} else if (n_samples < 1000000) { } else if (n_samples < 1000000) {
ui->traceLenText->setToolTip(tr("%1kS").arg(n_samples/1000.0)); ui->traceLenText->setToolTip(tr("%1 kS").arg(n_samples/1000.0));
} else { } else {
ui->traceLenText->setToolTip(tr("%1MS").arg(n_samples/1000000.0)); ui->traceLenText->setToolTip(tr("%1 MS").arg(n_samples/1000000.0));
} }
m_sampleRate = m_glScope->getSampleRate(); m_sampleRate = m_glScope->getSampleRate();
@ -841,16 +850,25 @@ void GLScopeNGGUI::setTraceLenDisplay()
void GLScopeNGGUI::setTimeOfsDisplay() void GLScopeNGGUI::setTimeOfsDisplay()
{ {
unsigned int n_samples = m_glScope->getTraceSize() * (m_timeOffset/100.0);
double dt = m_glScope->getTraceSize() * (m_timeOffset/100.0) / m_sampleRate; double dt = m_glScope->getTraceSize() * (m_timeOffset/100.0) / m_sampleRate;
if (n_samples < 1000) {
ui->timeOfsText->setToolTip(tr("%1 S").arg(n_samples));
} else if (n_samples < 1000000) {
ui->timeOfsText->setToolTip(tr("%1 kS").arg(n_samples/1000.0));
} else {
ui->timeOfsText->setToolTip(tr("%1 MS").arg(n_samples/1000000.0));
}
if(dt < 0.000001) if(dt < 0.000001)
ui->timeOfsText->setText(tr("%1\nns").arg(dt * 1000000000.0)); ui->timeOfsText->setText(tr("%1\nns").arg(dt * 1000000000.0, 0, 'f', 2));
else if(dt < 0.001) else if(dt < 0.001)
ui->timeOfsText->setText(tr("%1\nµs").arg(dt * 1000000.0)); ui->timeOfsText->setText(tr("%1\nµs").arg(dt * 1000000.0, 0, 'f', 2));
else if(dt < 1.0) else if(dt < 1.0)
ui->timeOfsText->setText(tr("%1\nms").arg(dt * 1000.0)); ui->timeOfsText->setText(tr("%1\nms").arg(dt * 1000.0, 0, 'f', 2));
else else
ui->timeOfsText->setText(tr("%1\ns").arg(dt * 1.0)); ui->timeOfsText->setText(tr("%1\ns").arg(dt * 1.0, 0, 'f', 2));
} }
void GLScopeNGGUI::setAmpScaleDisplay() void GLScopeNGGUI::setAmpScaleDisplay()
@ -983,40 +1001,51 @@ void GLScopeNGGUI::setTrigDelayDisplay()
unsigned int n_samples_delay = m_traceLenMult * ScopeVisNG::m_traceChunkSize * delayMult; unsigned int n_samples_delay = m_traceLenMult * ScopeVisNG::m_traceChunkSize * delayMult;
if (n_samples_delay < 1000) { if (n_samples_delay < 1000) {
ui->trigDelayText->setToolTip(tr("%1S").arg(n_samples_delay)); ui->trigDelayText->setToolTip(tr("%1 S").arg(n_samples_delay));
} else if (n_samples_delay < 1000000) { } else if (n_samples_delay < 1000000) {
ui->trigDelayText->setToolTip(tr("%1kS").arg(n_samples_delay/1000.0)); ui->trigDelayText->setToolTip(tr("%1 kS").arg(n_samples_delay/1000.0));
} else if (n_samples_delay < 1000000000) { } else if (n_samples_delay < 1000000000) {
ui->trigDelayText->setToolTip(tr("%1MS").arg(n_samples_delay/1000000.0)); ui->trigDelayText->setToolTip(tr("%1 MS").arg(n_samples_delay/1000000.0));
} else { } else {
ui->trigDelayText->setToolTip(tr("%1GS").arg(n_samples_delay/1000000000.0)); ui->trigDelayText->setToolTip(tr("%1 GS").arg(n_samples_delay/1000000000.0));
} }
m_sampleRate = m_glScope->getSampleRate(); m_sampleRate = m_glScope->getSampleRate();
double t = (n_samples_delay * 1.0f / m_sampleRate); double t = (n_samples_delay * 1.0f / m_sampleRate);
if(t < 0.000001) if(t < 0.000001)
ui->trigDelayText->setText(tr("%1\nns").arg(t * 1000000000.0, 0, 'f', 1)); ui->trigDelayText->setText(tr("%1\nns").arg(t * 1000000000.0, 0, 'f', 2));
else if(t < 0.001) else if(t < 0.001)
ui->trigDelayText->setText(tr("%1\nµs").arg(t * 1000000.0, 0, 'f', 1)); ui->trigDelayText->setText(tr("%1\nµs").arg(t * 1000000.0, 0, 'f', 2));
else if(t < 1.0) else if(t < 1.0)
ui->trigDelayText->setText(tr("%1\nms").arg(t * 1000.0, 0, 'f', 1)); ui->trigDelayText->setText(tr("%1\nms").arg(t * 1000.0, 0, 'f', 2));
else else
ui->trigDelayText->setText(tr("%1\ns").arg(t * 1.0, 0, 'f', 1)); ui->trigDelayText->setText(tr("%1\ns").arg(t * 1.0, 0, 'f', 2));
} }
void GLScopeNGGUI::setTrigPreDisplay() void GLScopeNGGUI::setTrigPreDisplay()
{ {
unsigned int n_samples_delay = m_glScope->getTraceSize() * (ui->trigPre->value()/100.0f);
double dt = m_glScope->getTraceSize() * (ui->trigPre->value()/100.0f) / m_sampleRate; double dt = m_glScope->getTraceSize() * (ui->trigPre->value()/100.0f) / m_sampleRate;
if (n_samples_delay < 1000) {
ui->trigPreText->setToolTip(tr("%1 S").arg(n_samples_delay));
} else if (n_samples_delay < 1000000) {
ui->trigPreText->setToolTip(tr("%1 kS").arg(n_samples_delay/1000.0));
} else if (n_samples_delay < 1000000000) {
ui->trigPreText->setToolTip(tr("%1 MS").arg(n_samples_delay/1000000.0));
} else {
ui->trigPreText->setToolTip(tr("%1 GS").arg(n_samples_delay/1000000000.0));
}
if(dt < 0.000001) if(dt < 0.000001)
ui->trigPreText->setText(tr("%1\nns").arg(dt * 1000000000.0f)); ui->trigPreText->setText(tr("%1\nns").arg(dt * 1000000000.0f, 0, 'f', 2));
else if(dt < 0.001) else if(dt < 0.001)
ui->trigPreText->setText(tr("%1\nµs").arg(dt * 1000000.0f)); ui->trigPreText->setText(tr("%1\nµs").arg(dt * 1000000.0f, 0, 'f', 2));
else if(dt < 1.0) else if(dt < 1.0)
ui->trigPreText->setText(tr("%1\nms").arg(dt * 1000.0f)); ui->trigPreText->setText(tr("%1\nms").arg(dt * 1000.0f, 0, 'f', 2));
else else
ui->trigPreText->setText(tr("%1\ns").arg(dt * 1.0f)); ui->trigPreText->setText(tr("%1\ns").arg(dt * 1.0f, 0, 'f', 2));
} }
void GLScopeNGGUI::changeCurrentTrace() void GLScopeNGGUI::changeCurrentTrace()

105
sdrbase/gui/glscopenggui.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>731</width> <width>758</width>
<height>120</height> <height>120</height>
</rect> </rect>
</property> </property>
@ -282,6 +282,9 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="timeLabel"> <widget class="QLabel" name="timeLabel">
<property name="toolTip">
<string>Time range</string>
</property>
<property name="text"> <property name="text">
<string>T:</string> <string>T:</string>
</property> </property>
@ -291,7 +294,7 @@
<widget class="QLabel" name="timeText"> <widget class="QLabel" name="timeText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>40</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -331,6 +334,9 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="timeOfsLabel"> <widget class="QLabel" name="timeOfsLabel">
<property name="toolTip">
<string>Time offset</string>
</property>
<property name="text"> <property name="text">
<string>O:</string> <string>O:</string>
</property> </property>
@ -340,7 +346,7 @@
<widget class="QLabel" name="timeOfsText"> <widget class="QLabel" name="timeOfsText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>40</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -377,6 +383,9 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="traceLenLabel"> <widget class="QLabel" name="traceLenLabel">
<property name="toolTip">
<string>Trace length</string>
</property>
<property name="text"> <property name="text">
<string>L:</string> <string>L:</string>
</property> </property>
@ -386,7 +395,7 @@
<widget class="QLabel" name="traceLenText"> <widget class="QLabel" name="traceLenText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>40</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -691,6 +700,9 @@ kS/s</string>
</item> </item>
<item> <item>
<widget class="QLabel" name="ampLabel"> <widget class="QLabel" name="ampLabel">
<property name="toolTip">
<string>Vertical range</string>
</property>
<property name="text"> <property name="text">
<string>A:</string> <string>A:</string>
</property> </property>
@ -705,7 +717,7 @@ kS/s</string>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Amplification value</string> <string>Vertical range value</string>
</property> </property>
<property name="text"> <property name="text">
<string>000</string> <string>000</string>
@ -718,7 +730,7 @@ kS/s</string>
<item> <item>
<widget class="QSlider" name="amp"> <widget class="QSlider" name="amp">
<property name="toolTip"> <property name="toolTip">
<string>Amplification</string> <string>Vertical range</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>10</number> <number>10</number>
@ -740,6 +752,9 @@ kS/s</string>
</item> </item>
<item> <item>
<widget class="QLabel" name="ofsLabel"> <widget class="QLabel" name="ofsLabel">
<property name="toolTip">
<string>Vertical offset</string>
</property>
<property name="text"> <property name="text">
<string>O:</string> <string>O:</string>
</property> </property>
@ -754,7 +769,7 @@ kS/s</string>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Offset value</string> <string>Vertical offset value</string>
</property> </property>
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
@ -778,7 +793,7 @@ kS/s</string>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Coarse offset</string> <string>Vertical offset coarse</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>-100</number> <number>-100</number>
@ -800,7 +815,7 @@ kS/s</string>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Fine offset</string> <string>Vertical offset fine</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>200</number> <number>200</number>
@ -824,6 +839,9 @@ kS/s</string>
</item> </item>
<item> <item>
<widget class="QLabel" name="traceDelayLabel"> <widget class="QLabel" name="traceDelayLabel">
<property name="toolTip">
<string>Trace delay</string>
</property>
<property name="text"> <property name="text">
<string>D:</string> <string>D:</string>
</property> </property>
@ -864,6 +882,9 @@ kS/s</string>
</property> </property>
<item> <item>
<widget class="QSlider" name="traceDelayCoarse"> <widget class="QSlider" name="traceDelayCoarse">
<property name="toolTip">
<string>Trace delay coarse</string>
</property>
<property name="maximum"> <property name="maximum">
<number>48</number> <number>48</number>
</property> </property>
@ -877,6 +898,9 @@ kS/s</string>
</item> </item>
<item> <item>
<widget class="QSlider" name="traceDelayFine"> <widget class="QSlider" name="traceDelayFine">
<property name="toolTip">
<string>Trace delay fine</string>
</property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>100</number>
</property> </property>
@ -897,6 +921,28 @@ kS/s</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="ClickableLabel" name="traceColor">
<property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="toolTip">
<string>Current trace color (click to change)</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item> <item>
<widget class="QCheckBox" name="zSelect"> <widget class="QCheckBox" name="zSelect">
<property name="toolTip"> <property name="toolTip">
@ -935,28 +981,6 @@ kS/s</string>
</item> </item>
</widget> </widget>
</item> </item>
<item>
<widget class="ClickableLabel" name="traceColor">
<property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="toolTip">
<string>Current trace color (click to change)</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item> <item>
<widget class="Line" name="line_15"> <widget class="Line" name="line_15">
<property name="orientation"> <property name="orientation">
@ -1005,6 +1029,12 @@ kS/s</string>
<property name="toolTip"> <property name="toolTip">
<string>Select trace memory (0 is live)</string> <string>Select trace memory (0 is live)</string>
</property> </property>
<property name="maximum">
<number>15</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -1337,6 +1367,9 @@ kS/s</string>
</item> </item>
<item> <item>
<widget class="QLabel" name="trigLevelLabel"> <widget class="QLabel" name="trigLevelLabel">
<property name="toolTip">
<string>Triger level</string>
</property>
<property name="text"> <property name="text">
<string>L:</string> <string>L:</string>
</property> </property>
@ -1418,6 +1451,9 @@ kS/s</string>
</item> </item>
<item> <item>
<widget class="QLabel" name="trigDelayLabel"> <widget class="QLabel" name="trigDelayLabel">
<property name="toolTip">
<string>Trigger delay</string>
</property>
<property name="text"> <property name="text">
<string>D:</string> <string>D:</string>
</property> </property>
@ -1427,7 +1463,7 @@ kS/s</string>
<widget class="QLabel" name="trigDelayText"> <widget class="QLabel" name="trigDelayText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>40</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1499,6 +1535,9 @@ kS/s</string>
</item> </item>
<item> <item>
<widget class="QLabel" name="trigPreLabel"> <widget class="QLabel" name="trigPreLabel">
<property name="toolTip">
<string>Pre-trigger delay</string>
</property>
<property name="text"> <property name="text">
<string>P:</string> <string>P:</string>
</property> </property>
@ -1508,7 +1547,7 @@ kS/s</string>
<widget class="QLabel" name="trigPreText"> <widget class="QLabel" name="trigPreText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>40</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>