w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-04 08:21:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Pass nContest value to hspec.f90.

Browse Source
This commit is contained in:
Joe Taylor 2018-07-27 09:45:14 -04:00
parent adcffe3db4
commit 789d2042bf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/hspec.f90
View File

@ -1,4 +1,4 @@
subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,ncontest,bmsk144, &
btrain,pcoeffs,ingain,mycall,hiscall,bshmsg,bswl,datadir,green,s, & btrain,pcoeffs,ingain,mycall,hiscall,bshmsg,bswl,datadir,green,s, &
jh,pxmax,dbNoGain,line1,mygrid) jh,pxmax,dbNoGain,line1,mygrid)
@ -8,6 +8,7 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, &
! ntrpdepth TR period and 1000*ndepth ! ntrpdepth TR period and 1000*ndepth
! nrxfreq Rx audio center frequency ! nrxfreq Rx audio center frequency
! ntol Decoding range is +/- ntol ! ntol Decoding range is +/- ntol
! ncontest Contest type (0=NONE 1=NA_VHF 2=EU_VHF 3=FIELD_DAY 4=RTTY)
! bmsk144 Boolean, true if in MSK144 mode ! bmsk144 Boolean, true if in MSK144 mode
! btrain Boolean, turns on training in MSK144 mode ! btrain Boolean, turns on training in MSK144 mode
! ingain Relative gain for spectra ! ingain Relative gain for spectra

5
mainwindow.cpp
View File

@ -70,7 +70,7 @@ extern "C" {
float *m_pxmax); float *m_pxmax);
void hspec_(short int d2[], int* k, int* nutc0, int* ntrperiod, int* nrxfreq, int* ntol, void hspec_(short int d2[], int* k, int* nutc0, int* ntrperiod, int* nrxfreq, int* ntol,
bool* bmsk144, bool* btrain, double const pcoeffs[], int* ingain, int* nContest, bool* bmsk144, bool* btrain, double const pcoeffs[], int* ingain,
char mycall[], char hiscall[], bool* bshmsg, bool* bswl, char ddir[], float green[], char mycall[], char hiscall[], bool* bshmsg, bool* bswl, char ddir[], float green[],
float s[], int* jh, float *pxmax, float *rmsNoGain, char line[], char mygrid[], float s[], int* jh, float *pxmax, float *rmsNoGain, char line[], char mygrid[],
fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t,
@ -1512,7 +1512,8 @@ void MainWindow::fastSink(qint64 frames)
float pxmax = 0; float pxmax = 0;
float rmsNoGain = 0; float rmsNoGain = 0;
int ftol = ui->sbFtol->value (); int ftol = ui->sbFtol->value ();
hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&RxFreq,&ftol,&bmsk144, int nContest=m_nContest;
hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&RxFreq,&ftol,&nContest,&bmsk144,
&m_bTrain,m_phaseEqCoefficients.constData(),&m_inGain,&dec_data.params.mycall[0], &m_bTrain,m_phaseEqCoefficients.constData(),&m_inGain,&dec_data.params.mycall[0],
&dec_data.params.hiscall[0],&bshmsg,&bswl, &dec_data.params.hiscall[0],&bshmsg,&bswl,
&ddir[0],fast_green,fast_s,&fast_jh,&pxmax,&rmsNoGain,&line[0],&dec_data.params.mygrid[0], &ddir[0],fast_green,fast_s,&fast_jh,&pxmax,&rmsNoGain,&line[0],&dec_data.params.mygrid[0],