VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-20 12:42:17 -05:00
Code Issues Projects Releases Wiki Activity

New scope: review trace outer process

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

13
sdrbase/dsp/scopevisng.cpp
View File

@ -202,14 +202,14 @@ void ScopeVisNG::processTrace(const SampleVector::const_iterator& cbegin, const
} }
} }
// trace process
if (m_triggerState == TriggerTriggered)
{
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 nend = m_traceDiscreteMemory.current().current();
SampleVector::iterator nbegin = nend - count; SampleVector::iterator nbegin = nend - count;
// trace process
if (m_triggerState == TriggerTriggered)
{
// trace back // trace back
if ((m_traceStart) && (m_preTriggerDelay + m_maxTraceDelay > 0)) if ((m_traceStart) && (m_preTriggerDelay + m_maxTraceDelay > 0))
@ -231,15 +231,14 @@ void ScopeVisNG::processTrace(const SampleVector::const_iterator& cbegin, const
m_traceDiscreteMemory.store(); // next memory trace m_traceDiscreteMemory.store(); // next memory trace
m_traceCompleteCount = 0; m_traceCompleteCount = 0;
m_triggerState = TriggerUntriggered; m_triggerState = TriggerUntriggered;
}
}
// process remainder recursively // process remainder recursively
if (remainder != 0)
if (remainder > 0)
{ {
processTrace(nbegin, nend); processTrace(nbegin, nend);
} }
}
}
} }
bool ScopeVisNG::nextTrigger() bool ScopeVisNG::nextTrigger()