VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 11:12:27 -04:00
Code Issues Projects Releases Wiki Activity

ScopeVis: fixes

Browse Source
This commit is contained in:
f4exb 2021-07-12 19:37:45 +02:00
parent ede1ef0151
commit 0f146d33a6
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdrbase/dsp/scopevis.cpp
View File

@ -228,6 +228,7 @@ void ScopeVis::configure(
void ScopeVis::addTrace(const GLScopeSettings::TraceData& traceData) void ScopeVis::addTrace(const GLScopeSettings::TraceData& traceData)
{ {
qDebug() << "ScopeVis::addTrace:" qDebug() << "ScopeVis::addTrace:"
<< " m_streamIndex: " << traceData.m_streamIndex
<< " m_amp: " << traceData.m_amp << " m_amp: " << traceData.m_amp
<< " m_ofs: " << traceData.m_ofs << " m_ofs: " << traceData.m_ofs
<< " m_traceDelay: " << traceData.m_traceDelay; << " m_traceDelay: " << traceData.m_traceDelay;
@ -243,6 +244,7 @@ void ScopeVis::changeTrace(const GLScopeSettings::TraceData& traceData, uint32_t
{ {
qDebug() << "ScopeVis::changeTrace:" qDebug() << "ScopeVis::changeTrace:"
<< " trace: " << traceIndex << " trace: " << traceIndex
<< " m_streamIndex: " << traceData.m_streamIndex
<< " m_amp: " << traceData.m_amp << " m_amp: " << traceData.m_amp
<< " m_ofs: " << traceData.m_ofs << " m_ofs: " << traceData.m_ofs
<< " m_traceDelay: " << traceData.m_traceDelay; << " m_traceDelay: " << traceData.m_traceDelay;
@ -475,7 +477,7 @@ void ScopeVis::feed(const std::vector<ComplexVector::const_iterator>& vbegin, in
m_triggerLocation = nbSamples; m_triggerLocation = nbSamples;
} }
ComplexVector::const_iterator begin(vbegin[0]); // ComplexVector::const_iterator begin(vbegin[0]);
//const SampleVector::const_iterator end = vbegin[0] + nbSamples; //const SampleVector::const_iterator end = vbegin[0] + nbSamples;
int triggerPointToEnd; int triggerPointToEnd;
int remainder = nbSamples; int remainder = nbSamples;
@ -515,7 +517,7 @@ void ScopeVis::feed(const std::vector<ComplexVector::const_iterator>& vbegin, in
void ScopeVis::processMemoryTrace() void ScopeVis::processMemoryTrace()
{ {
if ((m_currentTraceMemoryIndex > 0) && (m_currentTraceMemoryIndex < GLScopeSettings::m_nbTraceMemories)) if ((m_currentTraceMemoryIndex > 0) && (m_currentTraceMemoryIndex <= m_traceDiscreteMemory.maxIndex()))
{ {
int traceMemoryIndex = m_traceDiscreteMemory.currentIndex() - m_currentTraceMemoryIndex; // actual index in memory bank int traceMemoryIndex = m_traceDiscreteMemory.currentIndex() - m_currentTraceMemoryIndex; // actual index in memory bank
@ -642,6 +644,7 @@ void ScopeVis::processTrace(const std::vector<ComplexVector::const_iterator>& vc
for (auto begin : vbegin) { for (auto begin : vbegin) {
++begin; ++begin;
} }
++processed; ++processed;
--firstRemainder; --firstRemainder;
} // look for trigger } // look for trigger
@ -1019,7 +1022,7 @@ bool ScopeVis::handleMessage(const Message& message)
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisChangeTrace& conf = (MsgScopeVisChangeTrace&) message; MsgScopeVisChangeTrace& conf = (MsgScopeVisChangeTrace&) message;
uint32_t traceIndex = conf.getTraceIndex(); uint32_t traceIndex = conf.getTraceIndex();
qDebug() << "ScopeVis::handleMessage: MsgScopeVisRemoveTrace: " << traceIndex; qDebug() << "ScopeVis::handleMessage: MsgScopeVisChangeTrace: " << traceIndex;
changeTrace(conf.getTraceData(), traceIndex); changeTrace(conf.getTraceData(), traceIndex);
return true; return true;
} }

11
sdrbase/dsp/scopevis.h
View File

@ -639,6 +639,7 @@ private:
m_traceBackBuffersStreams(nbStreams), m_traceBackBuffersStreams(nbStreams),
m_memSize(size), m_memSize(size),
m_currentMemIndex(0), m_currentMemIndex(0),
m_maxMemIndex(0),
m_traceSize(0) m_traceSize(0)
{ {
for (unsigned int s = 0; s < m_traceBackBuffersStreams.size(); s++) { for (unsigned int s = 0; s < m_traceBackBuffersStreams.size(); s++) {
@ -691,6 +692,10 @@ private:
} }
m_currentMemIndex = nextMemIndex; m_currentMemIndex = nextMemIndex;
if (m_currentMemIndex > m_maxMemIndex) {
m_maxMemIndex = m_currentMemIndex;
}
} }
/** /**
@ -698,6 +703,11 @@ private:
*/ */
uint32_t currentIndex() const { return m_currentMemIndex; } uint32_t currentIndex() const { return m_currentMemIndex; }
/**
* Return max memory index processed
*/
uint32_t maxIndex() const { return m_maxMemIndex; }
/** /**
* Serializer * Serializer
*/ */
@ -887,6 +897,7 @@ private:
std::vector<TraceBackBufferStream> m_traceBackBuffersStreams; std::vector<TraceBackBufferStream> m_traceBackBuffersStreams;
uint32_t m_memSize; uint32_t m_memSize;
uint32_t m_currentMemIndex; uint32_t m_currentMemIndex;
uint32_t m_maxMemIndex;
uint32_t m_traceSize; uint32_t m_traceSize;
TraceBackBuffer& current(uint32_t streamIndex = 0) { //!< Return trace at current memory position TraceBackBuffer& current(uint32_t streamIndex = 0) { //!< Return trace at current memory position