w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Joe Taylor 2016-03-10 15:13:06 +00:00
parent 04e765c605
commit dfb8dc7422
5 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Configuration.cpp
View File

@ -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 ();

1
Configuration.hpp
View File

@ -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;

51
Configuration.ui
View File

@ -249,6 +249,30 @@
<string>Behavior</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="1">
<widget class="QCheckBox" name="enable_VHF_features_check_box">
<property name="text">
<string>Enable VHF/UHF/Microwave features</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="offset_Rx_freq_check_box">
<property name="text">
<string>Rx frequency offset with &quot;CQ nnn ...&quot;</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="monitor_last_used_check_box">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Monitor returns to last used frequency</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="disable_TX_on_73_check_box">
<property name="toolTip">
@ -352,16 +376,6 @@ quiet period when decoding is done.</string>
</item>
</layout>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="monitor_last_used_check_box">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Monitor returns to last used frequency</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="tx_QSY_check_box">
<property name="toolTip">
@ -372,13 +386,6 @@ quiet period when decoding is done.</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="enable_VHF_features_check_box">
<property name="text">
<string>Enable VHF/UHF/Microwave features</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="decode_at_52s_check_box">
<property name="text">
@ -386,10 +393,10 @@ quiet period when decoding is done.</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="offset_Rx_freq_check_box">
<item row="2" column="1">
<widget class="QCheckBox" name="single_decode_check_box">
<property name="text">
<string>Rx frequency offset with &quot;CQ nnn ...&quot;</string>
<string>Single decode</string>
</property>
</widget>
</item>
@ -2391,11 +2398,9 @@ soundcard changes</string>
<tabstop>font_push_button</tabstop>
<tabstop>decoded_text_font_push_button</tabstop>
<tabstop>monitor_off_check_box</tabstop>
<tabstop>monitor_last_used_check_box</tabstop>
<tabstop>quick_call_check_box</tabstop>
<tabstop>tx_QSY_check_box</tabstop>
<tabstop>disable_TX_on_73_check_box</tabstop>
<tabstop>enable_VHF_features_check_box</tabstop>
<tabstop>watchdog_check_box</tabstop>
<tabstop>decode_at_52s_check_box</tabstop>
<tabstop>CW_id_after_73_check_box</tabstop>
@ -2527,12 +2532,12 @@ soundcard changes</string>
</connection>
</connections>
<buttongroups>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="TX_mode_button_group"/>
</buttongroups>
</ui>

1
lib/jt65_decode.f90
View File

@ -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

2
mainwindow.cpp
View File

@ -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);