w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-19 10:32:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Corrected calling sequences for symspec.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2638 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-10-03 15:22:49 +00:00
parent 031885775b
commit fd8b86cef2
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jt9.f90
View File

@ -81,7 +81,7 @@ program jt9
nhsym=(k-2048)/kstep nhsym=(k-2048)/kstep
if(nhsym.ge.1 .and. nhsym.ne.nhsym0) then if(nhsym.ge.1 .and. nhsym.ne.nhsym0) then
! Emit signal readyForFFT ! Emit signal readyForFFT
call symspecx(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb, & call symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb, &
s,f0a,df3,ihsym,nzap,slimit,lstrong) s,f0a,df3,ihsym,nzap,slimit,lstrong)
nhsym0=nhsym nhsym0=nhsym
if(ihsym.ge.184) go to 10 if(ihsym.ge.184) go to 10

4
lib/symspec.f90
View File

@ -1,4 +1,4 @@
subroutine symspecx(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,f0a,df3, & subroutine symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,f0a,df3, &
ihsym,nzap,slimit,lstrong) ihsym,nzap,slimit,lstrong)
! Input: ! Input:
@ -143,4 +143,4 @@ subroutine symspecx(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,f0a,df3, &
enddo enddo
999 return 999 return
end subroutine symspecx end subroutine symspec

8
mainwindow.cpp
View File

@ -307,7 +307,10 @@ void MainWindow::dataSink(int k)
static int ndiskdat; static int ndiskdat;
static int nadj=0; static int nadj=0;
static int nb; static int nb;
static int trmin;
static float px=0.0; static float px=0.0;
static float f0a;
static float df3;
static uchar lstrong[1024]; static uchar lstrong[1024];
static float slimit; static float slimit;
@ -322,8 +325,9 @@ void MainWindow::dataSink(int k)
// Get power, spectrum, nkhz, and ihsym // Get power, spectrum, nkhz, and ihsym
nb=0; nb=0;
if(m_NB) nb=1; if(m_NB) nb=1;
symspecx_(&k, & m_nsps, &ndiskdat, &nb, &m_NBslider, &px, s, trmin=m_TRperiod/60;
&ihsym, &nzap, &slimit, lstrong); symspec_(&k, &trmin, &m_nsps, &ndiskdat, &nb, &m_NBslider, &px, s,
&f0a, &df3, &ihsym, &nzap, &slimit, lstrong);
if(ihsym <=0) return; if(ihsym <=0) return;
QString t; QString t;
m_pctZap=nzap/178.3; m_pctZap=nzap/178.3;

5
mainwindow.h
View File

@ -217,8 +217,9 @@ extern void getDev(int* numDevices,char hostAPI_DeviceName[][50],
extern "C" { extern "C" {
//----------------------------------------------------- C and Fortran routines //----------------------------------------------------- C and Fortran routines
void symspecx_(int* k, int* nsps, int* ndiskdat, int* nb, int* m_NBslider, void symspec_(int* k, int* ntrperiod, int* nsps, int* ndiskdat,
float* px, float s[], int* nhsym, int* nzap, int* nb, int* m_NBslider, float* px, float s[],
float* f0a, float* df3, int* nhsym, int* nzap,
float* slimit, uchar lstrong[]); float* slimit, uchar lstrong[]);
void genjt8_(char* msg, char* msgsent, short itone[], int* nsym, void genjt8_(char* msg, char* msgsent, short itone[], int* nsym,
int len1, int len2); int len1, int len2);