diff --git a/lib/jt9.f90 b/lib/jt9.f90 index 2e5d9d950..818cf6c54 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -81,7 +81,7 @@ program jt9 nhsym=(k-2048)/kstep if(nhsym.ge.1 .and. nhsym.ne.nhsym0) then ! 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) nhsym0=nhsym if(ihsym.ge.184) go to 10 diff --git a/lib/symspec.f90 b/lib/symspec.f90 index b51e370a4..dbdf318fe 100644 --- a/lib/symspec.f90 +++ b/lib/symspec.f90 @@ -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) ! Input: @@ -143,4 +143,4 @@ subroutine symspecx(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,f0a,df3, & enddo 999 return -end subroutine symspecx +end subroutine symspec diff --git a/mainwindow.cpp b/mainwindow.cpp index 48d16902e..9d6c2a5c7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -307,7 +307,10 @@ void MainWindow::dataSink(int k) static int ndiskdat; static int nadj=0; static int nb; + static int trmin; static float px=0.0; + static float f0a; + static float df3; static uchar lstrong[1024]; static float slimit; @@ -322,8 +325,9 @@ void MainWindow::dataSink(int k) // Get power, spectrum, nkhz, and ihsym nb=0; if(m_NB) nb=1; - symspecx_(&k, & m_nsps, &ndiskdat, &nb, &m_NBslider, &px, s, - &ihsym, &nzap, &slimit, lstrong); + trmin=m_TRperiod/60; + symspec_(&k, &trmin, &m_nsps, &ndiskdat, &nb, &m_NBslider, &px, s, + &f0a, &df3, &ihsym, &nzap, &slimit, lstrong); if(ihsym <=0) return; QString t; m_pctZap=nzap/178.3; diff --git a/mainwindow.h b/mainwindow.h index ef0e945a6..d49c26ea5 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -217,8 +217,9 @@ extern void getDev(int* numDevices,char hostAPI_DeviceName[][50], extern "C" { //----------------------------------------------------- C and Fortran routines -void symspecx_(int* k, int* nsps, int* ndiskdat, int* nb, int* m_NBslider, - float* px, float s[], int* nhsym, int* nzap, +void symspec_(int* k, int* ntrperiod, int* nsps, int* ndiskdat, + int* nb, int* m_NBslider, float* px, float s[], + float* f0a, float* df3, int* nhsym, int* nzap, float* slimit, uchar lstrong[]); void genjt8_(char* msg, char* msgsent, short itone[], int* nsym, int len1, int len2);