mirror of
https://github.com/gqrx-sdr/gqrx.git
synced 2024-09-21 18:57:10 +00:00
Make some simplifications
This commit is contained in:
parent
3d8daa582f
commit
bb783ba5dd
@ -194,22 +194,22 @@ double CDemodOptions::getEmph(void) const
|
||||
|
||||
void CDemodOptions::setDcr(bool enabled)
|
||||
{
|
||||
ui->dcrCheckBox->setCheckState(enabled ? Qt::Checked : Qt::Unchecked);
|
||||
ui->dcrCheckBox->setChecked(enabled);
|
||||
}
|
||||
|
||||
bool CDemodOptions::getDcr(void) const
|
||||
{
|
||||
return ui->dcrCheckBox->checkState() == Qt::Checked;
|
||||
return ui->dcrCheckBox->isChecked();
|
||||
}
|
||||
|
||||
void CDemodOptions::setSyncDcr(bool enabled)
|
||||
{
|
||||
ui->syncdcrCheckBox->setCheckState(enabled ? Qt::Checked : Qt::Unchecked);
|
||||
ui->syncdcrCheckBox->setChecked(enabled);
|
||||
}
|
||||
|
||||
bool CDemodOptions::getSyncDcr(void) const
|
||||
{
|
||||
return ui->syncdcrCheckBox->checkState() == Qt::Checked;
|
||||
return ui->syncdcrCheckBox->isChecked();
|
||||
}
|
||||
|
||||
void CDemodOptions::on_maxdevSelector_activated(int index)
|
||||
|
@ -472,13 +472,13 @@ void DockRxOpt::readSettings(QSettings *settings)
|
||||
if (settings->value("receiver/agc_off", false).toBool())
|
||||
ui->agcPresetCombo->setCurrentIndex(4);
|
||||
|
||||
demodOpt->setDcr(!settings->value("receiver/am_dcr_off", false).toBool());
|
||||
demodOpt->setDcr(settings->value("receiver/am_dcr", true).toBool());
|
||||
|
||||
demodOpt->setSyncDcr(!settings->value("receiver/amsync_dcr_off", false).toBool());
|
||||
demodOpt->setSyncDcr(settings->value("receiver/amsync_dcr", true).toBool());
|
||||
|
||||
int_val = settings->value("receiver/amsync_pllbw", 10).toInt(&conv_ok);
|
||||
int_val = settings->value("receiver/amsync_pllbw", 1000).toInt(&conv_ok);
|
||||
if (conv_ok)
|
||||
demodOpt->setPllBw(float(int_val) / 10000.0);
|
||||
demodOpt->setPllBw(int_val / 1.0e6);
|
||||
|
||||
int_val = MODE_AM;
|
||||
if (settings->contains("receiver/demod")) {
|
||||
@ -572,16 +572,20 @@ void DockRxOpt::saveSettings(QSettings *settings)
|
||||
settings->remove("receiver/agc_off");
|
||||
|
||||
if (!demodOpt->getDcr())
|
||||
settings->setValue("receiver/am_dcr_off", true);
|
||||
settings->setValue("receiver/am_dcr", false);
|
||||
else
|
||||
settings->remove("receiver/am_dcr_off");
|
||||
settings->remove("receiver/am_dcr");
|
||||
|
||||
if (!demodOpt->getSyncDcr())
|
||||
settings->setValue("receiver/amsync_dcr_off", true);
|
||||
settings->setValue("receiver/amsync_dcr", false);
|
||||
else
|
||||
settings->remove("receiver/amsync_dcr_off");
|
||||
int_val = currentAmsyncPll() * 10000.0;
|
||||
settings->remove("receiver/amsync_dcr");
|
||||
|
||||
int_val = qRound(currentAmsyncPll() * 1.0e6);
|
||||
if (int_val != 1000)
|
||||
settings->setValue("receiver/amsync_pllbw", int_val);
|
||||
else
|
||||
settings->remove("receiver/amsync_pllbw");
|
||||
}
|
||||
|
||||
/** RX frequency changed through spin box */
|
||||
|
Loading…
Reference in New Issue
Block a user