From dfb8dc7422a8a16bfe0b883d7393497281ca6720 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 10 Mar 2016 15:13:06 +0000 Subject: [PATCH] Add a "Single decode" checkbox. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6516 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Configuration.cpp | 6 ++++++ Configuration.hpp | 1 + Configuration.ui | 51 +++++++++++++++++++++++++-------------------- lib/jt65_decode.f90 | 1 + mainwindow.cpp | 2 ++ 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index 312eea7fb..e2ec754e7 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -544,6 +544,7 @@ private: bool TX_messages_; bool enable_VHF_features_; bool decode_at_52s_; + bool single_decode_; bool twoPass_; bool sync1Bit_; bool MyDx_; @@ -626,6 +627,7 @@ bool Configuration::watchdog () const {return m_->watchdog_;} bool Configuration::TX_messages () const {return m_->TX_messages_;} bool Configuration::enable_VHF_features () const {return m_->enable_VHF_features_;} bool Configuration::decode_at_52s () const {return m_->decode_at_52s_;} +bool Configuration::single_decode () const {return m_->single_decode_;} bool Configuration::twoPass() const {return m_->twoPass_;} bool Configuration::sync1Bit() const {return m_->sync1Bit_;} bool Configuration::MyDx() const {return m_->MyDx_;} @@ -1075,6 +1077,7 @@ void Configuration::impl::initialize_models () ui_->TX_messages_check_box->setChecked (TX_messages_); ui_->enable_VHF_features_check_box->setChecked(enable_VHF_features_); ui_->decode_at_52s_check_box->setChecked(decode_at_52s_); + ui_->single_decode_check_box->setChecked(single_decode_); ui_->cbTwoPass->setChecked(twoPass_); ui_->cbSync1Bit->setChecked(sync1Bit_); ui_->cbMyDx->setChecked(MyDx_); @@ -1303,6 +1306,7 @@ void Configuration::impl::read_settings () TX_messages_ = settings_->value ("Tx2QSO", true).toBool (); enable_VHF_features_ = settings_->value("VHFUHF",false).toBool (); decode_at_52s_ = settings_->value("Decode52",false).toBool (); + single_decode_ = settings_->value("SingleDecode",false).toBool (); twoPass_ = settings_->value("TwoPass",true).toBool (); sync1Bit_ = settings_->value("Sync1Bit",false).toBool (); MyDx_ = settings_->value("MyDx",false).toBool (); @@ -1404,6 +1408,7 @@ void Configuration::impl::write_settings () settings_->setValue ("ResetSplitOnExit", reset_split_); settings_->setValue ("VHFUHF", enable_VHF_features_); settings_->setValue ("Decode52", decode_at_52s_); + settings_->setValue ("SingleDecode", single_decode_); settings_->setValue ("TwoPass", twoPass_); settings_->setValue ("Sync1Bit", sync1Bit_); settings_->setValue ("MyDx", MyDx_); @@ -1795,6 +1800,7 @@ void Configuration::impl::accept () azel_directory_ = ui_->azel_path_display_label->text (); enable_VHF_features_ = ui_->enable_VHF_features_check_box->isChecked (); decode_at_52s_ = ui_->decode_at_52s_check_box->isChecked (); + single_decode_ = ui_->single_decode_check_box->isChecked (); twoPass_ = ui_->cbTwoPass->isChecked (); sync1Bit_ = ui_->cbSync1Bit->isChecked (); MyDx_ = ui_->cbMyDx->isChecked (); diff --git a/Configuration.hpp b/Configuration.hpp index 68ac18160..099d31e69 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -114,6 +114,7 @@ public: bool split_mode () const; bool enable_VHF_features () const; bool decode_at_52s () const; + bool single_decode () const; bool twoPass() const; bool sync1Bit() const; bool MyDx() const; diff --git a/Configuration.ui b/Configuration.ui index b34ca57be..a8db0d077 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -249,6 +249,30 @@ Behavior + + + + Enable VHF/UHF/Microwave features + + + + + + + Rx frequency offset with "CQ nnn ..." + + + + + + + <html><head/><body><p>Check this if you wish to automatically return to the last monitored frequency when monitor is enabled, leave it unchecked if you wish to have the current rig frequency maintained.</p></body></html> + + + Monitor returns to last used frequency + + + @@ -352,16 +376,6 @@ quiet period when decoding is done. - - - - <html><head/><body><p>Check this if you wish to automatically return to the last monitored frequency when monitor is enabled, leave it unchecked if you wish to have the current rig frequency maintained.</p></body></html> - - - Monitor returns to last used frequency - - - @@ -372,13 +386,6 @@ quiet period when decoding is done. - - - - Enable VHF/UHF/Microwave features - - - @@ -386,10 +393,10 @@ quiet period when decoding is done. - - + + - Rx frequency offset with "CQ nnn ..." + Single decode @@ -2391,11 +2398,9 @@ soundcard changes font_push_button decoded_text_font_push_button monitor_off_check_box - monitor_last_used_check_box quick_call_check_box tx_QSY_check_box disable_TX_on_73_check_box - enable_VHF_features_check_box watchdog_check_box decode_at_52s_check_box CW_id_after_73_check_box @@ -2527,12 +2532,12 @@ soundcard changes - + diff --git a/lib/jt65_decode.f90 b/lib/jt65_decode.f90 index 0d3867cf3..1eb16ebdb 100644 --- a/lib/jt65_decode.f90 +++ b/lib/jt65_decode.f90 @@ -150,6 +150,7 @@ contains call timer('sync65 ',1) endif + print*,'A',nexp_decode,iand(nexp_decode,32),nexp_decode call fqso_first(nfqso,ntol,ca,ncand) nvec=ntrials diff --git a/mainwindow.cpp b/mainwindow.cpp index 75dafb7e1..35529adaf 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1833,6 +1833,8 @@ void MainWindow::decode() //decode() if(m_config.NDxG()) dec_data.params.nexp_decode += 4; if(m_config.NN()) dec_data.params.nexp_decode += 8; if(m_config.EMEonly()) dec_data.params.nexp_decode += 16; + if(m_config.single_decode()) dec_data.params.nexp_decode += 32; + strncpy(dec_data.params.datetime, m_dateTime.toLatin1(), 20); strncpy(dec_data.params.mycall, (m_config.my_callsign()+" ").toLatin1(),12);