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

SSB demod GUI: corrections to spanLog2 processing

Browse Source
This commit is contained in:
f4exb 2021-02-11 06:33:37 +01:00
parent cc8e4cec57
commit 6a6098ffe9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/channelrx/demodssb/ssbdemodgui.cpp
View File

@ -72,7 +72,10 @@ bool SSBDemodGUI::handleMessage(const Message& message)
else if (DSPConfigureAudio::match(message)) else if (DSPConfigureAudio::match(message))
{ {
qDebug("SSBDemodGUI::handleMessage: DSPConfigureAudio: %d", m_ssbDemod->getAudioSampleRate()); qDebug("SSBDemodGUI::handleMessage: DSPConfigureAudio: %d", m_ssbDemod->getAudioSampleRate());
applyBandwidths(5 - ui->spanLog2->value()); // will update spectrum details with new sample rate applyBandwidths(1 + ui->spanLog2->maximum() - ui->spanLog2->value()); // will update spectrum details with new sample rate
blockApplySettings(true);
displaySettings();
blockApplySettings(false);
return true; return true;
} }
else else
@ -123,7 +126,7 @@ void SSBDemodGUI::on_audioFlipChannels_toggled(bool flip)
void SSBDemodGUI::on_dsb_toggled(bool dsb) void SSBDemodGUI::on_dsb_toggled(bool dsb)
{ {
ui->flipSidebands->setEnabled(!dsb); ui->flipSidebands->setEnabled(!dsb);
applyBandwidths(5 - ui->spanLog2->value()); applyBandwidths(1 + ui->spanLog2->maximum() - ui->spanLog2->value());
} }
void SSBDemodGUI::on_deltaFrequency_changed(qint64 value) void SSBDemodGUI::on_deltaFrequency_changed(qint64 value)
@ -136,13 +139,14 @@ void SSBDemodGUI::on_deltaFrequency_changed(qint64 value)
void SSBDemodGUI::on_BW_valueChanged(int value) void SSBDemodGUI::on_BW_valueChanged(int value)
{ {
(void) value; (void) value;
applyBandwidths(5 - ui->spanLog2->value()); qDebug("SSBDemodGUI::on_BW_valueChanged: ui->spanLog2: %d", ui->spanLog2->value());
applyBandwidths(1 + ui->spanLog2->maximum() - ui->spanLog2->value());
} }
void SSBDemodGUI::on_lowCut_valueChanged(int value) void SSBDemodGUI::on_lowCut_valueChanged(int value)
{ {
(void) value; (void) value;
applyBandwidths(5 - ui->spanLog2->value()); applyBandwidths(1 + ui->spanLog2->maximum() - ui->spanLog2->value());
} }
void SSBDemodGUI::on_volume_valueChanged(int value) void SSBDemodGUI::on_volume_valueChanged(int value)
@ -383,6 +387,7 @@ void SSBDemodGUI::applyBandwidths(unsigned int spanLog2, bool force)
tickInterval = tickInterval == 0 ? 1 : tickInterval; tickInterval = tickInterval == 0 ? 1 : tickInterval;
qDebug() << "SSBDemodGUI::applyBandwidths:" qDebug() << "SSBDemodGUI::applyBandwidths:"
<< " s2max:" << s2max
<< " dsb: " << dsb << " dsb: " << dsb
<< " spanLog2: " << spanLog2 << " spanLog2: " << spanLog2
<< " m_spectrumRate: " << m_spectrumRate << " m_spectrumRate: " << m_spectrumRate
@ -445,7 +450,6 @@ void SSBDemodGUI::applyBandwidths(unsigned int spanLog2, bool force)
ui->lowCutText->setText(tr("%1k").arg(lwStr)); ui->lowCutText->setText(tr("%1k").arg(lwStr));
ui->BW->blockSignals(true); ui->BW->blockSignals(true);
ui->lowCut->blockSignals(true); ui->lowCut->blockSignals(true);
@ -522,7 +526,7 @@ void SSBDemodGUI::displaySettings()
ui->BW->blockSignals(true); ui->BW->blockSignals(true);
ui->dsb->setChecked(m_settings.m_dsb); ui->dsb->setChecked(m_settings.m_dsb);
ui->spanLog2->setValue(5 - m_settings.m_spanLog2); ui->spanLog2->setValue(1 + ui->spanLog2->maximum() - m_settings.m_spanLog2);
ui->BW->setValue(m_settings.m_rfBandwidth / 100.0); ui->BW->setValue(m_settings.m_rfBandwidth / 100.0);
QString s = QString::number(m_settings.m_rfBandwidth/1000.0, 'f', 1); QString s = QString::number(m_settings.m_rfBandwidth/1000.0, 'f', 1);