w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-30 20:40:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved GUI control and display of averaged and hinted decodes.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6548 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-03-22 14:12:59 +00:00
parent e4bb042f2c
commit 3e091fca99
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/decoder.f90
View File

@ -198,7 +198,7 @@ contains
1000 format(a1,i5.4,f6.1,f6.2,i6,1x,a1) 1000 format(a1,i5.4,f6.1,f6.2,i6,1x,a1)
end subroutine jt4_average end subroutine jt4_average
subroutine jt65_decoded(this,utc,sync,snr,dt,freq,drift,width,decoded,ft, & subroutine jt65_decoded(this,utc,sync,snr,dt,freq,drift,width,decoded0,ft, &
qual,nsmo,nsum,minsync,nsubmode,naggressive) qual,nsmo,nsum,minsync,nsubmode,naggressive)
use jt65_decode use jt65_decode
@ -212,7 +212,7 @@ contains
integer, intent(in) :: freq integer, intent(in) :: freq
integer, intent(in) :: drift integer, intent(in) :: drift
real, intent(in) :: width real, intent(in) :: width
character(len=22), intent(in) :: decoded character(len=22), intent(in) :: decoded0
integer, intent(in) :: ft integer, intent(in) :: ft
integer, intent(in) :: qual integer, intent(in) :: qual
integer, intent(in) :: nsmo integer, intent(in) :: nsmo
@ -222,7 +222,8 @@ contains
integer, intent(in) :: naggressive integer, intent(in) :: naggressive
integer nft,nsmo2,nsum2,n integer nft,nsmo2,nsum2,n
character*3 ctail character*5 ctail
character*22 decoded
character*36 c character*36 c
data c/'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'/ data c/'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'/
@ -230,6 +231,7 @@ contains
! write(*,3301) ft,qual,nsmo,nsum,minsync,naggressive,sync !### ! write(*,3301) ft,qual,nsmo,nsum,minsync,naggressive,sync !###
!3301 format('decoded.f90:',6i3,f5.1) !### !3301 format('decoded.f90:',6i3,f5.1) !###
decoded=decoded0
if(int(sync).lt.minsync) then if(int(sync).lt.minsync) then
write(*,1010) utc,snr,dt,freq write(*,1010) utc,snr,dt,freq
else else
@ -238,11 +240,17 @@ contains
ctail(1:1)='d' ctail(1:1)='d'
if(ft.eq.1) ctail(1:1)='f' if(ft.eq.1) ctail(1:1)='f'
n=max(2,nsum+1) n=max(2,nsum+1)
n=min(n,36)
ctail(2:2)=c(n:n) ctail(2:2)=c(n:n)
if(nsubmode.gt.0) ctail(3:3)=c(nsmo+1:nsmo+1) if(nsubmode.gt.0) ctail(3:3)=c(nsmo+1:nsmo+1)
if(ft.eq.2) then
ctail(5:5)='*'
if(qual.le.9) ctail(5:5)=char(48+qual)
if(qual.lt.3) decoded(21:21)='?'
endif
endif endif
write(*,1010) utc,snr,dt,freq,'#',decoded,ctail write(*,1010) utc,snr,dt,freq,'#',decoded,ctail
1010 format(i4.4,i4,f5.1,i5,1x,a1,1x,a22,a3) 1010 format(i4.4,i4,f5.1,i5,1x,a1,1x,a22,a5)
endif endif
write(13,1012) utc,nint(sync),snr,dt,float(freq),drift,decoded,ft,nsum,nsmo write(13,1012) utc,nint(sync),snr,dt,float(freq),drift,decoded,ft,nsum,nsmo

2
lib/extract.f90
View File

@ -92,7 +92,7 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,mycall_12, &
if(nft.eq.0 .and. iand(ndepth,32).eq.32) then if(nft.eq.0 .and. iand(ndepth,32).eq.32) then
flip=1.0 flip=1.0
qmin=1.0 qmin=2.0 - 0.1*naggressive
call timer('hint65 ',0) call timer('hint65 ',0)
call hint65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,nadd,flip, & call hint65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,nadd,flip, &
mycall,hiscall,hisgrid,nexp_decode,qual,decoded) mycall,hiscall,hisgrid,nexp_decode,qual,decoded)

7
mainwindow.cpp
View File

@ -2016,7 +2016,12 @@ void MainWindow::readFromStdout() //readFromStdout
int n=t.indexOf("f"); int n=t.indexOf("f");
if(n<0) n=t.indexOf("d"); if(n<0) n=t.indexOf("d");
if(n>0) { if(n>0) {
navg=t.mid(n+1,1).toInt(); QString tt=t.mid(n+1,1);
navg=tt.toInt();
if(navg==0) {
char c = tt.data()->toLatin1();
if(int(c)>=65 and int(c)<=90) navg=int(c)-54;
}
if(navg>1) bAvgMsg=true; if(navg>1) bAvgMsg=true;
} }
} }