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

Working toward a good multi-decode solution ...

This commit is contained in:
Joe Taylor 2021-01-31 15:10:50 -05:00
parent e711aa23da
commit 6519c07a71
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/qra/q65/q65.f90
View File

@ -393,7 +393,9 @@ subroutine q65_ccf_22(s1,iz,jz,nfqso,ipk,jpk,f0,xdt,ccf2)
real s1(iz,jz)
real ccf2(iz) !Orange sync curve
real, allocatable :: xdt2(:)
allocate(xdt2(iz))
ccfbest=0.
ibest=0
lagpk=0
@ -415,6 +417,7 @@ subroutine q65_ccf_22(s1,iz,jz,nfqso,ipk,jpk,f0,xdt,ccf2)
endif
enddo
ccf2(i)=ccfmax
xdt2(i)=lagpk*dtstep
if(ccfmax.gt.ccfbest .and. abs(i*df-nfqso).le.ftol) then
ccfbest=ccfmax
ibest=i
@ -519,14 +522,15 @@ subroutine q65_write_red(iz,ia2,xdt,ccf1,ccf2)
call q65_sync_curve(ccf2,1,iz,rms2)
rewind 17
write(17,1000) xdt
do i=1,iz
freq=i*df
ii=i-i0
if(freq.ge.float(nfa) .and. freq.le.float(nfb)) then
ccf1a=-99.0
if(ii.ge.-ia2 .and. ii.le.ia2) ccf1a=ccf1(ii)
write(17,1100) freq,ccf1a,xdt,ccf2(i)
1100 format(4f10.3)
write(17,1000) freq,ccf1a,ccf2(i)
1000 format(3f10.3)
endif
enddo

5
widgets/plotter.cpp
View File

@ -281,9 +281,10 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed)
f.open(m_redFile.toLatin1());
if(f) {
int x,y;
float freq,sync,xdt,sync2;
float freq,xdt,sync,sync2;
f >> xdt;
for(int i=0; i<99999; i++) {
f >> freq >> sync >> xdt >> sync2;
f >> freq >> sync >> sync2;
if(f.eof()) break;
x=XfromFreq(freq);
// if(m_bQ65_MultiSync) sync=sync2;