VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 13:47:50 -04:00
Code Issues Projects Releases Wiki Activity

WDSP: fixes

Browse Source
This commit is contained in:
f4exb 2024-07-20 23:31:25 +02:00
parent f6d97efe55
commit c0aa1b0358
10 changed files with 63 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/wdsprx/wdsprxcwpeakdialog.h
View File

@ -35,7 +35,7 @@ public:
}; };
explicit WDSPRxCWPeakDialog(QWidget* parent = nullptr); explicit WDSPRxCWPeakDialog(QWidget* parent = nullptr);
~WDSPRxCWPeakDialog(); ~WDSPRxCWPeakDialog() override;
void setCWPeakFrequency(double cwPeakFrequency); void setCWPeakFrequency(double cwPeakFrequency);
void setCWBandwidth(double cwBandwidth); void setCWBandwidth(double cwBandwidth);

2
plugins/channelrx/wdsprx/wdsprxdnbdialog.h
View File

@ -39,7 +39,7 @@ public:
}; };
explicit WDSPRxDNBDialog(QWidget* parent = nullptr); explicit WDSPRxDNBDialog(QWidget* parent = nullptr);
~WDSPRxDNBDialog(); ~WDSPRxDNBDialog() override;
void setNBScheme(WDSPRxProfile::WDSPRxNBScheme scheme); void setNBScheme(WDSPRxProfile::WDSPRxNBScheme scheme);
void setNB2Mode(WDSPRxProfile::WDSPRxNB2Mode mode); void setNB2Mode(WDSPRxProfile::WDSPRxNB2Mode mode);

2
plugins/channelrx/wdsprx/wdsprxdnrdialog.h
View File

@ -38,7 +38,7 @@ public:
}; };
explicit WDSPRxDNRDialog(QWidget* parent = nullptr); explicit WDSPRxDNRDialog(QWidget* parent = nullptr);
~WDSPRxDNRDialog(); ~WDSPRxDNRDialog() override;
void setSNB(bool snb); void setSNB(bool snb);
void setNRScheme(WDSPRxProfile::WDSPRxNRScheme scheme); void setNRScheme(WDSPRxProfile::WDSPRxNRScheme scheme);

2
plugins/channelrx/wdsprx/wdsprxeqdialog.h
View File

@ -35,7 +35,7 @@ public:
}; };
explicit WDSPRxEqDialog(QWidget* parent = nullptr); explicit WDSPRxEqDialog(QWidget* parent = nullptr);
~WDSPRxEqDialog(); ~WDSPRxEqDialog() override;
void setEqF(const std::array<float, 11>& eqF); void setEqF(const std::array<float, 11>& eqF);
void setEqG(const std::array<float, 11>& eqG); void setEqG(const std::array<float, 11>& eqG);

2
plugins/channelrx/wdsprx/wdsprxfmdialog.h
View File

@ -39,7 +39,7 @@ public:
}; };
explicit WDSPRxFMDialog(QWidget* parent = nullptr); explicit WDSPRxFMDialog(QWidget* parent = nullptr);
~WDSPRxFMDialog(); ~WDSPRxFMDialog() override;
void setDeviation(double deviation); void setDeviation(double deviation);
void setAFLow(double afLow); void setAFLow(double afLow);

76
plugins/channelrx/wdsprx/wdsprxgui.cpp
View File

