From 35eb391e23910f9daa5203b425cb37327af83251 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Fri, 17 Apr 2020 12:14:43 -0400
Subject: [PATCH] Clean up the formation and display of JT4 average and DS
 decodes.

---
 lib/decoder.f90        | 23 +++++++++++++----------
 lib/jt4_decode.f90     |  5 +++--
 widgets/mainwindow.cpp |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/lib/decoder.f90 b/lib/decoder.f90
index 9e06c649d..e0d4b4682 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -319,16 +319,19 @@ contains
     if (have_sync) then
        decoded=decoded0
        cflags='   '
-       if(decoded.ne.'                      ') cflags='f  '
-       if(is_deep) then
-          cflags(1:2)='d1'
-          write(cflags(3:3),'(i1)') min(int(qual),9)
-          if(qual.ge.10.0) cflags(3:3)='*'
-          if(qual.lt.3.0) decoded(22:22)='?'
-       endif
-       if(is_average) then
-          write(cflags(2:2),'(i1)') min(ave,9)
-          if(ave.ge.10) cflags(2:2)='*'
+       if(decoded.ne.'                      ') then
+          cflags='f  '
+          if(is_deep) then
+             cflags='d  '
+             write(cflags(2:2),'(i1)') min(int(qual),9)
+             if(qual.ge.10.0) cflags(2:2)='*'
+             if(qual.lt.3.0) decoded(22:22)='?'
+          endif
+          if(is_average) then
+             write(cflags(3:3),'(i1)') min(ave,9)
+             if(ave.ge.10) cflags(3:3)='*'
+             if(cflags(1:1).eq.'f') cflags=cflags(1:1)//cflags(3:3)//' '
+          endif
        endif
        write(*,1000) params%nutc,snr,dt,freq,sync,decoded,cflags
 1000   format(i4.4,i4,f5.1,i5,1x,'$',a1,1x,a22,1x,a3)
diff --git a/lib/jt4_decode.f90 b/lib/jt4_decode.f90
index ff0b33c4d..0b8259906 100644
--- a/lib/jt4_decode.f90
+++ b/lib/jt4_decode.f90
@@ -194,7 +194,7 @@ contains
              call this%decode_callback(nsnr,dtx,nfreq,.true.,csync,      &
                   .false.,decoded,99.,ich,.false.,0)
           end if
-          nsave=0
+!###          nsave=0
           go to 990
 
        else                                                  !Fano failed
@@ -299,6 +299,7 @@ contains
        nfsave=0
        dtdiff=0.2
        first=.false.
+       nsave=1        ! ### Should this be here? ###
     endif
 
     do i=1,64
@@ -311,7 +312,7 @@ contains
     dtsave(nsave)=dtxx
     nfsave(nsave)=nfreq
     flipsave(nsave)=flip
-    ppsave(1:207,1:7,nsave)=rsymbol(1:207,1:7)  
+    ppsave(1:207,1:7,nsave)=rsymbol(1:207,1:7)
 
 10  sym=0.
     syncsum=0.
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 7239ffb91..60e0249b0 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -3136,7 +3136,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
           navg=line_read.mid(nd+2,1).toInt();
           if(line_read.mid(nd+2,1)=="*") navg=10;
         }
-        if(m_mode=="JT65") {
+        if(m_mode=="JT65" or m_mode=="JT4") {
           int na=-1;
           if(nf<0 and nd<0) na=line_read.indexOf("a");
           if(na>0) {