From 8cf4fd2f8ebc29f10076e726070fd18e37411636 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 28 Nov 2016 16:20:57 +0000 Subject: [PATCH] No longer any need for the checkbox labeled "Rx frequency offset with CQ nnn" on the Settings -> General tab. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7343 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Configuration.cpp | 6 ------ Configuration.ui | 24 ++++++++++++------------ mainwindow.cpp | 10 ++++------ 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index 22a66d268..9750e3371 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -541,7 +541,6 @@ private: bool x2ToneSpacing_; bool contestMode_; bool realTimeDecode_; - bool offsetRxFreq_; QString udp_server_name_; port_type udp_server_port_; bool accept_udp_requests_; @@ -630,7 +629,6 @@ bool Configuration::twoPass() const {return m_->twoPass_;} bool Configuration::x2ToneSpacing() const {return m_->x2ToneSpacing_;} bool Configuration::contestMode() const {return m_->contestMode_;} bool Configuration::realTimeDecode() const {return m_->realTimeDecode_;} -bool Configuration::offsetRxFreq () const {return m_->offsetRxFreq_;} bool Configuration::split_mode () const {return m_->split_mode ();} QString Configuration::udp_server_name () const {return m_->udp_server_name_;} auto Configuration::udp_server_port () const -> port_type {return m_->udp_server_port_;} @@ -1061,7 +1059,6 @@ void Configuration::impl::initialize_models () ui_->cbContestMode->setChecked(contestMode_); ui_->cbRealTime->setChecked(realTimeDecode_); ui_->cbRealTime->setVisible(false); //Tempoary -- probably will remove this control - ui_->offset_Rx_freq_check_box->setChecked(offsetRxFreq_); ui_->type_2_msg_gen_combo_box->setCurrentIndex (type_2_msg_gen_); ui_->rig_combo_box->setCurrentText (rig_params_.rig_name); ui_->TX_mode_button_group->button (data_mode_)->setChecked (true); @@ -1289,7 +1286,6 @@ void Configuration::impl::read_settings () x2ToneSpacing_ = settings_->value("x2ToneSpacing",false).toBool (); contestMode_ = settings_->value("ContestMode",false).toBool (); realTimeDecode_ = settings_->value("RealTimeDecode",false).toBool (); - offsetRxFreq_ = settings_->value("OffsetRx",false).toBool(); rig_params_.poll_interval = settings_->value ("Polling", 0).toInt (); rig_params_.split_mode = settings_->value ("SplitMode", QVariant::fromValue (TransceiverFactory::split_mode_none)).value (); udp_server_name_ = settings_->value ("UDPServer", "127.0.0.1").toString (); @@ -1389,7 +1385,6 @@ void Configuration::impl::write_settings () settings_->setValue ("x2ToneSpacing", x2ToneSpacing_); settings_->setValue ("ContestMode", contestMode_); settings_->setValue ("RealTimeDecode", realTimeDecode_); - settings_->setValue("OffsetRx",offsetRxFreq_); settings_->setValue ("UDPServer", udp_server_name_); settings_->setValue ("UDPServerPort", udp_server_port_); settings_->setValue ("AcceptUDPRequests", accept_udp_requests_); @@ -1785,7 +1780,6 @@ void Configuration::impl::accept () x2ToneSpacing_ = ui_->cbx2ToneSpacing->isChecked (); contestMode_ = ui_->cbContestMode->isChecked (); realTimeDecode_ = ui_->cbRealTime->isChecked (); - offsetRxFreq_ = ui_->offset_Rx_freq_check_box->isChecked(); frequency_calibration_intercept_ = ui_->calibration_intercept_spin_box->value (); frequency_calibration_slope_ppm_ = ui_->calibration_slope_ppm_spin_box->value (); pwrBandTxMemory_ = ui_->checkBoxPwrBandTxMemory->isChecked (); diff --git a/Configuration.ui b/Configuration.ui index 820617501..e30170c94 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2,6 +2,14 @@ configuration_dialog + + + 0 + 0 + 545 + 591 + + Settings @@ -248,13 +256,6 @@ - - - - Rx frequency offset with "CQ nnn ..." - - - @@ -2442,7 +2443,6 @@ soundcard changes tx_QSY_check_box single_decode_check_box decode_at_52s_check_box - offset_Rx_freq_check_box CW_id_interval_spin_box rig_combo_box CAT_poll_interval_spin_box @@ -2582,12 +2582,12 @@ soundcard changes - + + - - - + + diff --git a/mainwindow.cpp b/mainwindow.cpp index 35ae30cfc..c0559ce5e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3472,8 +3472,7 @@ void MainWindow::genCQMsg () { if(m_config.my_callsign().size () && m_config.my_grid().size ()) { - if (m_config.offsetRxFreq () - && ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked ()) + if (ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked ()) { msgtype ( QString {"CQ %1 %2 %3"} @@ -3553,8 +3552,7 @@ void MainWindow::genStdMsgs(QString rpt) t=hisBase + " " + m_config.my_callsign (); msgtype(t, ui->tx1); t="CQ " + m_config.my_callsign (); - if(m_config.offsetRxFreq() - && ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked()) { + if(ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked()) { msgtype ( QString {"CQ %1 %2"} .arg (m_freqNominal / 1000 - m_freqNominal / 1000000 * 1000, 3, 10, QChar {'0'}) @@ -4799,8 +4797,8 @@ void MainWindow::setXIT(int n, Frequency base) { if (m_transmitting && !m_config.tx_QSY_allowed ()) return; // If "CQ nnn ..." feature is active, set the proper Tx frequency - if(m_config.split_mode () && m_config.offsetRxFreq() - && ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked()) + if(m_config.split_mode () && ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && + ui->cbCQTx->isChecked()) { if (6 == m_ntx) {