w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-04 22:27:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

I think it's right, now.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2587 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-09-15 15:41:56 +00:00
parent 3a5bd27a49
commit 6f1f404d2d
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libm65/display.f90
View File

@ -1,4 +1,4 @@
subroutine display(nkeep,ftol,mode65,nfast) subroutine display(nkeep,ftol)
parameter (MAXLINES=400,MX=400) parameter (MAXLINES=400,MX=400)
integer indx(MAXLINES),indx2(MX) integer indx(MAXLINES),indx2(MX)
@ -6,20 +6,15 @@ subroutine display(nkeep,ftol,mode65,nfast)
character out*52,cfreq0*3,livecq*58 character out*52,cfreq0*3,livecq*58
character*6 callsign,callsign0 character*6 callsign,callsign0
character*12 freqcall(100) character*12 freqcall(100)
character*2 cmode
real freqkHz(MAXLINES) real freqkHz(MAXLINES)
integer utc(MAXLINES),utc2(MX),utcz integer utc(MAXLINES),utc2(MX),utcz
real*8 f0 real*8 f0
rewind 26 rewind 26
cmode='A '
if(mode65.eq.2) cmode='B '
if(mode65.eq.4) cmode='C '
if(nfast.eq.2) cmode(2:2)='2'
do i=1,MAXLINES do i=1,MAXLINES
read(26,1010,end=10) line(i) read(26,1010,end=10) line(i)
1010 format(a72) 1010 format(a77)
read(line(i),1020) f0,ndf,nh,nm read(line(i),1020) f0,ndf,nh,nm
1020 format(f8.3,i5,25x,i3,i2) 1020 format(f8.3,i5,25x,i3,i2)
utc(i)=60*nh + nm utc(i)=60*nh + nm
@ -35,8 +30,8 @@ subroutine display(nkeep,ftol,mode65,nfast)
nage=utcz-utc(i) nage=utcz-utc(i)
if(nage.lt.0) nage=nage+1440 if(nage.lt.0) nage=nage+1440
iage=nage/nquad iage=nage/nquad
write(line(i)(73:77),1021) iage,cmode write(line(i)(73:74),1021) iage
1021 format(i2,1x,a2) 1021 format(i2)
enddo enddo
nage=utcz-utc(1) nage=utcz-utc(1)

12
libm65/map65a.f90
View File

@ -22,7 +22,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
integer indx(MAXMSG),nsiz(MAXMSG) integer indx(MAXMSG),nsiz(MAXMSG)
logical done(MAXMSG) logical done(MAXMSG)
logical xpol logical xpol
character decoded*22,blank*22 character decoded*22,blank*22,cmode*2
real short(3,NFFT) !SNR dt ipol for potential shorthands real short(3,NFFT) !SNR dt ipol for potential shorthands
real qphi(12) real qphi(12)
common/c3com/ mcall3a common/c3com/ mcall3a
@ -436,11 +436,15 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
endif endif
endif endif
endif endif
cmode='A '
if(mode65.eq.2) cmode='B '
if(mode65.eq.4) cmode='C '
if(nfast.eq.2) cmode(2:2)='2'
write(26,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, & write(26,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, &
nsync2,nutc,decoded,cp nsync2,nutc,decoded,cp,cmode
write(21,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, & write(21,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, &
nsync2,nutc,decoded,cp nsync2,nutc,decoded,cp
1014 format(f8.3,i5,3i3,f5.1,i4,i3,i4,i7.6,2x,a22,2x,a1) 1014 format(f8.3,i5,3i3,f5.1,i4,i3,i4,i7.6,2x,a22,2x,a1,3x,a2)
endif endif
endif endif
@ -450,7 +454,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
1015 format(39x,i6.6) 1015 format(39x,i6.6)
call flush(21) call flush(21)
call flush(26) call flush(26)
call display(nkeep,ftol,mode65,nfast) call display(nkeep,ftol)
ndecdone=2 ndecdone=2
999 close(23) 999 close(23)

2
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//--------------------------------------------------------------- MainWindow //-------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"