From e923ac571b9b8016d5ea9d6de503bb8587b7c140 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 26 Oct 2018 18:35:18 +0200 Subject: [PATCH] Scope: removed dubious code that could cause trigger bugs --- sdrgui/dsp/scopevis.cpp | 9 +++++---- sdrgui/dsp/scopevis.h | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sdrgui/dsp/scopevis.cpp b/sdrgui/dsp/scopevis.cpp index 1f9450502..115b0f03a 100644 --- a/sdrgui/dsp/scopevis.cpp +++ b/sdrgui/dsp/scopevis.cpp @@ -297,10 +297,11 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa m_traceDiscreteMemory.current().write(cbegin, end); - if (m_traceDiscreteMemory.current().absoluteFill() < m_traceSize) - { - return; // not enough samples in memory - } + // Removed in 4.2.4 may cause trigger bug + // if (m_traceDiscreteMemory.current().absoluteFill() < m_traceSize) + // { + // return; // not enough samples in memory + // } // trigger process diff --git a/sdrgui/dsp/scopevis.h b/sdrgui/dsp/scopevis.h index b76f8fb62..855aff7ca 100644 --- a/sdrgui/dsp/scopevis.h +++ b/sdrgui/dsp/scopevis.h @@ -727,8 +727,9 @@ private: { uint32_t nextMemIndex = m_currentMemIndex < (m_memSize-1) ? m_currentMemIndex+1 : 0; m_traceBackBuffers[nextMemIndex].reset(); - m_traceBackBuffers[nextMemIndex].write(m_traceBackBuffers[m_currentMemIndex].m_endPoint - m_traceSize, - m_traceBackBuffers[m_currentMemIndex].m_endPoint); + // Removed in 4.2.4 may cause trigger bug + // m_traceBackBuffers[nextMemIndex].write(m_traceBackBuffers[m_currentMemIndex].m_endPoint - m_traceSize, + // m_traceBackBuffers[m_currentMemIndex].m_endPoint); m_currentMemIndex = nextMemIndex; return m_traceBackBuffers[m_currentMemIndex]; // new trace }