diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index 4a30d7e44..1570bc425 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -60,9 +60,6 @@ XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : ui->lpf->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); ui->lpf->setValueRange(6, (minF/1000)+1, maxF/1000); - ui->lpFIR->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); - ui->lpFIR->setValueRange(5, 1U, 56000U); - ui->ncoFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->channelNumberText->setText(tr("#%1").arg(m_XTRXInput->getChannelIndex())); @@ -280,9 +277,6 @@ void XTRXInputGUI::displaySettings() ui->lpf->setValue(m_settings.m_lpfBW / 1000); - ui->lpFIREnable->setChecked(m_settings.m_lpfFIREnable); - ui->lpFIR->setValue(m_settings.m_lpfFIRBW / 1000); - ui->gain->setValue(m_settings.m_gain); ui->gainText->setText(tr("%1").arg(m_settings.m_gain)); @@ -492,21 +486,6 @@ void XTRXInputGUI::on_lpf_changed(quint64 value) sendSettings(); } -void XTRXInputGUI::on_lpFIREnable_toggled(bool checked) -{ - m_settings.m_lpfFIREnable = checked; - sendSettings(); -} - -void XTRXInputGUI::on_lpFIR_changed(quint64 value) -{ - m_settings.m_lpfFIRBW = value * 1000; - - if (m_settings.m_lpfFIREnable) { // do not send the update if the FIR is disabled - sendSettings(); - } -} - void XTRXInputGUI::on_gainMode_currentIndexChanged(int index) { m_settings.m_gainMode = (XTRXInputSettings::GainMode) index; diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.h b/plugins/samplesource/xtrxinput/xtrxinputgui.h index 133e119c9..b4bc30d28 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.h +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.h @@ -89,8 +89,6 @@ private slots: void on_hwDecim_currentIndexChanged(int index); void on_swDecim_currentIndexChanged(int index); void on_lpf_changed(quint64 value); - void on_lpFIREnable_toggled(bool checked); - void on_lpFIR_changed(quint64 value); void on_gainMode_currentIndexChanged(int index); void on_gain_valueChanged(int value); void on_lnaGain_valueChanged(int value); diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.ui b/plugins/samplesource/xtrxinput/xtrxinputgui.ui index 416d6f7bd..aa77215d6 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.ui +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.ui @@ -142,7 +142,7 @@ - DejaVu Sans Mono + Liberation Mono 20 50 false @@ -271,7 +271,7 @@ - DejaVu Sans Mono + Liberation Mono 12 50 false @@ -512,7 +512,7 @@ - DejaVu Sans Mono + Liberation Mono 12 50 false @@ -573,7 +573,7 @@ - DejaVu Sans Mono + Liberation Mono 12 50 false @@ -595,48 +595,79 @@ - - - Enable or disable TSP digital FIR lowpass filters + + + Qt::Horizontal - - FIR - - - - - - - - 0 - 0 - - - + - 32 - 16 + 40 + 20 - - - DejaVu Sans Mono - 12 - - - - PointingHandCursor - - - Digital FIR lowpass filers bandwidth (kHz) + + + + + + LMS Pwr - - - kHz + + + + 50 + 0 + + + Power mode + + + 4 + + + + 0 - Save Max + + + + + 1 + + + + + 2 + + + + + 3 - Economy + + + + + 4 - Optimal + + + + + 5 + + + + + 6 + + + + + 7 - Perf Max + + @@ -917,89 +948,6 @@ - - - - 6 - - - - - Pwr mode - - - - - - - - 50 - 0 - - - - Power mode - - - 4 - - - - 0 - Save Max - - - - - 1 - - - - - 2 - - - - - 3 - Economy - - - - - 4 - Optimal - - - - - 5 - - - - - 6 - - - - - 7 - Perf Max - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - -