VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-31 21:12:28 -04:00
Code Issues Projects Releases Wiki Activity

Airspy input plugin: GUI cosmetic changes

Browse Source
This commit is contained in:
f4exb 2016-03-29 16:53:15 +02:00
parent d59c9e5a95
commit 574141be6c
3 changed files with 127 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/samplesource/airspy/airspygui.cpp
View File

@ -143,8 +143,7 @@ void AirspyGui::displaySettings()
ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->dcOffset->setChecked(m_settings.m_dcBlock);
ui->iqImbalance->setChecked(m_settings.m_iqCorrection); ui->iqImbalance->setChecked(m_settings.m_iqCorrection);
ui->decimText->setText(tr("%1").arg(1<<m_settings.m_log2Decim)); ui->decim->setCurrentIndex(m_settings.m_log2Decim);
ui->decim->setValue(m_settings.m_log2Decim);
ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos); ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos);
@ -172,7 +171,7 @@ void AirspyGui::displaySampleRates()
for (int i = 0; i < m_rates.size(); i++) for (int i = 0; i < m_rates.size(); i++)
{ {
ui->sampleRate->addItem(QString("%1M").arg(QString::number(m_rates[i]/1000000.0, 'f', 3))); ui->sampleRate->addItem(QString("%1").arg(QString::number(m_rates[i]/1000000.0, 'f', 1)));
} }
} }
@ -243,12 +242,11 @@ void AirspyGui::on_mixAGC_stateChanged(int state)
sendSettings(); sendSettings();
} }
void AirspyGui::on_decim_valueChanged(int value) void AirspyGui::on_decim_currentIndexChanged(int index)
{ {
if ((value <0) || (value > 6)) if ((index <0) || (index > 6))
return; return;
ui->decimText->setText(tr("%1").arg(1<<value)); m_settings.m_log2Decim = index;
m_settings.m_log2Decim = value;
sendSettings(); sendSettings();
} }

2
plugins/samplesource/airspy/airspygui.h
View File

@ -71,7 +71,7 @@ private slots:
void on_iqImbalance_toggled(bool checked); void on_iqImbalance_toggled(bool checked);
void on_sampleRate_currentIndexChanged(int index); void on_sampleRate_currentIndexChanged(int index);
void on_biasT_stateChanged(int state); void on_biasT_stateChanged(int state);
void on_decim_valueChanged(int value); void on_decim_currentIndexChanged(int index);
void on_fcPos_currentIndexChanged(int index); void on_fcPos_currentIndexChanged(int index);
void on_lna_valueChanged(int value); void on_lna_valueChanged(int value);
void on_mix_valueChanged(int value); void on_mix_valueChanged(int value);

214
plugins/samplesource/airspy/airspygui.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>305</width> <width>320</width>
<height>304</height> <height>262</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -29,16 +29,7 @@
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<property name="leftMargin"> <property name="margin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
@ -160,7 +151,7 @@
<string>DC offset auto correction</string> <string>DC offset auto correction</string>
</property> </property>
<property name="text"> <property name="text">
<string>DC offset</string> <string>DC</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -170,17 +161,40 @@
<string>IQ imbalance auto correction</string> <string>IQ imbalance auto correction</string>
</property> </property>
<property name="text"> <property name="text">
<string>IQ imbalance</string> <string>IQ</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="corrLabal"> <widget class="QLabel" name="corrLabal">
<property name="text"> <property name="text">
<string>Auto corr</string> <string>Auto</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4">
<widget class="QCheckBox" name="biasT">
<property name="toolTip">
<string>Antenna bias ON/OFF</string>
</property>
<property name="text">
<string>Bias T</string>
</property>
</widget>
</item>
<item row="0" column="3">
<spacer name="fcPosRightSpacer">
<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> </layout>
</item> </item>
<item> <item>
@ -195,16 +209,6 @@
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<item row="0" column="2">
<widget class="QCheckBox" name="biasT">
<property name="toolTip">
<string>Antenna bias ON/OFF</string>
</property>
<property name="text">
<string>Bias T</string>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="sampleRateLabel"> <widget class="QLabel" name="sampleRateLabel">
<property name="sizePolicy"> <property name="sizePolicy">
@ -220,92 +224,103 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="sampleRate"> <widget class="QComboBox" name="sampleRate">
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Device sample rate</string> <string>Device sample rate in MS/s</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="0" column="4">
</item>
<item>
<layout class="QGridLayout" name="gridLayout_decim" columnstretch="0,0,0">
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_decim"> <widget class="QLabel" name="label_decim">
<property name="text"> <property name="text">
<string>Dec.</string> <string>Dec</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="2">
<widget class="QSlider" name="decim"> <widget class="QLabel" name="label">
<property name="text">
<string>M</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLabel" name="label_fcPos">
<property name="text">
<string>Fp</string>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QComboBox" name="decim">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Decimation factor</string> <string>Decimation factor</string>
</property> </property>
<property name="maximum"> <property name="currentIndex">
<number>6</number> <number>3</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>4</string>
</property>
</item>
<item>
<property name="text">
<string>8</string>
</property>
</item>
<item>
<property name="text">
<string>16</string>
</property>
</item>
<item>
<property name="text">
<string>32</string>
</property>
</item>
<item>
<property name="text">
<string>64</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="7">
<widget class="QLabel" name="decimText">
<property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>1</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_fcPos" columnstretch="0,0,0">
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_fcPos">
<property name="text">
<string>Fc pos</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="fcPosRightSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="fcPos"> <widget class="QComboBox" name="fcPos">
<property name="maximumSize">
<size>
<width>55</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Relative position of device center frequency</string> <string>Relative position of device center frequency</string>
</property> </property>
<property name="currentIndex">
<number>2</number>
</property>
<item> <item>
<property name="text"> <property name="text">
<string>Inf</string> <string>Inf</string>
@ -318,11 +333,24 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Cent</string> <string>Cen</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="0" column="3">
<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> </layout>
</item> </item>
<item> <item>