w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-12-23 19:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

1. Gray-out "Include averaging" and "Include Deep Search" if not in JT4 or JT65 mode.

Browse Source 
2. Make the "MSK144 Realtime decode" checkbox invisible, in preparation for removing it entirely.
3. Always use RealTime decoding in MSK144 mode.  (For now, at least, click-to-decode works as before.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7168 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-12 18:21:45 +00:00
parent ae9183a4c1
commit 995fcf5359
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Configuration.cpp
View File

@ -1056,6 +1056,7 @@ void Configuration::impl::initialize_models ()
ui_->cbx2ToneSpacing->setChecked(x2ToneSpacing_);
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);

12
Configuration.ui
View File

@ -2267,7 +2267,7 @@ Right click for insert and delete options.</string>
</property>
</widget>
</item>
<item row="9" column="0">
<item row="8" column="0">
<widget class="QCheckBox" name="cbx2ToneSpacing">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Generate Tx audio with twice the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-2 before generating RF.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -2277,10 +2277,10 @@ Right click for insert and delete options.</string>
</property>
</widget>
</item>
<item row="8" column="0">
<item row="9" column="0">
<widget class="QCheckBox" name="cbRealTime">
<property name="enabled">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Decode on-the-fly rather than at end of Rx sequence.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -2539,12 +2539,12 @@ soundcard changes</string>
</connection>
</connections>
<buttongroups>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
</buttongroups>
</ui>

11
mainwindow.cpp
View File

@ -1274,7 +1274,7 @@ void MainWindow::fastSink(qint64 frames)
if(m_diskData) nutc0=m_UTCdisk;
char line[80];
bool bmsk144=((m_mode=="MSK144") and (m_monitoring or m_diskData));
bmsk144=bmsk144 && m_config.realTimeDecode();
// bmsk144=bmsk144 && m_config.realTimeDecode();
line[0]=0;
m_RxFreq=ui->RxFreqSpinBox->value ();
@ -1327,7 +1327,8 @@ void MainWindow::fastSink(qint64 frames)
m_k0=k;
if(m_diskData and m_k0 >= dec_data.params.kin - 7 * 512) decodeNow=true;
if(!m_diskData and m_tRemaining<0.35 and !m_bFastDecodeCalled) decodeNow=true;
if(m_mode=="MSK144" and m_config.realTimeDecode()) decodeNow=false;
// if(m_mode=="MSK144" and m_config.realTimeDecode()) decodeNow=false;
if(m_mode=="MSK144") decodeNow=false;
if(decodeNow) {
m_dataAvailable=true;
@ -2254,7 +2255,7 @@ void MainWindow::decode() //decode()
if(m_nPick > 0) {
t0=m_t0Pick;
t1=m_t1Pick;
if(t1 > m_kdone/12000.0 and !m_config.realTimeDecode()) t1=m_kdone/12000.0;
// if(t1 > m_kdone/12000.0 and !m_config.realTimeDecode()) t1=m_kdone/12000.0;
}
static short int d2b[360000];
narg[0]=dec_data.params.nutc;
@ -3033,7 +3034,8 @@ void MainWindow::guiUpdate()
tx_status_label.setStyleSheet("QLabel{background-color: #00ff00}");
QString t;
t="Receiving";
if(m_mode=="MSK144" and m_config.realTimeDecode()) {
// if(m_mode=="MSK144" and m_config.realTimeDecode()) {
if(m_mode=="MSK144") {
int npct=int(100.0*m_fCPUmskrtd/0.298667);
if(npct>90) tx_status_label.setStyleSheet("QLabel{background-color: #ff0000}");
t.sprintf("Receiving %2d%%",npct);
@ -5213,6 +5215,7 @@ void::MainWindow::VHF_controls_visible(bool b)
void::MainWindow::VHF_features_enabled(bool b)
{
if(m_mode!="JT4" and m_mode!="JT65") b=false;
if(!b and (ui->actionInclude_averaging->isChecked() or
ui->actionInclude_correlation->isChecked())) {
on_actionDeepestDecode_triggered();