From ba67483b48608b0cc399660b98d7d7854a1418fe Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 7 Feb 2017 07:45:42 +0100 Subject: [PATCH] New scope: fix trigger (1) --- sdrbase/dsp/scopevisng.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sdrbase/dsp/scopevisng.cpp b/sdrbase/dsp/scopevisng.cpp index 794e2fdc5..f8cc2d1b8 100644 --- a/sdrbase/dsp/scopevisng.cpp +++ b/sdrbase/dsp/scopevisng.cpp @@ -242,6 +242,7 @@ void ScopeVisNG::feed(const SampleVector::const_iterator& cbegin, const SampleVe m_traceDiscreteMemory.current().m_endPoint = nbegin; m_traceDiscreteMemory.store(); // next memory trace m_traceCompleteCount = 0; + m_triggerState = TriggerUntriggered; } } @@ -271,17 +272,19 @@ bool ScopeVisNG::nextTrigger() } } - if (m_currentTriggerIndex < m_triggerConditions.size()) + if (m_currentTriggerIndex < m_triggerConditions.size() - 1) { m_currentTriggerIndex++; m_triggerState = TriggerUntriggered; // repeat operations for next trigger return true; // not final keep going } - - // now this is really finished - m_triggerState == TriggerTriggered; - m_currentTriggerIndex = 0; - return false; // final + else + { + // now this is really finished + m_triggerState = TriggerTriggered; + m_currentTriggerIndex = 0; + return false; // final + } } int ScopeVisNG::processTraces(int beginPointDelta, int endPointDelta, TraceBackBuffer& traceBuffer, bool traceBack)