kopia lustrzana https://github.com/f4exb/sdrangel
New scope: review trace outer process
rodzic
e3b933350c
commit
93143b0cbd
|
@ -202,14 +202,14 @@ void ScopeVisNG::processTrace(const SampleVector::const_iterator& cbegin, const
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int remainder = -1;
|
|
||||||
int count = end - begin; // number of samples in traceback buffer past the current point
|
|
||||||
SampleVector::iterator nend = m_traceDiscreteMemory.current().current();
|
|
||||||
SampleVector::iterator nbegin = nend - count;
|
|
||||||
|
|
||||||
// trace process
|
// trace process
|
||||||
if (m_triggerState == TriggerTriggered)
|
if (m_triggerState == TriggerTriggered)
|
||||||
{
|
{
|
||||||
|
int remainder = -1;
|
||||||
|
int count = end - begin; // number of samples in traceback buffer past the current point
|
||||||
|
SampleVector::iterator nend = m_traceDiscreteMemory.current().current();
|
||||||
|
SampleVector::iterator nbegin = nend - count;
|
||||||
|
|
||||||
// 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
|
||||||
|
if (remainder != 0)
|
||||||
|
{
|
||||||
|
processTrace(nbegin, nend);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// process remainder recursively
|
|
||||||
|
|
||||||
if (remainder > 0)
|
|
||||||
{
|
|
||||||
processTrace(nbegin, nend);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ScopeVisNG::nextTrigger()
|
bool ScopeVisNG::nextTrigger()
|
||||||
|
|
Ładowanie…
Reference in New Issue