From e040c926b9a7cd418c23410f7cdae077cb9b68d6 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Mon, 11 Dec 2023 18:47:52 +0100 Subject: [PATCH 1/3] Always attempt to decode when Continuous Waterfall is enabled. --- qmap/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index ce8d9c0a6..517692766 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -800,8 +800,8 @@ void MainWindow::decode() //decode() { //Don't attempt to decode if decoder is already busy, or if we transmitted for 10 s or more. if(m_decoderBusy) return; - if(m_WSJTX_TRperiod==60 and m_nTransmitted>10) return; - if(m_WSJTX_TRperiod==30 and m_nTransmitted>35) return; + if(m_WSJTX_TRperiod==60 and m_nTransmitted>10 and !ui->continuous_waterfall->isChecked()) return; + if(m_WSJTX_TRperiod==30 and m_nTransmitted>35 and !ui->continuous_waterfall->isChecked()) return; QString fname=" "; ui->DecodeButton->setStyleSheet(m_pbdecoding_style1); From 9c7c837dc8311149d4f148245572abb05e8ac65e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 11 Dec 2023 16:07:43 -0500 Subject: [PATCH 2/3] Yellow background for Q65-30x decodes in Active Stations window. --- widgets/activeStations.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/widgets/activeStations.cpp b/widgets/activeStations.cpp index 91884023d..f202c984e 100644 --- a/widgets/activeStations.cpp +++ b/widgets/activeStations.cpp @@ -92,6 +92,21 @@ void ActiveStations::displayRecentStations(QString mode, QString const& t) bool bClickOK=m_clickOK; m_clickOK=false; ui->RecentStationsPlainTextEdit->setPlainText(t); + +//Yellow background for Q65-30x decodes: + int istart=0; + while(istartRecentStationsPlainTextEdit->textCursor(); + cursor.setPosition(npos); + cursor.select(QTextCursor::LineUnderCursor); + QTextCharFormat fmt; + fmt.setBackground(QBrush(Qt::yellow)); + cursor.setCharFormat(fmt); + istart=npos+10; + } + m_clickOK=bClickOK; } From 1542b7f8575ef99335be2083c28b2f93c4fe892d Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 11 Dec 2023 19:01:05 -0500 Subject: [PATCH 3/3] If myCall is in the message, highlight the line with red background. --- qmap/mainwindow.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index 517692766..4bd0e0313 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -955,11 +955,9 @@ void MainWindow::guiUpdate() m_nline++; QTextCursor cursor(ui->decodedTextBrowser->document()->findBlockByLineNumber(m_nline-1)); QTextBlockFormat f = cursor.blockFormat(); - if(t.mid(36,2)=="30") { - f.setBackground(QBrush(Qt::yellow)); - } else { - f.setBackground(QBrush(Qt::white)); - } + f.setBackground(QBrush(Qt::white)); + if(t.mid(36,2)=="30") f.setBackground(QBrush(Qt::yellow)); + if(t.indexOf(m_myCall)>10) f.setBackground(QBrush(Qt::red)); cursor.setBlockFormat(f); } }