From dde0adbead29038c85a9966480d2e7c928e87f78 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 6 Dec 2015 23:27:20 +0000 Subject: [PATCH] Allow for -0.0 DT value when matching UDP reply to CQ requests Merged from ^/branches/wsjtx. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.6@6238 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 1f90b48fa..910b155fa 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3889,7 +3889,8 @@ void MainWindow::replyToCQ (QTime time, qint32 snr, float delta_time, quint32 de if (decode_parts.contains ("CQ") || decode_parts.contains ("QRZ")) { // a message we are willing to accept - auto cqtext = QString {"%1 %2 %3 %4 %5 %6"}.arg (time.toString ("hhmm")) + QString format_string {"%1 %2 %3 %4 %5 %6"}; + auto cqtext = format_string.arg (time.toString ("hhmm")) .arg (snr, 3) .arg (delta_time, 4, 'f', 1) .arg (delta_frequency, 4) @@ -3897,6 +3898,16 @@ void MainWindow::replyToCQ (QTime time, qint32 snr, float delta_time, quint32 de .arg (message_text); auto messages = ui->decodedTextBrowser->toPlainText (); auto position = messages.lastIndexOf (cqtext); + if (position < 0) + { + // try again with with -0.0 delta time + position = messages.lastIndexOf (format_string.arg (time.toString ("hhmm")) + .arg (snr, 3) + .arg ('-' + QString::number (delta_time, 'f', 1), 4) + .arg (delta_frequency, 4) + .arg (mode) + .arg (message_text)); + } if (position >= 0) { if (m_config.udpWindowToFront ())