w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

No bounds-check for Release build; increase Windows stack size, again; some fixes for ISCAT mode.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7186 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-16 17:36:00 +00:00
parent efaa814ef6
commit ab400f7a9f
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -804,7 +804,7 @@ endif (APPLE)
# #
# Fortran setup # Fortran setup
# #
set (General_FFLAGS "-Wall -Wno-conversion -fbounds-check -fno-second-underscore") set (General_FFLAGS "-Wall -Wno-conversion -fno-second-underscore")
# FFLAGS depend on the compiler # FFLAGS depend on the compiler
get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME) get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
@ -1135,7 +1135,7 @@ else ()
) )
if (WIN32) if (WIN32)
set_target_properties (wsjtx PROPERTIES set_target_properties (wsjtx PROPERTIES
LINK_FLAGS -Wl,--stack,8388608 LINK_FLAGS -Wl,--stack,16777216
) )
endif () endif ()
endif () endif ()

11
lib/fast_decode.f90
View File

@ -1,5 +1,5 @@
subroutine fast_decode(id2,narg,ntrperiod,bShMsgs,line, & subroutine fast_decode(id2,narg,ntrperiod,bShMsgs,line,mycall_12, &
mycall_12,hiscall_12) hiscall_12)
parameter (NMAX=30*12000) parameter (NMAX=30*12000)
integer*2 id2(NMAX) integer*2 id2(NMAX)
@ -40,7 +40,6 @@ subroutine fast_decode(id2,narg,ntrperiod,bShMsgs,line, &
nrxfreq=narg(10) nrxfreq=narg(10)
ntol=narg(11) ntol=narg(11)
nhashcalls=narg(12) nhashcalls=narg(12)
! print*,'A',nutc
line(1:100)(1:1)=char(0) line(1:100)(1:1)=char(0)
if(t0.gt.float(ntrperiod)) go to 900 if(t0.gt.float(ntrperiod)) go to 900
@ -61,12 +60,9 @@ subroutine fast_decode(id2,narg,ntrperiod,bShMsgs,line, &
ib=nint(t1*12000.0) ib=nint(t1*12000.0)
if(ib.gt.ntrperiod*12000) ib=ntrperiod*12000 if(ib.gt.ntrperiod*12000) ib=ntrperiod*12000
nz=ib-ia+1 nz=ib-ia+1
! line(1)=char(0)
if(newdat.eq.1) then if(newdat.eq.1) then
! Full sequence of new data ! Full sequence of new data
! write(*,3001) newdat,npick,nutca
!3001 format(2i3,3i8)
call msk144_decode(id2a(ia),nz,nutca,0,mycall,hiscall, & call msk144_decode(id2a(ia),nz,nutca,0,mycall,hiscall, &
bShMsgs,ntol,t0,line) bShMsgs,ntol,t0,line)
go to 100 go to 100
@ -74,7 +70,6 @@ subroutine fast_decode(id2,narg,ntrperiod,bShMsgs,line, &
if(npick.eq.1) then if(npick.eq.1) then
! Pick-decode from upper panel ! Pick-decode from upper panel
! write(*,3001) newdat,npick,nutc
call msk144_decode(id2(ia),nz,nutc,0,mycall,hiscall, & call msk144_decode(id2(ia),nz,nutc,0,mycall,hiscall, &
bShMsgs,ntol,t0,line) bShMsgs,ntol,t0,line)
go to 100 go to 100
@ -95,6 +90,8 @@ subroutine fast_decode(id2,narg,ntrperiod,bShMsgs,line, &
cdat2=cdat cdat2=cdat
ndat=ndat0 ndat=ndat0
call wav11(id2,ndat,dat) call wav11(id2,ndat,dat)
nzz=11025*ntrperiod
if(npts.lt.nzz) dat(npts+1:nzz)=0.0
ndat=min(ndat,30*11025) ndat=min(ndat,30*11025)
call ana932(dat,ndat,cdat,npts) !Make downsampled analytic signal call ana932(dat,ndat,cdat,npts) !Make downsampled analytic signal
endif endif

3
lib/wav11.f90
View File

@ -14,7 +14,7 @@ subroutine wav11(d2,npts,dd)
jz=min(NZ12,npts) jz=min(NZ12,npts)
x(1:jz)=d2(1:jz) x(1:jz)=d2(1:jz)
x(jz+1:)=0.0 x(jz+1:)=0.0
call four2a(x,nfft1,1,-1,0) !Forwarxd FFT, r2c call four2a(x,nfft1,1,-1,0) !Forward FFT, r2c
df=12000.0/NFFT1 df=12000.0/NFFT1
ia=5000.0/df ia=5000.0/df
cx(ia:)=0.0 cx(ia:)=0.0
@ -22,7 +22,6 @@ subroutine wav11(d2,npts,dd)
npts=jz*11025.0/12000.0 npts=jz*11025.0/12000.0
fac=1.e-6 fac=1.e-6
dd(1:npts)=fac*x(1:npts) dd(1:npts)=fac*x(1:npts)
if(npts.lt.NZ11) dd(npts+1:NZ11)=0.0
return return
end subroutine wav11 end subroutine wav11

6
mainwindow.cpp
View File

@ -110,7 +110,7 @@ extern "C" {
void fast_decode_(short id2[], int narg[], int* ntrperiod, bool* bShMsgs, void fast_decode_(short id2[], int narg[], int* ntrperiod, bool* bShMsgs,
char msg[], char mycall[], char hiscall[], char msg[], char mycall[], char hiscall[],
int len1, int len2, int len3, int len4); int len1, int len2, int len3);
void degrade_snr_(short d2[], int* n, float* db, float* bandwidth); void degrade_snr_(short d2[], int* n, float* db, float* bandwidth);
void wav12_(short d2[], short d1[], int* nbytes, short* nbitsam2); void wav12_(short d2[], short d1[], int* nbytes, short* nbitsam2);
void refspectrum_(short int d2[], bool* brefspec, bool* buseref, void refspectrum_(short int d2[], bool* brefspec, bool* buseref,
@ -2182,7 +2182,7 @@ void MainWindow::decode() //decode()
isec=isec - isec%m_TRperiod; isec=isec - isec%m_TRperiod;
dec_data.params.nutc=10000*ihr + 100*imin + isec; dec_data.params.nutc=10000*ihr + 100*imin + isec;
} }
if(m_nPick==1 and m_diskData) // if(m_nPick==1 and m_diskData) ???
if(m_nPick==2) dec_data.params.nutc=m_nutc0; if(m_nPick==2) dec_data.params.nutc=m_nutc0;
dec_data.params.nfqso=m_wideGraph->rxFreq(); dec_data.params.nfqso=m_wideGraph->rxFreq();
@ -2291,7 +2291,7 @@ void MainWindow::decode() //decode()
memcpy(d2b,dec_data.d2,2*360000); memcpy(d2b,dec_data.d2,2*360000);
watcher3.setFuture (QtConcurrent::run (std::bind (fast_decode_,&d2b[0], watcher3.setFuture (QtConcurrent::run (std::bind (fast_decode_,&d2b[0],
&narg[0],&m_TRperiod,&m_bShMsgs,&m_msg[0][0], &narg[0],&m_TRperiod,&m_bShMsgs,&m_msg[0][0],
dec_data.params.mycall,dec_data.params.hiscall,80,512,12,12))); dec_data.params.mycall,dec_data.params.hiscall,8000,12,12)));
} else { } else {
memcpy(to, from, qMin(mem_jt9->size(), size)); memcpy(to, from, qMin(mem_jt9->size(), size));
QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove (); // Allow jt9 to start QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove (); // Allow jt9 to start