mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-10-01 17:26:40 -04:00
Scope: make the code more straightforward
This commit is contained in:
parent
f43c07b9e5
commit
31398954ef
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user