mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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

pull/575/head
f4exb 2020-07-13 01:17:36 +02:00
rodzic d93651dedb
commit c8ec9e4ea8
2 zmienionych plików z 10 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
sdrgui/dsp/scopevis.h
Wyświetl plik

@ -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 ===

15
sdrgui/dsp/spectrumscopecombovis.cpp
Wyświetl plik

@ -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()