From ac5a53ac3ca69b73a5f8469087a544e223e231fa Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 12 Nov 2020 10:45:08 +0100 Subject: [PATCH] Fixed spectrum REST API for GUI flavor: Use DeviceSet spectrum vis --- sdrgui/device/deviceuiset.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index 56a8c5d53..32d843db1 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -39,18 +39,8 @@ DeviceUISet::DeviceUISet(int tabIndex, DeviceSet *deviceSet, int deviceType, QTimer& timer) { m_spectrum = new GLSpectrum; - - if ((deviceType == 0) || (deviceType == 2)) // Single Rx or MIMO - { - m_spectrumVis = new SpectrumVis(SDR_RX_SCALEF); - m_spectrumVis->setGLSpectrum(m_spectrum); - } - else if (deviceType == 1) // Single Tx - { - m_spectrumVis = new SpectrumVis(SDR_TX_SCALEF); - m_spectrumVis->setGLSpectrum(m_spectrum); - } - + m_spectrumVis = deviceSet->m_spectrumVis; + m_spectrumVis->setGLSpectrum(m_spectrum); m_spectrum->connectTimer(timer); m_spectrumGUI = new GLSpectrumGUI; m_spectrumGUI->setBuddies(m_spectrumVis, m_spectrum); @@ -77,7 +67,6 @@ DeviceUISet::~DeviceUISet() { delete m_channelWindow; delete m_spectrumGUI; - delete m_spectrumVis; delete m_spectrum; }