VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Scope: make the code more straightforward

This commit is contained in:
f4exb 2018-10-25 14:50:29 +02:00
parent f43c07b9e5
commit 31398954ef
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdrgui/dsp/scopevis.cpp
View File

@ -382,32 +382,30 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
if (m_triggerState == TriggerTriggered) if (m_triggerState == TriggerTriggered)
{ {
int remainder = -1; int remainder;
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 mend = m_traceDiscreteMemory.current().current(); SampleVector::iterator mend = m_traceDiscreteMemory.current().current();
SampleVector::iterator mbegin = mend - count; SampleVector::iterator mbegin = mend - count;
if (m_traceStart) // start of trace processing if (m_traceStart) // start of trace processing
{ {
// trace back // process until begin point
if (m_maxTraceDelay > 0)
{ if (m_maxTraceDelay > 0) { // trace back
processTraces(mbegin - m_preTriggerDelay - m_maxTraceDelay, mbegin - m_preTriggerDelay, true); processTraces(mbegin - m_preTriggerDelay - m_maxTraceDelay, mbegin - m_preTriggerDelay, true);
} }
// pre-trigger if (m_preTriggerDelay > 0) { // pre-trigger
if (m_preTriggerDelay > 0) processTraces(mbegin - m_preTriggerDelay, mbegin);
{
remainder = processTraces(mbegin - m_preTriggerDelay, mbegin);
} }
// process the rest of the trace
remainder = processTraces(mbegin, mend);
m_traceStart = false; m_traceStart = false;
} }
else // process the current trace
if (remainder < 0)
{ {
// live trace
remainder = processTraces(mbegin, mend); remainder = processTraces(mbegin, mend);
} }