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

"Export .wav files" now working as intended in QMAP.

Browse Source
This commit is contained in:
Joe Taylor 2024-01-22 11:11:53 -05:00
parent 7be1c34ea0
commit b84742b1fc
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmap/libqmap/q65b.f90
View File

@ -44,10 +44,7 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
! Find best frequency from sync_dat, the "orange sync curve". ! Find best frequency from sync_dat, the "orange sync curve".
df3=96000.0/32768.0 df3=96000.0/32768.0
ipk=(1000.0*f0-1.0)/df3 ipk=(1000.0*f0-1.0)/df3
if(nagain.ge.2) then if(nagain.ge.2) ipk = nint(1000.0*(fqso-nkhz_center+48.0)/df3)
f_mouse=1000.0*(fqso+ikhz-48.0) + mousedf - 1270.0
ipk = nint(f_mouse/df3)
endif
nfft1=MAXFFT1 nfft1=MAXFFT1
nfft2=MAXFFT2 nfft2=MAXFFT2
df=96000.0/NFFT1 df=96000.0/NFFT1
@ -55,7 +52,6 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
k0=nint((ipk*df3-1000.0)/df) k0=nint((ipk*df3-1000.0)/df)
if(k0.lt.nh .or. k0.gt.MAXFFT1-nfft2+1) go to 900 if(k0.lt.nh .or. k0.gt.MAXFFT1-nfft2+1) go to 900
fac=1.0/nfft2 fac=1.0/nfft2
if(nagain.ge.2) print*,nagain,k0,k0*df
cx(0:nfft2-1)=fac*ca(k0:k0+nfft2-1) cx(0:nfft2-1)=fac*ca(k0:k0+nfft2-1)
! Here cx is frequency-domain data around the selected ! Here cx is frequency-domain data around the selected

17
qmap/libqmap/qmapa.f90
View File

@ -48,11 +48,13 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
nts_q65=2**(mode_q65-1) !Q65 tone separation factor nts_q65=2**(mode_q65-1) !Q65 tone separation factor
f0_selected=fselected - nkhz_center + 48.0 f0_selected=fselected - nkhz_center + 48.0
call timer('get_cand',0) if(nagain.le.1) then
! Get a list of decoding candidates call timer('get_cand',0)
call getcand2(ss,savg,nts_q65,nagain,nhsym,ntx30a,ntx30b,ntol, & ! Get a list of decoding candidates
f0_selected,bAlso30,cand,ncand) call getcand2(ss,savg,nts_q65,nagain,nhsym,ntx30a,ntx30b,ntol, &
call timer('get_cand',1) f0_selected,bAlso30,cand,ncand)
call timer('get_cand',1)
endif
nwrite_q65=0 nwrite_q65=0
df=96000.0/NFFT !df = 96000/NFFT = 2.930 Hz df=96000.0/NFFT !df = 96000/NFFT = 2.930 Hz
@ -66,6 +68,11 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
call fftbig(dd,NSMAX) !Do the full-length FFT call fftbig(dd,NSMAX) !Do the full-length FFT
call timer('fftbig ',1) call timer('fftbig ',1)
if(nagain.ge.2) then
ncand=1
fqso=fselected
endif
do icand=1,ncand !Attempt to decode each candidate do icand=1,ncand !Attempt to decode each candidate
tsec=sec_midn() - tsec0 tsec=sec_midn() - tsec0
if(ndiskdat.eq.0) then if(ndiskdat.eq.0) then

1
qmap/mainwindow.cpp
View File

@ -951,7 +951,6 @@ void MainWindow::decode() //decode()
memcpy(savecom_.saveFileName, m_saveFileName.toLatin1(),len1); memcpy(savecom_.saveFileName, m_saveFileName.toLatin1(),len1);
ui->actionExport_wav_file_at_fQSO->setEnabled(m_diskData); ui->actionExport_wav_file_at_fQSO->setEnabled(m_diskData);
qDebug() << "aa" << datcom2_.nagain;
watcher3.setFuture(QtConcurrent::run (q65c_)); watcher3.setFuture(QtConcurrent::run (q65c_));
decodeBusy(true); decodeBusy(true);
} }