From 34070d107d312ce2a84878aaa5f87e8b074f2481 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 7 Jul 2017 12:38:16 +0000
Subject: [PATCH] Patches from G3WDG to ease use of single-tone messages in
 QRA64.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7801 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 12 ++++++------
 plotter.cpp    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ddc613cb9..83330a68c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3790,7 +3790,7 @@ void MainWindow::genCQMsg ()
         {
           msgtype (QString {"CQ %1 %2"}.arg (m_config.my_callsign ()).arg (m_config.my_grid ().left (4)), ui->tx6);
         }
-      if (m_mode=="JT4") msgtype ("@1000  (TUNE)", ui->tx6);
+      if ((m_mode=="JT4" or m_mode=="QRA64") and  ui->cbShMsgs->isChecked())  msgtype ("@1000  (TUNE)", ui->tx6);
     }
   else
     {
@@ -3859,12 +3859,12 @@ void MainWindow::genStdMsgs(QString rpt)
       msgtype(t, ui->tx3);
     }
     t=t0 + "RRR";
-    if(m_mode=="JT4" and m_bShMsgs) t="@1500  (RRR)";
+    if((m_mode=="JT4" or m_mode=="QRA64") and m_bShMsgs) t="@1500  (RRR)";
     msgtype(t, ui->tx4);
     t=t0 + "73";
-    if(m_mode=="JT4" and m_bShMsgs) t="@1750  (73)";
+    if((m_mode=="JT4" or m_mode=="QRA64") and m_bShMsgs) t="@1750  (73)";
     msgtype(t, ui->tx5->lineEdit ());
-  }
+   }
 
   if(m_config.my_callsign () != m_baseCall) {
     if(shortList(m_config.my_callsign ())) {
@@ -4344,7 +4344,7 @@ void MainWindow::on_actionJT4_triggered()
   m_mode="JT4";
   bool bVHF=m_config.enable_VHF_features();
   if(bVHF) {
-    displayWidgets(nWidgets("111110010010110110110000"));
+    displayWidgets(nWidgets("111110010010111110110000"));
   } else {
     displayWidgets(nWidgets("111010000000111000111100"));
   }
@@ -4531,7 +4531,7 @@ void MainWindow::on_actionQRA64_triggered()
   on_actionJT65_triggered();
   m_nSubMode=n;
   m_mode="QRA64";
-  displayWidgets(nWidgets("111110000000111110000000"));
+  displayWidgets(nWidgets("111110010010111110000000"));
   m_modeTx="QRA64";
   ui->actionQRA64->setChecked(true);
   switch_mode (Modes::QRA64);
diff --git a/plotter.cpp b/plotter.cpp
index e9c755012..9d7375b50 100644
--- a/plotter.cpp
+++ b/plotter.cpp
@@ -215,7 +215,7 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed)
     painter1.drawText (5, painter1.fontMetrics ().ascent (), t);
   }
 
-  if(m_mode=="JT4") {
+  if(m_mode=="JT4" or m_mode=="QRA64") {
     QPen pen3(Qt::yellow);                     //Mark freqs of JT4 single-tone msgs
     painter2D.setPen(pen3);
     Font.setWeight(QFont::Bold);