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

Merge branch 'feat-fst280' into develop

Browse Source
This commit is contained in:
Bill Somerville 2021-01-06 16:09:54 +00:00
commit 77c3562d00
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/qra/q65/q65_sync.f90
View File

@ -37,6 +37,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, &
data sync(1)/99.0/ data sync(1)/99.0/
save sync save sync
irc=-2
idec=-1 idec=-1
snr1=0. snr1=0.
dat4=0 dat4=0
@ -308,6 +309,7 @@ subroutine q65_dec1(s3,nsubmode,b90ts,codewords,ncw,esnodb,irc,dat4,decoded)
decoded=' ' decoded=' '
call q65_intrinsics_ff(s3,nsubmode,b90ts,nFadingModel,s3prob) call q65_intrinsics_ff(s3,nsubmode,b90ts,nFadingModel,s3prob)
call q65_dec_fullaplist(s3,s3prob,codewords,ncw,esnodb,dat4,plog,irc) call q65_dec_fullaplist(s3,s3prob,codewords,ncw,esnodb,dat4,plog,irc)
if(sum(dat4).le.0) irc=-2
if(irc.ge.0 .and. plog.gt.PLOG_MIN) then if(irc.ge.0 .and. plog.gt.PLOG_MIN) then
write(c77,1000) dat4(1:12),dat4(13)/2 write(c77,1000) dat4(1:12),dat4(13)/2
1000 format(12b6.6,b5.5) 1000 format(12b6.6,b5.5)
@ -332,6 +334,7 @@ subroutine q65_dec2(s3,nsubmode,b90ts,esnodb,irc,dat4,decoded)
decoded=' ' decoded=' '
call q65_intrinsics_ff(s3,nsubmode,b90ts,nFadingModel,s3prob) call q65_intrinsics_ff(s3,nsubmode,b90ts,nFadingModel,s3prob)
call q65_dec(s3,s3prob,APmask,APsymbols,esnodb,dat4,irc) call q65_dec(s3,s3prob,APmask,APsymbols,esnodb,dat4,irc)
if(sum(dat4).le.0) irc=-2
if(irc.ge.0) then if(irc.ge.0) then
write(c77,1000) dat4(1:12),dat4(13)/2 write(c77,1000) dat4(1:12),dat4(13)/2
1000 format(12b6.6,b5.5) 1000 format(12b6.6,b5.5)

14
widgets/plotter.cpp
View File

@ -293,12 +293,14 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed)
if(m_bQ65_MultiSync) pen0.setColor("orange"); if(m_bQ65_MultiSync) pen0.setColor("orange");
painter2D.setPen(pen0); painter2D.setPen(pen0);
painter2D.drawPolyline(LineBuf2,k); painter2D.drawPolyline(LineBuf2,k);
QString t; if(m_bQ65_Sync) {
t = t.asprintf("DT = %6.2f",xdt); QString t;
painter2D.setPen(Qt::white); t = t.asprintf("DT = %6.2f",xdt);
Font.setWeight(QFont::Bold); painter2D.setPen(Qt::white);
painter2D.setFont(Font); Font.setWeight(QFont::Bold);
painter2D.drawText(m_w-100,m_h2/2,t); painter2D.setFont(Font);
painter2D.drawText(m_w-100,m_h2/2,t);
}
} }
} }
update(); //trigger a new paintEvent update(); //trigger a new paintEvent