VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

GLScope: fixed trace memory out of bounds when full history is not complete

Browse Source
This commit is contained in:
f4exb 2015-11-06 08:56:33 +01:00
parent 548b0602fa
commit 3eec09a01f
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/gui/glscope.h
View File

@ -103,6 +103,7 @@ private:
int m_sampleRates[16]; int m_sampleRates[16];
BitfieldIndex<m_memHistorySizeLog2> m_memTraceIndex; //!< current index of trace being written BitfieldIndex<m_memHistorySizeLog2> m_memTraceIndex; //!< current index of trace being written
BitfieldIndex<m_memHistorySizeLog2> m_memTraceHistory; //!< trace index shift into history BitfieldIndex<m_memHistorySizeLog2> m_memTraceHistory; //!< trace index shift into history
int m_memTraceIndexMax;
bool m_memTraceRecall; bool m_memTraceRecall;
std::vector<Complex> m_mathTrace; std::vector<Complex> m_mathTrace;
std::vector<Complex>* m_displayTrace; std::vector<Complex>* m_displayTrace;

15
sdrbase/gui/glscope.cpp
View File

@ -23,6 +23,7 @@ GLScope::GLScope(QWidget* parent) :
m_orientation(Qt::Horizontal), m_orientation(Qt::Horizontal),
m_memTraceIndex(0), m_memTraceIndex(0),
m_memTraceHistory(0), m_memTraceHistory(0),
m_memTraceIndexMax(0),
m_memTraceRecall(false), m_memTraceRecall(false),
m_displayTrace(&m_rawTrace[0]), m_displayTrace(&m_rawTrace[0]),
m_oldTraceSize(-1), m_oldTraceSize(-1),
@ -197,6 +198,11 @@ void GLScope::newTrace(const std::vector<Complex>& trace, int sampleRate)
m_rawTrace[m_memTraceIndex] = trace; m_rawTrace[m_memTraceIndex] = trace;
m_sampleRates[m_memTraceIndex] = sampleRate; m_sampleRates[m_memTraceIndex] = sampleRate;
if(m_memTraceIndexMax < (1<<m_memHistorySizeLog2))
{
m_memTraceIndexMax++;
}
//m_sampleRate = sampleRate; // sampleRate comes from scopeVis //m_sampleRate = sampleRate; // sampleRate comes from scopeVis
m_dataChanged = true; m_dataChanged = true;
@ -1929,9 +1935,12 @@ void GLScope::setTriggerPre(Real triggerPre)
void GLScope::setMemHistoryShift(int value) void GLScope::setMemHistoryShift(int value)
{ {
m_memTraceHistory = value; if (value < m_memTraceIndexMax)
m_configChanged = true; {
update(); m_memTraceHistory = value;
m_configChanged = true;
update();
}
} }
void GLScope::connectTimer(const QTimer& timer) void GLScope::connectTimer(const QTimer& timer)