From a4d96a79fa321ef477e7ce783e0ab58d574527dc Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 5 Oct 2012 17:41:04 +0000 Subject: [PATCH] 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 --- lib/symspec.f90 | 4 ++-- mainwindow.cpp | 3 ++- soundin.cpp | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/symspec.f90 b/lib/symspec.f90 index 3f9279742..3dcd0f150 100644 --- a/lib/symspec.f90 +++ b/lib/symspec.f90 @@ -137,8 +137,8 @@ subroutine symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,f0a,df3, & endif 999 continue -! write(71,*) ja,npts8,ja,ja+nfft3,px,rms,pxdb -!3003 format(5i9,3f11.0) +! write(71,3003) k,nsps,ihsym,nfft3,pxdb,df3,s(250) +!3003 format(4i9,3f11.3) ! flush(71) return diff --git a/mainwindow.cpp b/mainwindow.cpp index 0c85fe590..df534c282 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" @@ -327,6 +327,7 @@ void MainWindow::dataSink(int k) trmin=m_TRperiod/60; symspec_(&k, &trmin, &m_nsps, &ndiskdat, &nb, &m_NBslider, &px, s, &f0a, &df3, &ihsym, &nzap, &slimit, lstrong); +// qDebug() << "a" << k << m_nsps << ihsym << px << df3 << s[250]; if(ihsym <=0) return; QString t; m_pctZap=nzap/178.3; diff --git a/soundin.cpp b/soundin.cpp index 7e6cc7ff8..30d9b230e 100644 --- a/soundin.cpp +++ b/soundin.cpp @@ -121,6 +121,7 @@ void SoundInThread::run() //SoundInThread::run() int ntr; int nBusy=0; int nstep0=0; + int nsps0=0; //---------------------------------------------- Soundcard input loop while (!qe) { @@ -131,8 +132,9 @@ void SoundInThread::run() //SoundInThread::run() ntr = nsec % m_TRperiod; // 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; + nsps0=m_nsps; udata.bzero=true; } k=udata.kin;