From 467451e37d4af8536d7217f42f2fae677dff4ee7 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Mon, 26 Aug 2024 20:46:26 +0200 Subject: [PATCH 1/4] Fix a compatibility issue with Qt 5.12. --- widgets/displaytext.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/displaytext.cpp b/widgets/displaytext.cpp index 147255c91..3d0db7087 100644 --- a/widgets/displaytext.cpp +++ b/widgets/displaytext.cpp @@ -567,11 +567,11 @@ void DisplayText::setHighlightedHoundText(QString t) { set_colours(m_config, &bg, &fg, types); // t is multiple lines of text, each line is a hound calling // iterate through each line and highlight the callsign - auto lines = t.split(QChar('\n'), Qt::SkipEmptyParts); + auto lines = t.split(QChar('\n'), SkipEmptyParts); clear(); foreach (auto line, lines) { - auto fields = line.split(QChar(' '), Qt::SkipEmptyParts); + auto fields = line.split(QChar(' '), SkipEmptyParts); insertText(line, bg, fg, fields.first(), QString{}); } } From 85437c4e9da060b398214b4aaca18bbeab9cf277 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Tue, 27 Aug 2024 14:39:45 +0200 Subject: [PATCH 2/4] Show all combo box entries without scrolling. --- widgets/mainwindow.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index 455ebdb2d..11e58630a 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -2348,7 +2348,7 @@ Double-click to reset to the standard 73 message Random - 5 + 8 From 30c87ea019884c1aeea4554b63beab259dd930bd Mon Sep 17 00:00:00 2001 From: Brian Moran Date: Tue, 27 Aug 2024 13:09:57 -0700 Subject: [PATCH 3/4] disregard clicks in active stations window for those already in progress --- widgets/mainwindow.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index a13590cfe..6d56917df 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3975,16 +3975,22 @@ void MainWindow::queueActiveWindowHound2(QString line) { // houndcall rpt grid if (w[7].contains(grid_regexp)) grid = w[7]; if (w[7].contains(non_r_db_regexp)) { - LOG_INFO(QString("%1 called with signal report %2").arg(caller).arg(w[7])); + LOG_INFO(QString("ActiveStations Window click: %1 called with signal report %2").arg(caller).arg(w[7])); } if (caller.length() > 2) { // make sure it's not already in the queue for ( QString hs : m_houndQueue) { if (hs.startsWith(caller)) { - LOG_INFO(QString("%1 already in queue. Skipping").arg(hs)); + //LOG_INFO(QString("ActiveStations Window click: %1 already in queue. Skipping").arg(hs)); return; } } + // make sure caller is not in fox queue either + if(m_foxQSO.contains(caller)) { + //LOG_INFO(QString("ActiveStations Window click: %1 already in progress. Skipping").arg(caller)); + return; + } + QString caller_rpt = (caller+" ").mid(0,12)+db; if (m_houndQueue.count() < MAX_HOUNDS_IN_QUEUE) { // add it to the queue @@ -3994,7 +4000,7 @@ void MainWindow::queueActiveWindowHound2(QString line) { } } } else { - LOG_INFO(QString("queueActiveWindowHound2 - skipping %1").arg(line)); + LOG_INFO(QString("ActiveStations Window click: skipping %1").arg(line)); } } } @@ -4564,7 +4570,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler } if (m_auto && (m_QSOProgress==REPLYING or (!ui->tx1->isEnabled () and m_QSOProgress==REPORT)) - && qAbs (ui->TxFreqSpinBox->value () - df) <= int (stop_tolerance) + && !m_config.superFox() && (SpecOp::HOUND != m_specOp) && qAbs (ui->TxFreqSpinBox->value () - df) <= int (stop_tolerance) // && message_words.at (2) != "DE" && !message_words.at (2).contains (QRegularExpression {"(^(CQ|QRZ))|" + m_baseCall}) && message_words.at (3).contains (Radio::base_callsign (ui->dxCallEntry->text ()))) { From ffd5dd1db292fc9ce958f9a470072c1e0bc559b6 Mon Sep 17 00:00:00 2001 From: Brian Moran Date: Thu, 29 Aug 2024 10:11:23 -0700 Subject: [PATCH 4/4] remove hound callsign from left hand side if clicked on in active station window --- widgets/mainwindow.cpp | 12 ++++++++++++ widgets/mainwindow.h | 1 + 2 files changed, 13 insertions(+) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 6d56917df..8c26b3621 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3998,6 +3998,7 @@ void MainWindow::queueActiveWindowHound2(QString line) { refreshHoundQueueDisplay(); // TODO: remove from active stations window too? } + removeHoundFromCallingList(caller); } } else { LOG_INFO(QString("ActiveStations Window click: skipping %1").arg(line)); @@ -10239,6 +10240,17 @@ QString MainWindow::sortHoundCalls(QString t, int isort, int max_dB) return m_houndCallers; } +void MainWindow::removeHoundFromCallingList(QString callsign) +{ + QString text = m_houndCallers; + QRegularExpression re = QRegularExpression("^" + callsign + "[^\\n]+\\n", QRegularExpression::MultilineOption); + text.remove(re); + if (text != m_houndCallers) { + m_nSortedHounds--; + m_houndCallers = text; + ui->decodedTextBrowser->setHighlightedHoundText(m_houndCallers); + } +} //------------------------------------------------------------------------------ void MainWindow::selectHound(QString line, bool bTopQueue) { diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index 22e99c5f6..918d284f3 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -873,6 +873,7 @@ private: QChar current_submode () const; // returns QChar {0} if submode is not appropriate void write_transmit_entry (QString const& file_name); void selectHound(QString t, bool bTopQueue); + void removeHoundFromCallingList(QString callsign); void houndCallers(); void updateFoxQSOsInProgressDisplay(); void foxQueueTopCallCommand();