From e1550bfa34c36d22ef4fcc3f45c0cac78fd8b262 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Mon, 24 Oct 2016 15:25:25 +0000
Subject: [PATCH] Use bVHF rather than single_decode to control display of
 params at end of decode line.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7225 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/decoder.f90 | 5 +++--
 mainwindow.cpp  | 7 +++----
 plotter.cpp     | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/decoder.f90 b/lib/decoder.f90
index de3b5b6d9..d8fc5d319 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -23,7 +23,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   end type counting_jt9_decoder
 
   real ss(184,NSMAX)
-  logical baddata,newdat65,newdat9,single_decode
+  logical baddata,newdat65,newdat9,single_decode,bVHF
   integer*2 id2(NTMAX*12000)
   type(params_block) :: params
   real*4 dd(NTMAX*12000)
@@ -38,6 +38,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   my_jt9%decoded = 0
 
   single_decode=iand(params%nexp_decode,32).ne.0
+  bVHF=iand(params%nexp_decode,64).ne.0
   if(mod(params%nranera,2).eq.0) ntrials=10**(params%nranera/2)
   if(mod(params%nranera,2).eq.1) ntrials=3*10**(params%nranera/2)
   if(params%nranera.eq.0) ntrials=0
@@ -265,7 +266,7 @@ contains
        write(*,1010) params%nutc,snr,dt,freq
     else
        is_average=nsum.ge.2
-       if(params%naggressive.gt.0 .and. ft.gt.0) then
+       if(bVHF .and. ft.gt.0) then
           cflags='f  '
           if(is_deep) then
              cflags(1:2)='d1'
diff --git a/mainwindow.cpp b/mainwindow.cpp
index bafe55f4c..d9f23491f 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2202,10 +2202,9 @@ void MainWindow::decode()                                       //decode()
   if(m_config.decode_at_52s()) dec_data.params.emedelay=2.5;
   dec_data.params.minSync=ui->syncSpinBox->isVisible () ? m_minSync : 0;
   dec_data.params.nexp_decode=0;
-  if(m_config.single_decode()) {
-    dec_data.params.nexp_decode += 32;
-    if(dec_data.params.naggressive<1) dec_data.params.naggressive=1;
-  }
+  if(m_config.single_decode()) dec_data.params.nexp_decode += 32;
+  if(m_config.enable_VHF_features()) dec_data.params.nexp_decode += 64;
+
 
   strncpy(dec_data.params.datetime, m_dateTime.toLatin1(), 20);
   strncpy(dec_data.params.mycall, (m_config.my_callsign()+"            ").toLatin1(),12);
diff --git a/plotter.cpp b/plotter.cpp
index e28e817de..18ad1bb95 100644
--- a/plotter.cpp
+++ b/plotter.cpp
@@ -722,5 +722,4 @@ void CPlotter::SetPercent2DScreen(int percent)
 void CPlotter::setVHF(bool bVHF)
 {
   m_bVHF=bVHF;
-  qDebug() << "A" << m_bVHF;
 }