w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-27 22:58:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

One more try at getting the decoded line lengths right. Should be

Browse Source 
OK in Linux, too -- CHECK THIS -- and keeps the message string at 
length 22, as required for JT65.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3160 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-12 14:20:05 +00:00
parent fa2a145ea9
commit f88c0aad81
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/decoder.f90
View File

@ -34,23 +34,23 @@ subroutine decoder(ss,c0)
if(ntrMinutes.eq.1) then if(ntrMinutes.eq.1) then
nsps=6912 nsps=6912
df3=1500.0/2048.0 df3=1500.0/2048.0
fmt='(i4.4,i4,i5,f6.1,f8.0,i4,3x,a18)' fmt='(i4.4,i4,i5,f6.1,f8.0,i4,3x,a22)'
else if(ntrMinutes.eq.2) then else if(ntrMinutes.eq.2) then
nsps=15360 nsps=15360
df3=1500.0/2048.0 df3=1500.0/2048.0
fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a18)' fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22)'
else if(ntrMinutes.eq.5) then else if(ntrMinutes.eq.5) then
nsps=40960 nsps=40960
df3=1500.0/6144.0 df3=1500.0/6144.0
fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a18)' fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22)'
else if(ntrMinutes.eq.10) then else if(ntrMinutes.eq.10) then
nsps=82944 nsps=82944
df3=1500.0/12288.0 df3=1500.0/12288.0
fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a18)' fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a22)'
else if(ntrMinutes.eq.30) then else if(ntrMinutes.eq.30) then
nsps=252000 nsps=252000
df3=1500.0/32768.0 df3=1500.0/32768.0
fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a18)' fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a22)'
endif endif
if(nsps.eq.0) stop 'Error: bad TRperiod' !Better: return an error code### if(nsps.eq.0) stop 'Error: bad TRperiod' !Better: return an error code###
@ -133,8 +133,8 @@ subroutine decoder(ss,c0)
nsnr=nint(snrdb) nsnr=nint(snrdb)
ndrift=nint(drift/df3) ndrift=nint(drift/df3)
if(msg.ne.' ') then if(msg.ne.' ') then
write(*,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg(1:18) write(*,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg
write(13,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg(1:18) write(13,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg
fgood=f fgood=f
nsynced=1 nsynced=1
ndecoded=1 ndecoded=1

2
mainwindow.cpp
View File

@ -1239,7 +1239,7 @@ void MainWindow::readFromStdout() //readFromStdout
bool bQSO=abs(t.mid(22,4).toInt() - g_pWideGraph->QSOfreq()) < 10; bool bQSO=abs(t.mid(22,4).toInt() - g_pWideGraph->QSOfreq()) < 10;
QString t1=t.mid(0,5) + t.mid(10,4) + t.mid(15,5) + t.mid(22,4) + QString t1=t.mid(0,5) + t.mid(10,4) + t.mid(15,5) + t.mid(22,4) +
t.mid(32); t.mid(32);
t1=t1.replace("\n","").mid(0,t1.length()-2); t1=t1.replace("\n","").mid(0,t1.length()-4);
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" + QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
bg + "\"><pre>" + t1 + "</pre></td></tr></table>"; bg + "\"><pre>" + t1 + "</pre></td></tr></table>";
if(bQSO) { if(bQSO) {