Reset k=0 if sub-mode changes.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2650 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-10-05 17:41:04 +00:00
parent 9135fb585c
commit a4d96a79fa
3 changed files with 7 additions and 4 deletions

View File

@ -137,8 +137,8 @@ subroutine symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,f0a,df3, &
endif endif
999 continue 999 continue
! write(71,*) ja,npts8,ja,ja+nfft3,px,rms,pxdb ! write(71,3003) k,nsps,ihsym,nfft3,pxdb,df3,s(250)
!3003 format(5i9,3f11.0) !3003 format(4i9,3f11.3)
! flush(71) ! flush(71)
return return

View File

@ -1,4 +1,4 @@
//------------------------------------------------------------- MainWindow //-------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"
@ -327,6 +327,7 @@ void MainWindow::dataSink(int k)
trmin=m_TRperiod/60; trmin=m_TRperiod/60;
symspec_(&k, &trmin, &m_nsps, &ndiskdat, &nb, &m_NBslider, &px, s, symspec_(&k, &trmin, &m_nsps, &ndiskdat, &nb, &m_NBslider, &px, s,
&f0a, &df3, &ihsym, &nzap, &slimit, lstrong); &f0a, &df3, &ihsym, &nzap, &slimit, lstrong);
// qDebug() << "a" << k << m_nsps << ihsym << px << df3 << s[250];
if(ihsym <=0) return; if(ihsym <=0) return;
QString t; QString t;
m_pctZap=nzap/178.3; m_pctZap=nzap/178.3;

View File

@ -121,6 +121,7 @@ void SoundInThread::run() //SoundInThread::run()
int ntr; int ntr;
int nBusy=0; int nBusy=0;
int nstep0=0; int nstep0=0;
int nsps0=0;
//---------------------------------------------- Soundcard input loop //---------------------------------------------- Soundcard input loop
while (!qe) { while (!qe) {
@ -131,8 +132,9 @@ void SoundInThread::run() //SoundInThread::run()
ntr = nsec % m_TRperiod; ntr = nsec % m_TRperiod;
// Reset buffer pointer and symbol number at start of minute // Reset buffer pointer and symbol number at start of minute
if(ntr < ntr0 or !m_monitoring) { if(ntr < ntr0 or !m_monitoring or m_nsps!=nsps0) {
nstep0=0; nstep0=0;
nsps0=m_nsps;
udata.bzero=true; udata.bzero=true;
} }
k=udata.kin; k=udata.kin;