From 9a4ddf269e77a36a87a31c44898b08bca49f7dda Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 5 Feb 2018 15:16:29 +0000 Subject: [PATCH] Reject message with ";" unless Hound mode selected or CRC10 matches DX Call. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8455 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 16 ++++++++++------ mainwindow.h | 3 ++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 556bc8be5..326cc4ab0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2802,9 +2802,13 @@ void MainWindow::readFromStdout() //readFromStdout while(proc_jt9.canReadLine()) { QByteArray t=proc_jt9.readLine(); if(m_mode=="FT8" and !m_config.bHound() and t.contains(";")) { - QString errorMsg; - MessageBox::critical_message (this, - tr("Should you be in \"FT8 DXpedition Hound\" mode?"), errorMsg); + if(t.contains("<...>")) continue; + if(!m_bWarnedHound) { + QString errorMsg; + MessageBox::critical_message (this, + tr("Should you be in \"FT8 DXpedition Hound\" mode?"), errorMsg); + m_bWarnedHound=true; + } } // qint64 ms=QDateTime::currentMSecsSinceEpoch() - m_msec0; bool bAvgMsg=false; @@ -3557,7 +3561,7 @@ void MainWindow::guiUpdate() } else { m_bVHFwarned=false; } - + if(m_config.bHound()) m_bWarnedHound=false; if(m_auto and m_mode=="Echo" and m_bEchoTxOK) { progressBar.setMaximum(6); progressBar.setValue(int(m_s6)); @@ -4978,13 +4982,13 @@ void MainWindow::on_actionFT8_triggered() ui->txb6->setEnabled(false); } - if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnSplit) { + if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnedSplit) { QString errorMsg; MessageBox::critical_message (this, "Operation in FT8 DXpedition mode requires using *Split*\n" "rig control with either *Rig* or *Fake It* on the \n" "*Settings | Radio* tab.", errorMsg); - m_bWarnSplit=true; + m_bWarnedSplit=true; } statusChanged(); } diff --git a/mainwindow.h b/mainwindow.h index 5e912a097..710ee5540 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -482,7 +482,8 @@ private: bool m_bCallingCQ; bool m_bAutoReply; bool m_bCheckedContest; - bool m_bWarnSplit=false; + bool m_bWarnedSplit=false; + bool m_bWarnedHound=false; enum {