VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-19 15:07:52 -04:00
Code Issues Projects Releases Wiki Activity

New scope: refactored processTraces prototype

Browse Source
This commit is contained in:
f4exb 2017-02-09 00:11:10 +01:00
parent 93143b0cbd
commit aed77d60a8
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sdrbase/dsp/scopevisng.cpp
View File

@ -207,27 +207,27 @@ void ScopeVisNG::processTrace(const SampleVector::const_iterator& cbegin, const
{ {
int remainder = -1; int remainder = -1;
int count = end - begin; // number of samples in traceback buffer past the current point int count = end - begin; // number of samples in traceback buffer past the current point
SampleVector::iterator nend = m_traceDiscreteMemory.current().current(); SampleVector::iterator mend = m_traceDiscreteMemory.current().current();
SampleVector::iterator nbegin = nend - count; SampleVector::iterator mbegin = mend - count;
// trace back // trace back
if ((m_traceStart) && (m_preTriggerDelay + m_maxTraceDelay > 0)) if ((m_traceStart) && (m_preTriggerDelay + m_maxTraceDelay > 0))
{ {
remainder = processTraces(count + m_preTriggerDelay + m_maxTraceDelay, count, m_traceDiscreteMemory.current(), true); remainder = processTraces(mbegin - m_preTriggerDelay - m_maxTraceDelay, mbegin, true);
m_traceStart = false; m_traceStart = false;
} }
if (remainder < 0) if (remainder < 0)
{ {
// live trace // live trace
remainder = processTraces(count, 0, m_traceDiscreteMemory.current()); remainder = processTraces(mbegin, mend);
} }
if (remainder >= 0) // finished if (remainder >= 0) // finished
{ {
nbegin = nend - remainder; mbegin = mend - remainder;
m_traceDiscreteMemory.current().m_endPoint = nbegin; m_traceDiscreteMemory.current().m_endPoint = mbegin;
m_traceDiscreteMemory.store(); // next memory trace m_traceDiscreteMemory.store(); // next memory trace
m_traceCompleteCount = 0; m_traceCompleteCount = 0;
m_triggerState = TriggerUntriggered; m_triggerState = TriggerUntriggered;
@ -235,7 +235,7 @@ void ScopeVisNG::processTrace(const SampleVector::const_iterator& cbegin, const
// process remainder recursively // process remainder recursively
if (remainder != 0) if (remainder != 0)
{ {
processTrace(nbegin, nend); processTrace(mbegin, mend);
} }
} }
} }
@ -274,10 +274,9 @@ bool ScopeVisNG::nextTrigger()
} }
} }
int ScopeVisNG::processTraces(int beginPointDelta, int endPointDelta, TraceBackBuffer& traceBuffer, bool traceBack) int ScopeVisNG::processTraces(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool traceBack)
{ {
SampleVector::iterator begin = traceBuffer.current() - beginPointDelta; SampleVector::const_iterator begin(cbegin);
SampleVector::const_iterator end = traceBuffer.current() - endPointDelta;
int shift = (m_timeOfsProMill / 1000.0) * m_traceSize; int shift = (m_timeOfsProMill / 1000.0) * m_traceSize;
while (begin < end) while (begin < end)
@ -339,7 +338,6 @@ int ScopeVisNG::processTraces(int beginPointDelta, int endPointDelta, TraceBackB
{ {
m_glScope->newTraces(&m_traces.m_traces[m_traces.currentBufferIndex()]); m_glScope->newTraces(&m_traces.m_traces[m_traces.currentBufferIndex()]);
m_traces.switchBuffer(); m_traces.switchBuffer();
traceBuffer.m_endPoint = begin;
return end - begin; // return remainder count return end - begin; // return remainder count
} }
else else

2
sdrbase/dsp/scopevisng.h
View File

@ -787,7 +787,7 @@ private:
* - if finished it returns the number of unprocessed samples left in the buffer * - if finished it returns the number of unprocessed samples left in the buffer
* - if not finished it returns -1 * - if not finished it returns -1
*/ */
int processTraces(int beginPointDelta, int endPointDelta, TraceBackBuffer& traceBuffer, bool traceBack = false); int processTraces(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool traceBack = false);
/** /**
* Get maximum trace delay * Get maximum trace delay