w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up the formation and display of JT4 average and DS decodes.

This commit is contained in:
Joe Taylor 2020-04-17 12:14:43 -04:00
parent e94cacb265
commit 35eb391e23
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/decoder.f90
View File

@ -319,16 +319,19 @@ contains
if (have_sync) then if (have_sync) then
decoded=decoded0 decoded=decoded0
cflags=' ' cflags=' '
if(decoded.ne.' ') cflags='f ' if(decoded.ne.' ') then
if(is_deep) then cflags='f '
cflags(1:2)='d1' if(is_deep) then
write(cflags(3:3),'(i1)') min(int(qual),9) cflags='d '
if(qual.ge.10.0) cflags(3:3)='*' write(cflags(2:2),'(i1)') min(int(qual),9)
if(qual.lt.3.0) decoded(22:22)='?' if(qual.ge.10.0) cflags(2:2)='*'
endif if(qual.lt.3.0) decoded(22:22)='?'
if(is_average) then endif
write(cflags(2:2),'(i1)') min(ave,9) if(is_average) then
if(ave.ge.10) cflags(2:2)='*' 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 endif
write(*,1000) params%nutc,snr,dt,freq,sync,decoded,cflags write(*,1000) params%nutc,snr,dt,freq,sync,decoded,cflags
1000 format(i4.4,i4,f5.1,i5,1x,'$',a1,1x,a22,1x,a3) 1000 format(i4.4,i4,f5.1,i5,1x,'$',a1,1x,a22,1x,a3)

5
lib/jt4_decode.f90
View File

@ -194,7 +194,7 @@ contains
call this%decode_callback(nsnr,dtx,nfreq,.true.,csync, & call this%decode_callback(nsnr,dtx,nfreq,.true.,csync, &
.false.,decoded,99.,ich,.false.,0) .false.,decoded,99.,ich,.false.,0)
end if end if
nsave=0 !### nsave=0
go to 990 go to 990
else !Fano failed else !Fano failed
@ -299,6 +299,7 @@ contains
nfsave=0 nfsave=0
dtdiff=0.2 dtdiff=0.2
first=.false. first=.false.
nsave=1 ! ### Should this be here? ###
endif endif
do i=1,64 do i=1,64
@ -311,7 +312,7 @@ contains
dtsave(nsave)=dtxx dtsave(nsave)=dtxx
nfsave(nsave)=nfreq nfsave(nsave)=nfreq
flipsave(nsave)=flip 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. 10 sym=0.
syncsum=0. syncsum=0.

2
widgets/mainwindow.cpp
View File

@ -3136,7 +3136,7 @@ void MainWindow::readFromStdout() //readFromStdout
navg=line_read.mid(nd+2,1).toInt(); navg=line_read.mid(nd+2,1).toInt();
if(line_read.mid(nd+2,1)=="*") navg=10; if(line_read.mid(nd+2,1)=="*") navg=10;
} }
if(m_mode=="JT65") { if(m_mode=="JT65" or m_mode=="JT4") {
int na=-1; int na=-1;
if(nf<0 and nd<0) na=line_read.indexOf("a"); if(nf<0 and nd<0) na=line_read.indexOf("a");
if(na>0) { if(na>0) {