mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-07 08:24:43 -04:00
Channel analyzer: in the scope+spectrum combo show the spectrum of the scope captured data possibly triggered and not just the free running spectrum of the channel
This commit is contained in:
@@ -30,6 +30,22 @@ void ScopeVis::configure(MessageQueue* msgQueue, TriggerChannel triggerChannel,
|
||||
|
||||
void ScopeVis::feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool positiveOnly)
|
||||
{
|
||||
if (m_triggerChannel == TriggerFreeRun) {
|
||||
m_triggerPoint = begin;
|
||||
}
|
||||
else if (m_triggerState == Triggered) {
|
||||
m_triggerPoint = begin;
|
||||
}
|
||||
else if (m_triggerState == Untriggered) {
|
||||
m_triggerPoint = end;
|
||||
}
|
||||
else if (m_triggerState == WaitForReset) {
|
||||
m_triggerPoint = end;
|
||||
}
|
||||
else {
|
||||
m_triggerPoint = begin;
|
||||
}
|
||||
|
||||
while(begin < end)
|
||||
{
|
||||
if (m_triggerChannel == TriggerFreeRun)
|
||||
@@ -62,6 +78,7 @@ void ScopeVis::feed(SampleVector::const_iterator begin, SampleVector::const_iter
|
||||
if (m_armed) {
|
||||
m_triggerState = Triggered;
|
||||
m_armed = false;
|
||||
m_triggerPoint = begin;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user