Scope: removed breaking optimization thus fixing trigger. Should fix …

…issue #233
f4exb · Oct 24, 2018 · 02d0a46 · 02d0a46
1 parent ea328ca
commit 02d0a46
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp
@@ -23,7 +23,7 @@
 
 const PluginDescriptor ChannelAnalyzerPlugin::m_pluginDescriptor = {
 	QString("Channel Analyzer"),
-	QString("4.2.3"),
+	QString("4.2.4"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,

diff --git a/plugins/channelrx/demodatv/atvdemodplugin.cpp b/plugins/channelrx/demodatv/atvdemodplugin.cpp
@@ -27,7 +27,7 @@
 const PluginDescriptor ATVDemodPlugin::m_ptrPluginDescriptor =
 {
 	QString("ATV Demodulator"),
-	QString("4.2.3"),
+	QString("4.2.4"),
     QString("(c) F4HKW for F4EXB / SDRAngel"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,

diff --git a/sdrgui/dsp/scopevis.cpp b/sdrgui/dsp/scopevis.cpp
@@ -368,7 +368,7 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
                     }
                     else // this was the last trigger then start trace
                     {
-                        m_traceStart = true; // start trace processing
+                        m_traceStart = true; // start of trace processing
                         m_nbSamples = m_traceSize + m_maxTraceDelay;
                         m_triggerComparator.reset();
                         m_triggerState = TriggerTriggered;
@@ -378,15 +378,11 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
                 }
 
                 ++begin;
-            }
-        }
-    }
+            } // look for trigger
+        } // untriggered or delayed
+    } // triggering active
 
     // trace process
-    if (m_glScope->getDataChanged()) // optimization: process trace only if required by glScope
-    {
-        m_triggerState = TriggerUntriggered;
-    }
 
     if (m_triggerState == TriggerTriggered)
     {
@@ -395,7 +391,7 @@ void ScopeVis::processTrace(const SampleVector::const_iterator& cbegin, const Sa
         SampleVector::iterator mend = m_traceDiscreteMemory.current().current();
         SampleVector::iterator mbegin = mend - count;
 
-        if (m_traceStart)
+        if (m_traceStart) // start of trace processing
         {
             // trace back
             if (m_maxTraceDelay > 0)