VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-28 13:04:17 -04:00
Code Issues Projects Releases Wiki Activity

Scope: updated documentation and fixed live rate setting when a decimation takes place

Browse Source
This commit is contained in:
f4exb
2018-10-20 10:41:49 +02:00
parent 8836b98542
commit fac0e652c4
7 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrgui/dsp/scopevis.cpp
+10 -2
View File
@@ -55,6 +55,7 @@ ScopeVis::ScopeVis(GLScope* glScope) :
m_traceStart(true),
m_sampleRate(0),
m_liveSampleRate(0),
m_liveLog2Decim(0),
m_traceDiscreteMemory(m_nbTraceMemories),
m_freeRun(true),
m_maxTraceDelay(0),
@@ -82,12 +83,19 @@ void ScopeVis::setLiveRate(int sampleRate)
m_liveSampleRate = sampleRate;
if (m_currentTraceMemoryIndex == 0) { // update only in live mode
setSampleRate(m_liveSampleRate);
setSampleRate(m_liveSampleRate/(1<<m_liveLog2Decim));
}
}
void ScopeVis::setLiveRateLog2Decim(int log2Decim)
{
m_liveLog2Decim = log2Decim;
setLiveRate(m_liveSampleRate);
}
void ScopeVis::setSampleRate(int sampleRate)
{
qDebug("ScopeVis::setSampleRate: %d S/s", sampleRate);
m_sampleRate = sampleRate;
if (m_glScope) {
@@ -861,7 +869,7 @@ bool ScopeVis::handleMessage(const Message& message)
// transition to live mode
if (m_currentTraceMemoryIndex == 0)
{
setSampleRate(m_liveSampleRate); // reset to live rate
setLiveRate(m_liveSampleRate); // reset to live rate
setTraceSize(m_liveTraceSize, true); // reset to live trace size
setPreTriggerDelay(m_livePreTriggerDelay, true); // reset to live pre-trigger delay
}