VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-04-04 02:28:33 -04:00
Code Issues Projects Releases Wiki Activity

New scope: interim state (8)

Browse Source
This commit is contained in:
f4exb 2017-02-05 13:26:07 +01:00
parent 44e764f492
commit 0f5c055eca
6 changed files with 81 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdrbase/dsp/scopevisng.cpp
View File

@ -78,6 +78,7 @@ void ScopeVisNG::addTrace(const TraceData& traceData)
void ScopeVisNG::changeTrace(const TraceData& traceData, uint32_t traceIndex)
{
qDebug("ScopeVisNG::changeTrace: trace #%d", traceIndex);
Message* cmd = MsgScopeVisNGChangeTrace::create(traceData, traceIndex);
getInputMessageQueue()->push(cmd);
}
@ -472,6 +473,8 @@ bool ScopeVisNG::handleMessage(const Message& message)
m_traces[traceIndex].setData(conf.getTraceData());
}
m_glScope->updateDisplay();
return true;
}
else if (MsgScopeVisNGRemoveTrace::match(message))

8
sdrbase/gui/glscopeng.cpp
View File

@ -67,6 +67,7 @@ void GLScopeNG::addTrace(ScopeVisNG::DisplayTrace *trace)
{
m_traces.push_back(trace);
m_configChanged = true;
update();
}
void GLScopeNG::removeTrace(int index)
@ -76,6 +77,7 @@ void GLScopeNG::removeTrace(int index)
}
m_configChanged = true;
update();
}
void GLScopeNG::setDisplayGridIntensity(int intensity)
@ -373,6 +375,12 @@ void GLScopeNG::setTraceSize(int traceSize)
update();
}
void GLScopeNG::updateDisplay()
{
m_configChanged = true;
update();
}
void GLScopeNG::applyConfig()
{
m_configChanged = false;

1
sdrbase/gui/glscopeng.h
View File

@ -65,6 +65,7 @@ public:
void setHighlightedTraceIndex(uint32_t traceIndex);
void setDisplayMode(DisplayMode displayMode);
void setTraceSize(int trceSize);
void updateDisplay();
void setDisplayGridIntensity(int intensity);
void setDisplayTraceIntensity(int intensity);

69
sdrbase/gui/glscopenggui.cpp
View File

@ -33,14 +33,9 @@ GLScopeNGGUI::GLScopeNGGUI(QWidget* parent) :
m_timeBase(1),
m_timeOffset(0)
{
ui->setupUi(this);
qDebug("GLScopeNGGUI::GLScopeNGGUI");
setEnabled(false);
ui->traceMode->clear();
fillProjectionCombo(ui->traceMode);
ui->trigMode->clear();
fillProjectionCombo(ui->trigMode);
ui->setupUi(this);
}
GLScopeNGGUI::~GLScopeNGGUI()
@ -50,6 +45,8 @@ GLScopeNGGUI::~GLScopeNGGUI()
void GLScopeNGGUI::setBuddies(MessageQueue* messageQueue, ScopeVisNG* scopeVis, GLScopeNG* glScope)
{
qDebug("GLScopeNGGUI::setBuddies");
m_messageQueue = messageQueue;
m_scopeVis = scopeVis;
m_glScope = glScope;
@ -81,12 +78,19 @@ void GLScopeNGGUI::setBuddies(MessageQueue* messageQueue, ScopeVisNG* scopeVis,
setEnabled(true);
connect(m_glScope, SIGNAL(sampleRateChanged(int)), this, SLOT(on_scope_sampleRateChanged(int)));
ui->traceMode->clear();
fillProjectionCombo(ui->traceMode);
ui->trigMode->clear();
fillProjectionCombo(ui->trigMode);
m_scopeVis->configure(2*m_traceLenMult*ScopeVisNG::m_traceChunkSize, m_timeOffset*10);
m_scopeVis->configure(m_traceLenMult*ScopeVisNG::m_traceChunkSize, m_timeOffset*10);
setTraceLenDisplay();
setTimeScaleDisplay();
setTimeOfsDisplay();
setAmpScaleDisplay();
}
void GLScopeNGGUI::setSampleRate(int sampleRate)
@ -237,6 +241,18 @@ void GLScopeNGGUI::on_traceLen_valueChanged(int value)
setTimeOfsDisplay();
}
void GLScopeNGGUI::on_traceMode_currentIndexChanged(int index)
{
setAmpScaleDisplay();
changeCurrentTrace();
}
void GLScopeNGGUI::on_amp_valueChanged(int value)
{
setAmpScaleDisplay();
changeCurrentTrace();
}
void GLScopeNGGUI::setTimeScaleDisplay()
{
m_sampleRate = m_glScope->getSampleRate();
@ -303,6 +319,45 @@ void GLScopeNGGUI::setTimeOfsDisplay()
ui->timeOfsText->setText(tr("%1\ns").arg(dt * 1.0));
}
void GLScopeNGGUI::setAmpScaleDisplay()
{
ScopeVisNG::ProjectionType projectionType = (ScopeVisNG::ProjectionType) ui->traceMode->currentIndex();
float ampValue = amps[ui->amp->value()];
if (projectionType == ScopeVisNG::ProjectionMagDB)
{
float displayValue = ampValue*500.0f;
if (displayValue < 10.0f) {
ui->ampText->setText(tr("%1\ndB").arg(displayValue, 0, 'f', 2));
}
else {
ui->ampText->setText(tr("%1\ndB").arg(displayValue, 0, 'f', 1));
}
}
else
{
qreal a = ampValue*10.0f;
if(a < 0.000001)
ui->ampText->setText(tr("%1\nn").arg(a * 1000000000.0));
else if(a < 0.001)
ui->ampText->setText(tr("%1\nµ").arg(a * 1000000.0));
else if(a < 1.0)
ui->ampText->setText(tr("%1\nm").arg(a * 1000.0));
else
ui->ampText->setText(tr("%1").arg(a * 1.0));
}
}
void GLScopeNGGUI::changeCurrentTrace()
{
ScopeVisNG::TraceData traceData;
fillTraceData(traceData);
uint32_t currentTraceIndex = ui->trace->value();
m_scopeVis->changeTrace(traceData, currentTraceIndex);
}
void GLScopeNGGUI::fillProjectionCombo(QComboBox* comboBox)
{
comboBox->addItem("Real", ScopeVisNG::ProjectionReal);

5
sdrbase/gui/glscopenggui.h
View File

@ -67,6 +67,9 @@ private:
void setTimeScaleDisplay();
void setTraceLenDisplay();
void setTimeOfsDisplay();
void setAmpScaleDisplay();
void changeCurrentTrace();
void fillTraceData(ScopeVisNG::TraceData& traceData);
void fillTriggerData(ScopeVisNG::TriggerData& triggerData);
@ -85,6 +88,8 @@ private slots:
void on_time_valueChanged(int value);
void on_timeOfs_valueChanged(int value);
void on_traceLen_valueChanged(int value);
void on_traceMode_currentIndexChanged(int index);
void on_amp_valueChanged(int value);
};

4
sdrbase/gui/glscopenggui.ui
View File

@ -643,7 +643,7 @@ kS/s</string>
<widget class="QComboBox" name="traceMode">
<property name="maximumSize">
<size>
<width>56</width>
<width>65</width>
<height>16777215</height>
</size>
</property>
@ -1149,7 +1149,7 @@ kS/s</string>
<widget class="QComboBox" name="trigMode">
<property name="maximumSize">
<size>
<width>56</width>
<width>65</width>
<height>16777215</height>
</size>
</property>