From 8e64184183556f83be0e0f7a6274097f9df633dd Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 19 Jul 2021 09:26:25 -0400
Subject: [PATCH] Remove more vestiges of JT9+JT65 mode.

---
 widgets/plotter.cpp   | 19 ++++---------------
 widgets/widegraph.cpp |  4 ++--
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp
index 372789c4c..0153b8433 100644
--- a/widgets/plotter.cpp
+++ b/widgets/plotter.cpp
@@ -530,9 +530,8 @@ void CPlotter::DrawOverlay()                   //DrawOverlay()
   int yh=5;
   int yTxTop=12;
   int yRxBottom=yTxTop + 2*yh + 4;
-  if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65"
-     or m_mode=="Q65" or m_mode=="FT8" or m_mode=="FT4"
-     or m_mode.startsWith("FST4")) {
+  if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="Q65" or m_mode=="FT8"
+     or m_mode=="FT4" or m_mode.startsWith("FST4")) {
 
     if(m_mode=="FST4" and !m_bSingleDecode) {
       x1=XfromFreq(m_nfa);
@@ -580,9 +579,8 @@ void CPlotter::DrawOverlay()                   //DrawOverlay()
     }
   }
 
-  if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or
-     m_mode.mid(0,4)=="WSPR" or m_mode=="Q65" or m_mode=="FT8"
-     or m_mode=="FT4" or m_mode.startsWith("FST4")) {
+  if(m_mode=="JT9" or m_mode=="JT65" or m_mode.mid(0,4)=="WSPR" or m_mode=="Q65"
+     or m_mode=="FT8" or m_mode=="FT4" or m_mode.startsWith("FST4")) {
     painter0.setPen(penRed);
     x1=XfromFreq(m_txFreq);
     x2=XfromFreq(m_txFreq+bw);
@@ -597,15 +595,6 @@ void CPlotter::DrawOverlay()                   //DrawOverlay()
     painter0.drawLine(x2,yTxTop,x2,yTxTop+yh);
   }
 
-  if(m_mode=="JT9+JT65") {
-    QPen pen2(Qt::blue, 3);                //Mark the JT65 | JT9 divider
-    painter0.setPen(pen2);
-    x1=XfromFreq(m_fMin);
-    if(x1<2) x1=2;
-    x2=x1+30;
-    painter0.drawLine(x1,8,x1,28);
-  }
-
   if(m_dialFreq>10.13 and m_dialFreq< 10.15 and m_mode.mid(0,4)!="WSPR") {
     float f1=1.0e6*(10.1401 - m_dialFreq);
     float f2=f1+200.0;
diff --git a/widgets/widegraph.cpp b/widgets/widegraph.cpp
index 28435a972..e1ad518ab 100644
--- a/widgets/widegraph.cpp
+++ b/widgets/widegraph.cpp
@@ -292,7 +292,7 @@ void WideGraph::setTxFreq(int n)                                   //setTxFreq
 void WideGraph::setMode(QString mode)                              //setMode
 {
   m_mode=mode;
-  ui->fSplitSpinBox->setEnabled(m_mode=="JT9+JT65" or m_mode.startsWith("FST4"));
+  ui->fSplitSpinBox->setEnabled(m_mode.startsWith("FST4"));
   ui->widePlot->setMode(mode);
   ui->widePlot->DrawOverlay();
   ui->widePlot->update();
@@ -363,7 +363,7 @@ void WideGraph::setRxBand (QString const& band)
   else
     {
       ui->fSplitSpinBox->setValue (m_fMinPerBand.value (band, 2500).toUInt ());
-      ui->fSplitSpinBox->setEnabled (m_mode=="JT9+JT65" or m_mode.startsWith("FST4"));
+      ui->fSplitSpinBox->setEnabled (m_mode.startsWith("FST4"));
     }
   ui->widePlot->setRxBand(band);
   setRxRange ();