@ -286,6 +286,7 @@ void WDSPRxGUI::on_rit_toggled(bool checked)
void WDSPRxGUI::on_ritFrequency_valueChanged(int value) void WDSPRxGUI::on_ritFrequency_valueChanged(int value)
{ {
m_settings.m_ritFrequency = value; m_settings.m_ritFrequency = value;
m_settings.m_profiles[m_settings.m_profileIndex].m_ritFrequency = m_settings.m_ritFrequency;
ui->ritFrequencyText->setText(tr("%1").arg(value)); ui->ritFrequencyText->setText(tr("%1").arg(value));
m_channelMarker.setShift(m_settings.m_rit ? value: 0); m_channelMarker.setShift(m_settings.m_rit ? value: 0);
applySettings(); applySettings();
@ -338,7 +339,7 @@ void WDSPRxGUI::on_profileIndex_valueChanged(int value)
return; return;
} }
ui->filterIndexText->setText(tr("%1").arg(value)); ui->profileIndexText->setText(tr("%1").arg(value));
m_settings.m_profileIndex = value; m_settings.m_profileIndex = value;
// Bandwidth setup // Bandwidth setup
ui->BW->setMaximum(480); ui->BW->setMaximum(480);
@ -525,32 +526,32 @@ WDSPRxGUI::WDSPRxGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_spectrumVis->setGLSpectrum(ui->glSpectrum); m_spectrumVis->setGLSpectrum(ui->glSpectrum);
m_wdspRx->setMessageQueueToGUI(getInputMessageQueue()); m_wdspRx->setMessageQueueToGUI(getInputMessageQueue());
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute); m_audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect(const QPoint &))); connect(m_audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect(const QPoint &)));
CRightClickEnabler *agcRightClickEnabler = new CRightClickEnabler(ui->agc); m_agcRightClickEnabler = new CRightClickEnabler(ui->agc);
connect(agcRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(agcSetupDialog(const QPoint &))); connect(m_agcRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(agcSetupDialog(const QPoint &)));
CRightClickEnabler *dnbRightClickEnabler = new CRightClickEnabler(ui->dnb); m_dnbRightClickEnabler = new CRightClickEnabler(ui->dnb);
connect(dnbRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(dnbSetupDialog(const QPoint &))); connect(m_dnbRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(dnbSetupDialog(const QPoint &)));
CRightClickEnabler *dnrRightClickEnabler = new CRightClickEnabler(ui->dnr); m_dnrRightClickEnabler = new CRightClickEnabler(ui->dnr);
connect(dnrRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(dnrSetupDialog(const QPoint &))); connect(m_dnrRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(dnrSetupDialog(const QPoint &)));
CRightClickEnabler *cwPeakRightClickEnabler = new CRightClickEnabler(ui->cwPeaking); m_cwPeakRightClickEnabler = new CRightClickEnabler(ui->cwPeaking);
connect(cwPeakRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(cwPeakSetupDialog(const QPoint &))); connect(m_cwPeakRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(cwPeakSetupDialog(const QPoint &)));
CRightClickEnabler *squelchRightClickEnabler = new CRightClickEnabler(ui->squelch); m_squelchRightClickEnabler = new CRightClickEnabler(ui->squelch);
connect(squelchRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(squelchSetupDialog(const QPoint &))); connect(m_squelchRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(squelchSetupDialog(const QPoint &)));
CRightClickEnabler *equalizerRightClickEnabler = new CRightClickEnabler(ui->equalizer); m_equalizerRightClickEnabler = new CRightClickEnabler(ui->equalizer);
connect(equalizerRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(equalizerSetupDialog(const QPoint &))); connect(m_equalizerRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(equalizerSetupDialog(const QPoint &)));
CRightClickEnabler *panRightClickEnabler = new CRightClickEnabler(ui->audioBinaural); m_panRightClickEnabler = new CRightClickEnabler(ui->audioBinaural);
connect(panRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(panSetupDialog(const QPoint &))); connect(m_panRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(panSetupDialog(const QPoint &)));
CRightClickEnabler *demodRightClickEnabler = new CRightClickEnabler(ui->demod); m_demodRightClickEnabler = new CRightClickEnabler(ui->demod);
connect(demodRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(demodSetupDialog(const QPoint &))); connect(m_demodRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(demodSetupDialog(const QPoint &)));
ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03))); ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@ -610,6 +611,15 @@ WDSPRxGUI::WDSPRxGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
WDSPRxGUI::~WDSPRxGUI() WDSPRxGUI::~WDSPRxGUI()
{ {
delete ui; delete ui;
delete m_audioMuteRightClickEnabler;
delete m_agcRightClickEnabler;
delete m_dnbRightClickEnabler;
delete m_dnrRightClickEnabler;
delete m_cwPeakRightClickEnabler;
delete m_squelchRightClickEnabler;
delete m_equalizerRightClickEnabler;
delete m_panRightClickEnabler;
delete m_demodRightClickEnabler;
} }
bool WDSPRxGUI::blockApplySettings(bool block) bool WDSPRxGUI::blockApplySettings(bool block)
@ -862,10 +872,10 @@ void WDSPRxGUI::displaySettings()
ui->spanLog2->blockSignals(true); ui->spanLog2->blockSignals(true);
ui->dsb->blockSignals(true); ui->dsb->blockSignals(true);
ui->BW->blockSignals(true); ui->BW->blockSignals(true);
ui->filterIndex->blockSignals(true); ui->profileIndex->blockSignals(true);
ui->filterIndex->setValue(m_settings.m_profileIndex); ui->profileIndex->setValue(m_settings.m_profileIndex);
ui->filterIndexText->setText(tr("%1").arg(m_settings.m_profileIndex)); ui->profileIndexText->setText(tr("%1").arg(m_settings.m_profileIndex));
ui->dsb->setChecked(m_settings.m_dsb); ui->dsb->setChecked(m_settings.m_dsb);
ui->spanLog2->setValue(1 + ui->spanLog2->maximum() - m_settings.m_profiles[m_settings.m_profileIndex].m_spanLog2); ui->spanLog2->setValue(1 + ui->spanLog2->maximum() - m_settings.m_profiles[m_settings.m_profileIndex].m_spanLog2);
@ -885,7 +895,7 @@ void WDSPRxGUI::displaySettings()
ui->spanLog2->blockSignals(false); ui->spanLog2->blockSignals(false);
ui->dsb->blockSignals(false); ui->dsb->blockSignals(false);
ui->BW->blockSignals(false); ui->BW->blockSignals(false);
ui->filterIndex->blockSignals(false); ui->profileIndex->blockSignals(false);
// The only one of the four signals triggering applyBandwidths will trigger it once only with all other values // The only one of the four signals triggering applyBandwidths will trigger it once only with all other values
// set correctly and therefore validate the settings and apply them to dependent widgets // set correctly and therefore validate the settings and apply them to dependent widgets
@ -950,7 +960,7 @@ void WDSPRxGUI::agcSetup(int iValueChanged)
return; return;
} }
WDSPRxAGCDialog::ValueChanged valueChanged = (WDSPRxAGCDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxAGCDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -998,7 +1008,7 @@ void WDSPRxGUI::dnbSetup(int32_t iValueChanged)
return; return;
} }
WDSPRxDNBDialog::ValueChanged valueChanged = (WDSPRxDNBDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxDNBDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -1065,7 +1075,7 @@ void WDSPRxGUI::dnrSetup(int32_t iValueChanged)
return; return;
} }
WDSPRxDNRDialog::ValueChanged valueChanged = (WDSPRxDNRDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxDNRDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -1124,7 +1134,7 @@ void WDSPRxGUI::cwPeakSetup(int iValueChanged)
return; return;
} }
WDSPRxCWPeakDialog::ValueChanged valueChanged = (WDSPRxCWPeakDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxCWPeakDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -1187,7 +1197,7 @@ void WDSPRxGUI::amSetup(int iValueChanged)
return; return;
} }
WDSPRxAMDialog::ValueChanged valueChanged = (WDSPRxAMDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxAMDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -1207,7 +1217,7 @@ void WDSPRxGUI::fmSetup(int iValueChanged)
return; return;
} }
WDSPRxFMDialog::ValueChanged valueChanged = (WDSPRxFMDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxFMDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -1272,7 +1282,7 @@ void WDSPRxGUI::squelchSetup(int iValueChanged)
return; return;
} }
WDSPRxSquelchDialog::ValueChanged valueChanged = (WDSPRxSquelchDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxSquelchDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -1320,7 +1330,7 @@ void WDSPRxGUI::equalizerSetup(int iValueChanged)
return; return;
} }
WDSPRxEqDialog::ValueChanged valueChanged = (WDSPRxEqDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxEqDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -1357,7 +1367,7 @@ void WDSPRxGUI::panSetup(int iValueChanged)
return; return;
} }
WDSPRxPanDialog::ValueChanged valueChanged = (WDSPRxPanDialog::ValueChanged) iValueChanged; auto valueChanged = (WDSPRxPanDialog::ValueChanged) iValueChanged;
switch (valueChanged) switch (valueChanged)
{ {
@ -1424,7 +1434,7 @@ void WDSPRxGUI::makeUIConnections()
QObject::connect(ui->spanLog2, &QSlider::valueChanged, this, &WDSPRxGUI::on_spanLog2_valueChanged); QObject::connect(ui->spanLog2, &QSlider::valueChanged, this, &WDSPRxGUI::on_spanLog2_valueChanged);
QObject::connect(ui->flipSidebands, &QPushButton::clicked, this, &WDSPRxGUI::on_flipSidebands_clicked); QObject::connect(ui->flipSidebands, &QPushButton::clicked, this, &WDSPRxGUI::on_flipSidebands_clicked);
QObject::connect(ui->fftWindow, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &WDSPRxGUI::on_fftWindow_currentIndexChanged); QObject::connect(ui->fftWindow, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &WDSPRxGUI::on_fftWindow_currentIndexChanged);
QObject::connect(ui->filterIndex, &QDial::valueChanged, this, &WDSPRxGUI::on_profileIndex_valueChanged); QObject::connect(ui->profileIndex, &QDial::valueChanged, this, &WDSPRxGUI::on_profileIndex_valueChanged);
QObject::connect(ui->demod, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &WDSPRxGUI::on_demod_currentIndexChanged); QObject::connect(ui->demod, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &WDSPRxGUI::on_demod_currentIndexChanged);
QObject::connect(ui->cwPeaking, &ButtonSwitch::toggled, this, &WDSPRxGUI::on_cwPeaking_toggled); QObject::connect(ui->cwPeaking, &ButtonSwitch::toggled, this, &WDSPRxGUI::on_cwPeaking_toggled);
QObject::connect(ui->squelch, &ButtonSwitch::toggled, this, &WDSPRxGUI::on_squelch_toggled); QObject::connect(ui->squelch, &ButtonSwitch::toggled, this, &WDSPRxGUI::on_squelch_toggled);

11
plugins/channelrx/wdsprx/wdsprxgui.h
View File

@ -45,6 +45,7 @@ class WDSPRxEqDialog;
class WDSPRxPanDialog; class WDSPRxPanDialog;
class SpectrumVis; class SpectrumVis;
class BasebandSampleSink; class BasebandSampleSink;
class CRightClickEnabler;
namespace Ui { namespace Ui {
class WDSPRxGUI; class WDSPRxGUI;
@ -108,6 +109,16 @@ private:
WDSPRxEqDialog* m_equalizerDialog; WDSPRxEqDialog* m_equalizerDialog;
WDSPRxPanDialog* m_panDialog; WDSPRxPanDialog* m_panDialog;
CRightClickEnabler *m_audioMuteRightClickEnabler;
CRightClickEnabler *m_agcRightClickEnabler;
CRightClickEnabler *m_dnbRightClickEnabler;
CRightClickEnabler *m_dnrRightClickEnabler;
CRightClickEnabler *m_cwPeakRightClickEnabler;
CRightClickEnabler *m_squelchRightClickEnabler;
CRightClickEnabler *m_equalizerRightClickEnabler;
CRightClickEnabler *m_panRightClickEnabler;
CRightClickEnabler *m_demodRightClickEnabler;
QIcon m_iconDSBUSB; QIcon m_iconDSBUSB;
QIcon m_iconDSBLSB; QIcon m_iconDSBLSB;

4
plugins/channelrx/wdsprx/wdsprxgui.ui
View File

@ -278,7 +278,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QDial" name="filterIndex"> <widget class="QDial" name="profileIndex">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>24</width> <width>24</width>
@ -303,7 +303,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="filterIndexText"> <widget class="QLabel" name="profileIndexText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>10</width> <width>10</width>

2
plugins/channelrx/wdsprx/wdsprxpandialog.h
View File

@ -33,7 +33,7 @@ public:
}; };
explicit WDSPRxPanDialog(QWidget* parent = nullptr); explicit WDSPRxPanDialog(QWidget* parent = nullptr);
~WDSPRxPanDialog(); ~WDSPRxPanDialog() override;
void setPan(double pan); void setPan(double pan);
double getPan() const { return m_pan; } double getPan() const { return m_pan; }

2
plugins/channelrx/wdsprx/wdsprxsquelchdialog.h
View File

@ -36,7 +36,7 @@ public:
}; };
explicit WDSPRxSquelchDialog(QWidget* parent = nullptr); explicit WDSPRxSquelchDialog(QWidget* parent = nullptr);
~WDSPRxSquelchDialog(); ~WDSPRxSquelchDialog() override;
void setMode(WDSPRxProfile::WDSPRxSquelchMode mode); void setMode(WDSPRxProfile::WDSPRxSquelchMode mode);
void setSSQLTauMute(double value); void setSSQLTauMute(double value);