w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 04:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow averaging only when the VHF features are enabled, and make the program behavior more consistent and intuitive.

Browse Source
This commit is contained in:
Uwe Risse 2023-08-24 16:10:19 +02:00
parent 4f874b6507
commit 28d014e634
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
widgets/mainwindow.cpp
View File

@ -2492,23 +2492,35 @@ void MainWindow::statusChanged()
} }
on_dxGridEntry_textChanged(m_hisGrid); on_dxGridEntry_textChanged(m_hisGrid);
if (m_specOp!=SpecOp::HOUND) { if (m_specOp!=SpecOp::HOUND) {
ui->txb2->setEnabled(true); ui->txb2->setEnabled(true);
ui->txrb2->setEnabled(true); ui->txrb2->setEnabled(true);
ui->txb4->setEnabled(true); ui->txb4->setEnabled(true);
ui->txrb4->setEnabled(true); ui->txrb4->setEnabled(true);
ui->txb5->setEnabled(true); ui->txb5->setEnabled(true);
ui->txrb5->setEnabled(true); ui->txrb5->setEnabled(true);
ui->txb6->setEnabled(true); ui->txb6->setEnabled(true);
ui->txrb6->setEnabled(true); ui->txrb6->setEnabled(true);
ui->houndButton->setChecked(false); ui->houndButton->setChecked(false);
} }
if (m_mode=="Q65" or m_mode=="JT65") { if (m_config.enable_VHF_features() && (m_mode=="JT4" or m_mode=="Q65" or m_mode=="JT65")) {
ui->actionInclude_averaging->setVisible(true);
ui->actionAuto_Clear_Avg->setVisible(true);
} else {
ui->actionInclude_averaging->setVisible(false);
ui->actionAuto_Clear_Avg->setVisible(false);
}
if (m_mode=="JT4" or m_mode=="Q65" or m_mode=="JT65") {
if (ui->actionInclude_averaging->isVisible() && ui->actionInclude_averaging->isChecked()) { if (ui->actionInclude_averaging->isVisible() && ui->actionInclude_averaging->isChecked()) {
ui->lh_decodes_title_label->setText(tr ("Single-Period Decodes")); ui->lh_decodes_title_label->setText(tr ("Single-Period Decodes"));
ui->rh_decodes_title_label->setText(tr ("Average Decodes")); ui->rh_decodes_title_label->setText(tr ("Average Decodes"));
} else { } else {
ui->lh_decodes_title_label->setText(tr ("Band Activity")); if (m_config.enable_VHF_features()) {
ui->rh_decodes_title_label->setText(tr ("Rx Frequency")); ui->lh_decodes_title_label->setText(tr ("Band Activity"));
ui->rh_decodes_title_label->setText(tr ("Decodes containing My Call"));
} else {
ui->lh_decodes_title_label->setText(tr ("Band Activity"));
ui->rh_decodes_title_label->setText(tr ("Rx Frequency"));
}
} }
} }
} }
@ -4163,12 +4175,13 @@ void MainWindow::readFromStdout() //readFromStdout
if((abs(audioFreq - m_wideGraph->rxFreq()) <= 10) and if((abs(audioFreq - m_wideGraph->rxFreq()) <= 10) and
!m_config.enable_VHF_features()) bDisplayRight=true; !m_config.enable_VHF_features()) bDisplayRight=true;
} }
if(m_mode=="Q65" and !bAvgMsg and !decodedtext.string().contains(m_baseCall)) bDisplayRight=false; if(m_mode=="Q65" and !bAvgMsg) bDisplayRight=false;
if((m_mode=="JT4" or m_mode=="Q65" or m_mode=="JT65") and decodedtext.string().contains(m_baseCall) && ui->actionInclude_averaging->isVisible() && !ui->actionInclude_averaging->isChecked()) bDisplayRight=true;
if (bDisplayRight) { if (bDisplayRight) {
// This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg, // This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg,
// or contains MyCall // or contains MyCall
if(!m_bBestSPArmed or m_mode!="FT4") { if(!m_bBestSPArmed) {
ui->decodedTextBrowser2->displayDecodedText (decodedtext0, m_config.my_callsign (), m_mode, m_config.DXCC (), ui->decodedTextBrowser2->displayDecodedText (decodedtext0, m_config.my_callsign (), m_mode, m_config.DXCC (),
m_logBook, m_currentBand, m_config.ppfx (), false, false, 0.0, bDisplayPoints, m_points); m_logBook, m_currentBand, m_config.ppfx (), false, false, 0.0, bDisplayPoints, m_points);
} }
@ -7115,8 +7128,6 @@ void MainWindow::on_actionJT4_triggered()
m_bFast9=false; m_bFast9=false;
setup_status_bar (bVHF); setup_status_bar (bVHF);
ui->sbSubmode->setMaximum(6); ui->sbSubmode->setMaximum(6);
ui->lh_decodes_title_label->setText(tr ("Single-Period Decodes"));
ui->rh_decodes_title_label->setText(tr ("Average Decodes"));
ui->lh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message")); ui->lh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message"));
ui->rh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message")); ui->rh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message"));
if(bVHF) { if(bVHF) {