VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

XTRX input: removed FIR UI and changed dial fonts to match that of other plugins

This commit is contained in:
f4exb 2018-12-29 16:52:16 +01:00
parent f21dd8d6e5
commit 0200b51a74
3 changed files with 68 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/samplesource/xtrxinput/xtrxinputgui.cpp
View File

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

2
plugins/samplesource/xtrxinput/xtrxinputgui.h
View File

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

188
plugins/samplesource/xtrxinput/xtrxinputgui.ui
View File

@ -142,7 +142,7 @@
</property>
<property name="font">
<font>
<family>DejaVu Sans Mono</family>
<family>Liberation Mono</family>
<pointsize>20</pointsize>
<weight>50</weight>
<bold>false</bold>
@ -271,7 +271,7 @@
</property>
<property name="font">
<font>
<family>DejaVu Sans Mono</family>
<family>Liberation Mono</family>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
@ -512,7 +512,7 @@
</property>
<property name="font">
<font>
<family>DejaVu Sans Mono</family>
<family>Liberation Mono</family>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
@ -573,7 +573,7 @@
</property>
<property name="font">
<font>
<family>DejaVu Sans Mono</family>
<family>Liberation Mono</family>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
@ -595,48 +595,79 @@
</widget>
</item>
<item>
<widget class="ButtonSwitch" name="lpFIREnable">
<property name="toolTip">
<string>Enable or disable TSP digital FIR lowpass filters</string>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="text">
<string>FIR</string>
</property>
</widget>
</item>
<item>
<widget class="ValueDial" name="lpFIR" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="sizeHint" stdset="0">
<size>
<width>32</width>
<height>16</height>
<width>40</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<family>DejaVu Sans Mono</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="toolTip">
<string>Digital FIR lowpass filers bandwidth (kHz)</string>
</spacer>
</item>
<item>
<widget class="QLabel" name="pwrmodeLabel">
<property name="text">
<string>LMS Pwr</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lpFIRUnits">
<property name="text">
<string>kHz</string>
<widget class="QComboBox" name="pwrmode">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Power mode</string>
</property>
<property name="currentIndex">
<number>4</number>
</property>
<item>
<property name="text">
<string>0 - Save Max</string>
</property>
</item>
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>3 - Economy</string>
</property>
</item>
<item>
<property name="text">
<string>4 - Optimal</string>
</property>
</item>
<item>
<property name="text">
<string>5</string>
</property>
</item>
<item>
<property name="text">
<string>6</string>
</property>
</item>
<item>
<property name="text">
<string>7 - Perf Max</string>
</property>
</item>
</widget>
</item>
</layout>
@ -917,89 +948,6 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="pwrLayout">
<property name="topMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="pwrmodeLabel">
<property name="text">
<string>Pwr mode</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="pwrmode">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Power mode</string>
</property>
<property name="currentIndex">
<number>4</number>
</property>
<item>
<property name="text">
<string>0 - Save Max</string>
</property>
</item>
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>3 - Economy</string>
</property>
</item>
<item>
<property name="text">
<string>4 - Optimal</string>
</property>
</item>
<item>
<property name="text">
<string>5</string>
</property>
</item>
<item>
<property name="text">
<string>6</string>
</property>
</item>
<item>
<property name="text">
<string>7 - Perf Max</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">