VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-01 16:35:22 -04:00
Code Issues Projects Releases Wiki Activity

Display actual units on Y scale amd offset displays

Browse Source
This commit is contained in:
f4exb 2015-07-12 11:25:55 +02:00
parent 1ee68103d2
commit b10cab79ae
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include-gpl/gui/glscope.h
View File

@ -59,6 +59,7 @@ public:
void setSampleRate(int sampleRate); void setSampleRate(int sampleRate);
int getSampleRate() const { return m_sampleRate; } int getSampleRate() const { return m_sampleRate; }
Mode getDataMode() const { return m_mode; }
signals: signals:
void traceSizeChanged(int); void traceSizeChanged(int);

4
include-gpl/gui/glscopegui.h
View File

@ -47,9 +47,13 @@ private:
qint32 m_ampOffset; qint32 m_ampOffset;
int m_displayGridIntensity; int m_displayGridIntensity;
static const qreal amps[11];
void applySettings(); void applySettings();
void setTimeScaleDisplay(); void setTimeScaleDisplay();
void setTimeOfsDisplay(); void setTimeOfsDisplay();
void setAmpScaleDisplay();
void setAmpOfsDisplay();
private slots: private slots:
void on_amp_valueChanged(int value); void on_amp_valueChanged(int value);

33
sdrbase/gui/glscopegui.cpp
View File

@ -8,6 +8,8 @@
#include <iostream> #include <iostream>
#include <cstdio> #include <cstdio>
const qreal GLScopeGUI::amps[11] = { 0.2, 0.1, 0.05, 0.02, 0.01, 0.005, 0.002, 0.001, 0.0005, 0.0002, 0.0001 };
GLScopeGUI::GLScopeGUI(QWidget* parent) : GLScopeGUI::GLScopeGUI(QWidget* parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::GLScopeGUI), ui(new Ui::GLScopeGUI),
@ -120,18 +122,37 @@ void GLScopeGUI::applySettings()
ui->gridIntensity->setSliderPosition(m_displayGridIntensity); ui->gridIntensity->setSliderPosition(m_displayGridIntensity);
} }
void GLScopeGUI::setAmpScaleDisplay()
{
if (m_glScope->getDataMode() == GLScope::ModeMagdBPha) {
ui->ampText->setText(tr("%1\ndB/div").arg(amps[m_amplification]*50.0, 0, 'f', 2));
} else {
ui->ampText->setText(tr("%1\n/div").arg(amps[m_amplification], 0, 'f', 4));
}
}
void GLScopeGUI::setAmpOfsDisplay()
{
if (m_glScope->getDataMode() == GLScope::ModeMagdBPha) {
ui->ampOfsText->setText(tr("%1\ndB").arg(m_ampOffset - 100.0, 0, 'f', 0));
} else if (m_glScope->getDataMode() == GLScope::ModeMagLinPha) {
ui->ampOfsText->setText(tr("%1").arg(m_ampOffset/200.0, 0, 'f', 3));
} else {
ui->ampOfsText->setText(tr("%1").arg(m_ampOffset/100.0, 0, 'f', 2));
}
}
void GLScopeGUI::on_amp_valueChanged(int value) void GLScopeGUI::on_amp_valueChanged(int value)
{ {
static qreal amps[11] = { 0.2, 0.1, 0.05, 0.02, 0.01, 0.005, 0.002, 0.001, 0.0005, 0.0002, 0.0001 };
ui->ampText->setText(tr("%1\n/div").arg(amps[value], 0, 'f', 4));
m_glScope->setAmp(0.2 / amps[value]);
m_amplification = value; m_amplification = value;
setAmpScaleDisplay();
m_glScope->setAmp(0.2 / amps[m_amplification]);
} }
void GLScopeGUI::on_ampOfs_valueChanged(int value) void GLScopeGUI::on_ampOfs_valueChanged(int value)
{ {
m_ampOffset = value; m_ampOffset = value;
ui->ampOfsText->setText(tr("%1").arg(value/100.0, 0, 'f', 2)); setAmpOfsDisplay();
m_glScope->setAmpOfs(value/100.0); // scale to [-1.0,1.0] m_glScope->setAmpOfs(value/100.0); // scale to [-1.0,1.0]
} }
@ -199,6 +220,7 @@ void GLScopeGUI::on_timeOfs_valueChanged(int value)
void GLScopeGUI::on_dataMode_currentIndexChanged(int index) void GLScopeGUI::on_dataMode_currentIndexChanged(int index)
{ {
m_displayData = index; m_displayData = index;
switch(index) { switch(index) {
case 0: // i+q case 0: // i+q
m_glScope->setMode(GLScope::ModeIQ); m_glScope->setMode(GLScope::ModeIQ);
@ -219,6 +241,9 @@ void GLScopeGUI::on_dataMode_currentIndexChanged(int index)
default: default:
break; break;
} }
setAmpScaleDisplay();
setAmpOfsDisplay();
} }
void GLScopeGUI::on_horizView_clicked() void GLScopeGUI::on_horizView_clicked()