w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-25 02:42:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Steven Franke 2022-11-08 20:43:54 -06:00
commit 94334f2b6c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widgets/mainwindow.cpp
View File

@ -209,6 +209,7 @@ QVector<QColor> g_ColorTbl;
using SpecOp = Configuration::SpecialOperatingActivity; using SpecOp = Configuration::SpecialOperatingActivity;
bool m_displayBand = false; bool m_displayBand = false;
bool no_a7_decodes = false;
namespace namespace
{ {
@ -3688,6 +3689,10 @@ void MainWindow::readFromStdout() //readFromStdout
continue; continue;
} }
} }
// Don't allow a7 decodes during the first period because they can be leftovers from the previous band
if (!(no_a7_decodes && line_read.contains("a7"))) {
if (m_mode!="FT8" and m_mode!="FT4" and !m_mode.startsWith ("FST4") and m_mode!="Q65") { if (m_mode!="FT8" and m_mode!="FT4" and !m_mode.startsWith ("FST4") and m_mode!="Q65") {
//Pad 22-char msg to at least 37 chars //Pad 22-char msg to at least 37 chars
line_read = line_read.left(44) + " " + line_read.mid(44); line_read = line_read.left(44) + " " + line_read.mid(44);
@ -3754,6 +3759,7 @@ void MainWindow::readFromStdout() //readFromStdout
} }
m_tBlankLine = line_read.left(ntime); m_tBlankLine = line_read.left(ntime);
} }
}
if ("FST4W" == m_mode) if ("FST4W" == m_mode)
{ {
uploadWSPRSpots (true, line_read); uploadWSPRSpots (true, line_read);
@ -7475,6 +7481,10 @@ void MainWindow::on_bandComboBox_activated (int index)
void MainWindow::band_changed (Frequency f) void MainWindow::band_changed (Frequency f)
{ {
// Don't allow a7 decodes during the first period because they can be leftovers from the previous band
no_a7_decodes = true;
QTimer::singleShot ((int(1000.0*m_TRperiod)), [=] {no_a7_decodes = false;});
// Set the attenuation value if options are checked // Set the attenuation value if options are checked
if (m_config.pwrBandTxMemory() && !m_tune) { if (m_config.pwrBandTxMemory() && !m_tune) {
auto const&curBand = ui->bandComboBox->currentText(); auto const&curBand = ui->bandComboBox->currentText();