VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 21:42:26 -04:00
Code Issues Projects Releases Wiki Activity

Scope: removed breaking optimization thus fixing trigger. Should fix issue #233

Browse Source
This commit is contained in:
f4exb 2018-10-24 13:54:33 +02:00
parent ea328ca85e
commit 02d0a46f31
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/chanalyzer/chanalyzerplugin.cpp
View File

@ -23,7 +23,7 @@
const PluginDescriptor ChannelAnalyzerPlugin::m_pluginDescriptor = { const PluginDescriptor ChannelAnalyzerPlugin::m_pluginDescriptor = {
QString("Channel Analyzer"), QString("Channel Analyzer"),
QString("4.2.3"), QString("4.2.4"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

2
plugins/channelrx/demodatv/atvdemodplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor ATVDemodPlugin::m_ptrPluginDescriptor = const PluginDescriptor ATVDemodPlugin::m_ptrPluginDescriptor =
{ {
QString("ATV Demodulator"), QString("ATV Demodulator"),
QString("4.2.3"), QString("4.2.4"),
QString("(c) F4HKW for F4EXB / SDRAngel"), QString("(c) F4HKW for F4EXB / SDRAngel"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

14
sdrgui/dsp/scopevis.cpp
View File

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