From 756430120929a02d15b08a452bdae95f1e83a6a3 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 19 Mar 2020 11:43:22 -0400 Subject: [PATCH] Silence compiler warnings. --- lib/fast_decode.f90 | 8 ++++---- lib/ft8/get_spectrum_baseline.f90 | 2 +- lib/hspec.f90 | 4 ++-- lib/iscat.f90 | 2 +- widgets/mainwindow.cpp | 5 ++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/fast_decode.f90 b/lib/fast_decode.f90 index c3cadb6a7..d32314b93 100644 --- a/lib/fast_decode.f90 +++ b/lib/fast_decode.f90 @@ -87,11 +87,11 @@ subroutine fast_decode(id2,narg,trperiod,line,mycall_12, & jz=ib-ia+1 line(1:100)(1:1)=char(0) if(npick.eq.2) then - call iscat(cdat2(ia),jz,3,40,t2,pick,cfile6,minsync,ntol,NFreeze, & - MouseDF,mousebutton,mode4,nafc,ndebug,psavg,nmax,nlines,line) + call iscat(cdat2(ia),jz,3,40,t2,pick,cfile6,minsync,ntol, & + mousebutton,mode4,nafc,ndebug,psavg,nmax,nlines,line) else - call iscat(cdat(ia),jz,3,40,t2,pick,cfile6,minsync,ntol,NFreeze, & - MouseDF,mousebutton,mode4,nafc,ndebug,psavg,maxlines,nlines,line) + call iscat(cdat(ia),jz,3,40,t2,pick,cfile6,minsync,ntol, & + mousebutton,mode4,nafc,ndebug,psavg,maxlines,nlines,line) endif 900 return diff --git a/lib/ft8/get_spectrum_baseline.f90 b/lib/ft8/get_spectrum_baseline.f90 index 95eb55324..9cf4e637c 100644 --- a/lib/ft8/get_spectrum_baseline.f90 +++ b/lib/ft8/get_spectrum_baseline.f90 @@ -1,7 +1,7 @@ subroutine get_spectrum_baseline(dd,nfa,nfb,sbase) include 'ft8_params.f90' - parameter(NST=NFFT1/2,NF=NMAX/NST-1) + parameter(NST=NFFT1/2,NF=93) !NF=NMAX/NST-1 real s(NH1,NF) real savg(NH1) real sbase(NH1) diff --git a/lib/hspec.f90 b/lib/hspec.f90 index d041ba77a..920b2bfe0 100644 --- a/lib/hspec.f90 +++ b/lib/hspec.f90 @@ -1,5 +1,5 @@ -subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,ncontest,bmsk144, & - btrain,pcoeffs,ingain,mycall,hiscall,bshmsg,bswl,datadir,green,s, & +subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & + btrain,pcoeffs,ingain,mycall,hiscall,bshmsg,bswl,datadir,green,s, & jh,pxmax,dbNoGain,line1,mygrid) ! Input: diff --git a/lib/iscat.f90 b/lib/iscat.f90 index f412df0f4..17d1454f5 100644 --- a/lib/iscat.f90 +++ b/lib/iscat.f90 @@ -1,5 +1,5 @@ subroutine iscat(cdat0,npts0,nh,npct,t2,pick,cfile6,minsync,ntol, & - NFreeze,MouseDF,mousebutton,mode4,nafc,nmore,psavg,maxlines,nlines,line) + mousebutton,mode4,nafc,nmore,psavg,maxlines,nlines,line) ! Decode an ISCAT signal diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 43873a758..6ba53ffcc 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -92,7 +92,7 @@ extern "C" { int* nhsym, int* npts8, float *m_pxmax); void hspec_(short int d2[], int* k, int* nutc0, int* ntrperiod, int* nrxfreq, int* ntol, - int* nContest, bool* bmsk144, bool* btrain, double const pcoeffs[], int* ingain, + bool* bmsk144, bool* btrain, double const pcoeffs[], int* ingain, char mycall[], char hiscall[], bool* bshmsg, bool* bswl, char ddir[], float green[], float s[], int* jh, float *pxmax, float *rmsNoGain, char line[], char mygrid[], fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, @@ -1635,8 +1635,7 @@ void MainWindow::fastSink(qint64 frames) float pxmax = 0; float rmsNoGain = 0; int ftol = ui->sbFtol->value (); - int nContest = static_cast (m_config.special_op_id()); - hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&RxFreq,&ftol,&nContest,&bmsk144, + hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&RxFreq,&ftol,&bmsk144, &m_bTrain,m_phaseEqCoefficients.constData(),&m_inGain,&dec_data.params.mycall[0], &dec_data.params.hiscall[0],&bshmsg,&bswl, &ddir[0],fast_green,fast_s,&fast_jh,&pxmax,&rmsNoGain,&line[0],&dec_data.params.mygrid[0],