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

Tidy up decode menu actions and correct defect in logic

Browse Source 
Deepest decode  level should be selected  automatically when switching
to JT4  or JT65 when VHF  & up mode is  on and either of  averaging or
deep search are enabled.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7456 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-01-06 13:53:06 +00:00
parent 64355a319c
commit 9ea25dec8d
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mainwindow.cpp
View File

@ -815,9 +815,9 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
if((m_ndepth&7)==1) ui->actionQuickDecode->setChecked(true); if((m_ndepth&7)==1) ui->actionQuickDecode->setChecked(true);
if((m_ndepth&7)==2) ui->actionMediumDecode->setChecked(true); if((m_ndepth&7)==2) ui->actionMediumDecode->setChecked(true);
if((m_ndepth&7)==3) ui->actionDeepestDecode->setChecked(true); if((m_ndepth&7)==3) ui->actionDeepestDecode->setChecked(true);
ui->actionInclude_averaging->setChecked((m_ndepth&16)>0); ui->actionInclude_averaging->setChecked(m_ndepth&16);
ui->actionInclude_correlation->setChecked((m_ndepth&32)>0); ui->actionInclude_correlation->setChecked(m_ndepth&32);
ui->actionEnable_AP_DXcall->setChecked((m_ndepth&64)>0); ui->actionEnable_AP_DXcall->setChecked(m_ndepth&64);
m_UTCdisk=-1; m_UTCdisk=-1;
m_ntx = 1; m_ntx = 1;
@ -4665,40 +4665,34 @@ void MainWindow::on_RxFreqSpinBox_valueChanged(int n)
} }
} }
void MainWindow::on_actionQuickDecode_triggered() void MainWindow::on_actionQuickDecode_toggled (bool checked)
{ {
m_ndepth=(m_ndepth&112) + 1; m_ndepth ^= (-checked ^ m_ndepth) & 0x00000001;
ui->actionQuickDecode->setChecked(true);
} }
void MainWindow::on_actionMediumDecode_triggered() void MainWindow::on_actionMediumDecode_toggled (bool checked)
{ {
m_ndepth=(m_ndepth&112) + 2; m_ndepth ^= (-checked ^ m_ndepth) & 0x00000002;
ui->actionMediumDecode->setChecked(true);
} }
void MainWindow::on_actionDeepestDecode_triggered() void MainWindow::on_actionDeepestDecode_toggled (bool checked)
{ {
m_ndepth=(m_ndepth&112) + 3; m_ndepth ^= (-checked ^ m_ndepth) & 0x00000003;
ui->actionDeepestDecode->setChecked(true);
} }
void MainWindow::on_actionInclude_averaging_triggered() void MainWindow::on_actionInclude_averaging_toggled (bool checked)
{ {
m_ndepth=m_ndepth ^ 16; m_ndepth ^= (-checked ^ m_ndepth) & 0x00000010;
ui->actionInclude_averaging->setChecked(m_ndepth&16);
} }
void MainWindow::on_actionInclude_correlation_triggered() void MainWindow::on_actionInclude_correlation_toggled (bool checked)
{ {
m_ndepth=m_ndepth ^ 32; m_ndepth ^= (-checked ^ m_ndepth) & 0x00000020;
ui->actionInclude_correlation->setChecked(m_ndepth&32);
} }
void MainWindow::on_actionEnable_AP_DXcall_triggered() void MainWindow::on_actionEnable_AP_DXcall_toggled (bool checked)
{ {
m_ndepth=m_ndepth ^ 64; m_ndepth ^= (-checked ^ m_ndepth) & 0x00000040;
ui->actionEnable_AP_DXcall->setChecked(m_ndepth&64);
} }
void MainWindow::on_inGain_valueChanged(int n) void MainWindow::on_inGain_valueChanged(int n)
@ -5471,15 +5465,15 @@ void MainWindow::on_sbFtol_valueChanged(int index)
void::MainWindow::VHF_features_enabled(bool b) void::MainWindow::VHF_features_enabled(bool b)
{ {
if(m_mode!="JT4" and m_mode!="JT65") b=false; if(m_mode!="JT4" and m_mode!="JT65") b=false;
if(!b and (ui->actionInclude_averaging->isChecked() or if(b and (ui->actionInclude_averaging->isChecked() or
ui->actionInclude_correlation->isChecked())) { ui->actionInclude_correlation->isChecked())) {
on_actionDeepestDecode_triggered(); ui->actionDeepestDecode->setChecked (true);
} }
ui->actionInclude_averaging->setEnabled(b); ui->actionInclude_averaging->setEnabled(b);
ui->actionInclude_correlation->setEnabled(b); ui->actionInclude_correlation->setEnabled(b);
ui->actionMessage_averaging->setEnabled(b); ui->actionMessage_averaging->setEnabled(b);
ui->actionEnable_AP_DXcall->setEnabled(m_mode=="QRA64"); ui->actionEnable_AP_DXcall->setEnabled(m_mode=="QRA64");
if(!b and m_msgAvgWidget!=NULL) { if(!b && m_msgAvgWidget) {
if(m_msgAvgWidget->isVisible()) m_msgAvgWidget->close(); if(m_msgAvgWidget->isVisible()) m_msgAvgWidget->close();
} }
} }

12
mainwindow.h
View File

@ -172,9 +172,9 @@ private slots:
void on_actionJT4_triggered(); void on_actionJT4_triggered();
void on_TxFreqSpinBox_valueChanged(int arg1); void on_TxFreqSpinBox_valueChanged(int arg1);
void on_actionSave_decoded_triggered(); void on_actionSave_decoded_triggered();
void on_actionQuickDecode_triggered(); void on_actionQuickDecode_toggled (bool);
void on_actionMediumDecode_triggered(); void on_actionMediumDecode_toggled (bool);
void on_actionDeepestDecode_triggered(); void on_actionDeepestDecode_toggled (bool);
void on_inGain_valueChanged(int n); void on_inGain_valueChanged(int n);
void bumpFqso(int n); void bumpFqso(int n);
void on_actionErase_ALL_TXT_triggered(); void on_actionErase_ALL_TXT_triggered();
@ -220,9 +220,9 @@ private slots:
void stopTuneATU(); void stopTuneATU();
void auto_tx_mode(bool); void auto_tx_mode(bool);
void on_actionMessage_averaging_triggered(); void on_actionMessage_averaging_triggered();
void on_actionInclude_averaging_triggered(); void on_actionInclude_averaging_toggled (bool);
void on_actionInclude_correlation_triggered(); void on_actionInclude_correlation_toggled (bool);
void on_actionEnable_AP_DXcall_triggered(); void on_actionEnable_AP_DXcall_toggled (bool);
void VHF_features_enabled(bool b); void VHF_features_enabled(bool b);
void on_sbSubmode_valueChanged(int n); void on_sbSubmode_valueChanged(int n);
void on_cbShMsgs_toggled(bool b); void on_cbShMsgs_toggled(bool b);