mirror of
https://github.com/gqrx-sdr/gqrx.git
synced 2024-09-21 18:57:10 +00:00
Remove unused widgets from FCD control.
This commit is contained in:
parent
9d3bd5251d
commit
505a97c51c
@ -123,7 +123,6 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
connect(uiDockFcdCtl, SIGNAL(lnbLoChanged(double)), this, SLOT(setLnbLo(double)));
|
||||
connect(uiDockFcdCtl, SIGNAL(lnaGainChanged(float)), SLOT(setRfGain(float)));
|
||||
connect(uiDockFcdCtl, SIGNAL(freqCorrChanged(int)), this, SLOT(setFreqCorr(int)));
|
||||
connect(uiDockFcdCtl, SIGNAL(dcCorrChanged(double,double)), this, SLOT(setDcCorr(double,double)));
|
||||
connect(uiDockFcdCtl, SIGNAL(iqCorrChanged(double,double)), this, SLOT(setIqCorr(double,double)));
|
||||
connect(uiDockRxOpt, SIGNAL(filterOffsetChanged(qint64)), this, SLOT(setFilterOffset(qint64)));
|
||||
connect(uiDockRxOpt, SIGNAL(demodSelected(int)), this, SLOT(selectDemod(int)));
|
||||
|
@ -110,42 +110,6 @@ int DockFcdCtl::freqCorr()
|
||||
}
|
||||
|
||||
|
||||
/*! \brief Set new DC offet (in-phase).
|
||||
* \param dci The new value within -1.0 ... +1.0
|
||||
*/
|
||||
void DockFcdCtl::setDci(double dci)
|
||||
{
|
||||
ui->dciSpinBox->setValue(dci);
|
||||
}
|
||||
|
||||
|
||||
/*! \brief Get current in-phase DC offset
|
||||
* \return The currect DC offset in the range -1.0 ... +1.0
|
||||
*/
|
||||
double DockFcdCtl::dci()
|
||||
{
|
||||
return ui->dciSpinBox->value();
|
||||
}
|
||||
|
||||
|
||||
/*! \brief Set new DC offet (quadrature).
|
||||
* \param dcq The new value within -1.0 ... +1.0
|
||||
*/
|
||||
void DockFcdCtl::setDcq(double dcq)
|
||||
{
|
||||
ui->dcqSpinBox->setValue(dcq);
|
||||
}
|
||||
|
||||
|
||||
/*! \brief Get current in-phase DC offset
|
||||
* \return The currect DC offset in the range -1.0 ... +1.0
|
||||
*/
|
||||
double DockFcdCtl::dcq()
|
||||
{
|
||||
return ui->dcqSpinBox->value();
|
||||
}
|
||||
|
||||
|
||||
/*! \brief Set new I/Q gain.
|
||||
* \param gain The new gain in the range -1.0 ... +1.0
|
||||
*/
|
||||
@ -219,24 +183,6 @@ void DockFcdCtl::on_freqCorrSpinBox_valueChanged(int value)
|
||||
}
|
||||
|
||||
|
||||
/*! \brief In-phase DC offset changed.
|
||||
* \param value The new offset.
|
||||
*/
|
||||
void DockFcdCtl::on_dciSpinBox_valueChanged(double value)
|
||||
{
|
||||
emit dcCorrChanged(value, ui->dcqSpinBox->value());
|
||||
}
|
||||
|
||||
|
||||
/*! \brief Quadrature DC offset changed.
|
||||
* \param value The new offset.
|
||||
*/
|
||||
void DockFcdCtl::on_dcqSpinBox_valueChanged(double value)
|
||||
{
|
||||
emit dcCorrChanged(ui->dciSpinBox->value(), value);
|
||||
}
|
||||
|
||||
|
||||
/*! \brief I/Q gain changed.
|
||||
* \param value The new I/Q gain
|
||||
*/
|
||||
@ -254,13 +200,3 @@ void DockFcdCtl::on_iqPhaseSpinBox_valueChanged(double value)
|
||||
emit iqCorrChanged(ui->iqGainSpinBox->value(), value);
|
||||
}
|
||||
|
||||
|
||||
/*! \brief Reset I/Q corrections. */
|
||||
void DockFcdCtl::on_resetButton_clicked()
|
||||
{
|
||||
// signals are emitted if new val differs from old val
|
||||
ui->dciSpinBox->setValue(0.0);
|
||||
ui->dcqSpinBox->setValue(0.0);
|
||||
ui->iqGainSpinBox->setValue(1.0);
|
||||
ui->iqPhaseSpinBox->setValue(0.0);
|
||||
}
|
||||
|
@ -40,35 +40,24 @@ public:
|
||||
void setFreqCorr(int corr);
|
||||
int freqCorr();
|
||||
|
||||
void setDci(double dci);
|
||||
double dci();
|
||||
|
||||
void setDcq(double dcq);
|
||||
double dcq();
|
||||
|
||||
void setIqGain(double gain);
|
||||
double iqGain();
|
||||
|
||||
void setIqPhase(double phase);
|
||||
double iqPhase();
|
||||
|
||||
|
||||
signals:
|
||||
void lnaGainChanged(float gain);
|
||||
void freqCorrChanged(int value);
|
||||
void lnbLoChanged(double freq_mhz);
|
||||
void dcCorrChanged(double dci, double dcq);
|
||||
void iqCorrChanged(double gain, double phase);
|
||||
|
||||
private slots:
|
||||
void on_lnbSpinBox_valueChanged(double value);
|
||||
void on_lnaComboBox_activated(const QString value_str);
|
||||
void on_freqCorrSpinBox_valueChanged(int value);
|
||||
void on_dciSpinBox_valueChanged(double value);
|
||||
void on_dcqSpinBox_valueChanged(double value);
|
||||
void on_iqGainSpinBox_valueChanged(double value);
|
||||
void on_iqPhaseSpinBox_valueChanged(double value);
|
||||
void on_resetButton_clicked();
|
||||
|
||||
private:
|
||||
Ui::DockFcdCtl *ui;
|
||||
|
@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>179</width>
|
||||
<height>348</height>
|
||||
<height>237</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="floating">
|
||||
@ -21,6 +21,12 @@
|
||||
</property>
|
||||
<widget class="QWidget" name="dockWidgetContents">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="spacing">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
@ -152,6 +158,9 @@
|
||||
<string>Corrections</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<property name="fieldGrowthPolicy">
|
||||
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="freqCorrLabel">
|
||||
<property name="text">
|
||||
@ -179,58 +188,6 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="dciLabel">
|
||||
<property name="text">
|
||||
<string>DC I</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QDoubleSpinBox" name="dciSpinBox">
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>-1.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<double>0.000030000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="dcqLabel">
|
||||
<property name="text">
|
||||
<string>DC Q</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QDoubleSpinBox" name="dcqSpinBox">
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>-1.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<double>0.000030000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="iqGainLabel">
|
||||
<property name="text">
|
||||
<string>Gain</string>
|
||||
@ -240,7 +197,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<item row="1" column="1">
|
||||
<widget class="QDoubleSpinBox" name="iqGainSpinBox">
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
@ -259,7 +216,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="iqPhaseLabel">
|
||||
<property name="text">
|
||||
<string>Phase</string>
|
||||
@ -269,7 +226,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<item row="2" column="1">
|
||||
<widget class="QDoubleSpinBox" name="iqPhaseSpinBox">
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
@ -289,145 +246,21 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="saveButton">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Save current settings</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../icons.qrc">
|
||||
<normaloff>:/icons/icons/floppy.svg</normaloff>:/icons/icons/floppy.svg</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="loadButton">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Load previously saved settings</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../icons.qrc">
|
||||
<normaloff>:/icons/icons/folder.svg</normaloff>:/icons/icons/folder.svg</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="resetButton">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Reset settings to default values</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../icons.qrc">
|
||||
<normaloff>:/icons/icons/refresh.svg</normaloff>:/icons/icons/refresh.svg</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="../icons.qrc"/>
|
||||
</resources>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
Loading…
Reference in New Issue
Block a user