From c1511d255e63e54430a41fdbc6f94ac0e3789e2d Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 21 Nov 2018 00:47:17 +0100
Subject: [PATCH] Scope: comments and fixes mostly doubling trace size so that
 enough memory is present before trigger

---
 sdrgui/dsp/scopevis.cpp | 30 +++++++++++++++++-------------
 sdrgui/dsp/scopevis.h   |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/sdrgui/dsp/scopevis.cpp b/sdrgui/dsp/scopevis.cpp
index 302b4b04f..f5abef980 100644
--- a/sdrgui/dsp/scopevis.cpp
+++ b/sdrgui/dsp/scopevis.cpp
@@ -219,6 +219,15 @@ void ScopeVis::setMemoryIndex(uint32_t memoryIndex)
 void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool positiveOnly)
 {
     (void) positiveOnly;
+
+    if (m_currentTraceMemoryIndex > 0) { // in memory mode live trace is suspended
+        return;
+    }
+
+    if (!m_mutex.tryLock(0)) { // prevent conflicts with configuration process
+        return;
+    }
+
     if (m_freeRun) {
         m_triggerPoint = cbegin;
     }
@@ -228,41 +237,36 @@ void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVect
     else if (m_triggerState == TriggerUntriggered) {
         m_triggerPoint = end;
     }
-    else if ((m_triggerWaitForReset) || (m_currentTraceMemoryIndex > 0)) {
+    else if (m_triggerWaitForReset) {
         m_triggerPoint = end;
     }
     else {
         m_triggerPoint = cbegin;
     }
 
-    if ((m_triggerWaitForReset) || (m_currentTraceMemoryIndex > 0)) {
-        return;
-    }
-
-    if(!m_mutex.tryLock(2)) // prevent conflicts with configuration process
-        return;
-
     SampleVector::const_iterator begin(cbegin);
     int triggerPointToEnd;
 
     while (begin < end)
     {
-        if (begin + m_traceSize > end)
+        if (begin + m_traceSize > end) // buffer smaller than trace size (end - bagin) < m_traceSize
         {
             triggerPointToEnd = -1;
-            processTrace(begin, end, triggerPointToEnd);
+            processTrace(begin, end, triggerPointToEnd); // use all buffer
             if (triggerPointToEnd >= 0) {
                 m_triggerPoint = end - triggerPointToEnd;
             }
-            begin = end;
+
+            begin = end; // effectively breaks out the loop
         }
-        else
+        else // trace size fits in buffer
         {
             triggerPointToEnd = -1;
-            processTrace(begin, begin + m_traceSize, triggerPointToEnd);
+            processTrace(begin, begin + m_traceSize, triggerPointToEnd); // use part of buffer to fit trace size
             if (triggerPointToEnd >= 0) {
                 m_triggerPoint = begin + m_traceSize -triggerPointToEnd;
             }
+
             begin += m_traceSize;
         }
     }
diff --git a/sdrgui/dsp/scopevis.h b/sdrgui/dsp/scopevis.h
index b00f0dcc3..34ff6a387 100644
--- a/sdrgui/dsp/scopevis.h
+++ b/sdrgui/dsp/scopevis.h
@@ -723,7 +723,7 @@ private:
 
     		for (std::vector<TraceBackBuffer>::iterator it = m_traceBackBuffers.begin(); it != m_traceBackBuffers.end(); ++it)
     		{
-                it->resize(m_traceSize); // was multiplied by 4
+                it->resize(2*m_traceSize); // was multiplied by 4
     		}
     	}