From 696af427e54d5f487f0e187b7a0be602cb0c5bd1 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 8 Dec 2017 17:44:14 +0000 Subject: [PATCH] Revert the last commit: it was a mistake! git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8299 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- displaytext.cpp | 1 - mainwindow.cpp | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/displaytext.cpp b/displaytext.cpp index 2a7edcb24..0b5ca741b 100644 --- a/displaytext.cpp +++ b/displaytext.cpp @@ -203,7 +203,6 @@ void DisplayText::displayDecodedText(DecodedText const& decodedText, QString con decodedText.indexOf (" " + myCall + " ") >= 0 or decodedText.indexOf (" " + myCall + "/") >= 0 or decodedText.indexOf ("/" + myCall + " ") >= 0 - or decodedText.indexOf ("<" + myCall + ">") >= 0 or decodedText.indexOf ("<" + myCall + " ") >= 0 or decodedText.indexOf (" " + myCall + ">") >= 0)) { bg = color_MyCall; diff --git a/mainwindow.cpp b/mainwindow.cpp index afac66a1b..895cf397b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2671,6 +2671,7 @@ void MainWindow::decode() //decode() narg[12]=0; narg[13]=-1; narg[14]=m_config.aggressive(); + qDebug() << "a2" << dec_data.params.nutc; memcpy(d2b,dec_data.d2,2*360000); watcher3.setFuture (QtConcurrent::run (std::bind (fast_decode_,&d2b[0], &narg[0],&m_TRperiod,&m_msg[0][0], @@ -2881,7 +2882,6 @@ void MainWindow::readFromStdout() //readFromStdout if (bDisplayRight) { // This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg, // or contains MyCall - qDebug() << "bb"; ui->decodedTextBrowser2->displayDecodedText(decodedtext,m_baseCall,false, m_logBook,m_config.color_CQ(),m_config.color_MyCall(), m_config.color_DXCC(),m_config.color_NewCall(),m_config.ppfx()); @@ -4143,6 +4143,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie QString s1 = m_QSOText.trimmed (); QString s2 = message.string ().trimmed(); if (s1!=s2 and !message.isTX()) { + qDebug() << "bb" << s1 << s2; ui->decodedTextBrowser2->displayDecodedText(message, m_baseCall, false, m_logBook,m_config.color_CQ(), m_config.color_MyCall(), m_config.color_DXCC(),m_config.color_NewCall(),m_config.ppfx());