1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00

Channel Analyzer: let spectrum free running when in free running mode

This commit is contained in:
f4exb 2020-07-13 01:17:36 +02:00
parent d93651dedb
commit c8ec9e4ea8
2 changed files with 10 additions and 6 deletions

View File

@ -246,6 +246,7 @@ public:
virtual void stop();
virtual bool handleMessage(const Message& message);
int getTriggerLocation() const { return m_triggerLocation; }
bool getFreeRun() const { return m_freeRun; }
private:
// === messages ===

View File

@ -20,12 +20,15 @@ void SpectrumScopeComboVis::feed(const SampleVector::const_iterator& begin, cons
m_scopeVis->feed(begin, end, false);
//SampleVector::const_iterator triggerPoint = m_scopeVis->getTriggerPoint();
//m_spectrumVis->feedTriggered(triggerPoint, end, positiveOnly);
int triggerPointLocation = m_scopeVis->getTriggerLocation();
if ((triggerPointLocation >= 0) && (triggerPointLocation <= end - begin)) {
m_spectrumVis->feedTriggered(end - triggerPointLocation, end, positiveOnly);
} else {
m_spectrumVis->feedTriggered(begin, end, positiveOnly);
}
int triggerPointLocation = m_scopeVis->getTriggerLocation();
if (m_scopeVis->getFreeRun()) {
m_spectrumVis->feed(begin, end, positiveOnly);
} else if ((triggerPointLocation >= 0) && (triggerPointLocation <= end - begin)) {
m_spectrumVis->feedTriggered(end - triggerPointLocation, end, positiveOnly);
} else {
m_spectrumVis->feedTriggered(begin, end, positiveOnly);
}
}
void SpectrumScopeComboVis::start()