Temporary save. Next, will try a ring-buffer approach.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2542 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-08-30 17:04:57 +00:00
parent 6fce19c9f1
commit d3d956b54c
3 changed files with 13 additions and 2 deletions

View File

@ -133,12 +133,13 @@
call timer('dec65b ',1) call timer('dec65b ',1)
if(nqd.eq.1 .and. nkv.eq.0) then if(nqd.eq.1 .and. nkv.eq.0) then
if(nutc.ne.nutc0) syncbest=0. if(nutc.ne.nutc0 .or. nkhz.ne.nkhz0) syncbest=0.
if(sync2.gt.syncbest) then if(sync2.gt.syncbest) then
if(nutc.eq.nutc0) nsave=nsave-1 if(nutc.eq.nutc0 .and. nkhz.eq.nkhz0) nsave=nsave-1
if(nkhz.ne.nkhz0) nsave=0 if(nkhz.ne.nkhz0) nsave=0
nkhz0=nkhz nkhz0=nkhz
nsave=min(32,nsave+1) nsave=min(32,nsave+1)
nsave=max(1,nsave)
npol=nint(57.296*pol) npol=nint(57.296*pol)
call s3avg(nsave,mode65,nutc,ndf,dt+0.8,npol,s3,nsum, call s3avg(nsave,mode65,nutc,ndf,dt+0.8,npol,s3,nsum,
+ nkv,decoded) + nkv,decoded)

View File

@ -18,6 +18,10 @@ subroutine s3avg(nsave,mode65,nutc,ndf,xdt,npol,s3,nsum,nkv,decoded)
dt(nsave)=xdt !Save DT dt(nsave)=xdt !Save DT
s3a(1:64,1:63,nsave)=s3 !Save the spectra s3a(1:64,1:63,nsave)=s3 !Save the spectra
write(71,3001) nsave,nutc,ndf,npol,xdt
3001 format(4i5,f8.1)
flush(71)
s3b=0. s3b=0.
nsum=0 nsum=0
idfdiff=100 idfdiff=100

View File

@ -1337,6 +1337,7 @@ void MainWindow::guiUpdate()
static int nc1=1; static int nc1=1;
static char msgsent[23]; static char msgsent[23];
static int nsendingsh=0; static int nsendingsh=0;
static int fQSOz=-1;
int khsym=0; int khsym=0;
double tx1=0.0; double tx1=0.0;
@ -1503,6 +1504,11 @@ void MainWindow::guiUpdate()
QDateTime t = QDateTime::currentDateTimeUtc(); QDateTime t = QDateTime::currentDateTimeUtc();
int fQSO=g_pWideGraph->QSOfreq(); int fQSO=g_pWideGraph->QSOfreq();
if(fQSO != fQSOz) {
qDebug() << fQSOz << fQSO << m_nutc0;
m_nsave=0;
fQSOz=fQSO;
}
g_pAstro->astroUpdate(t, m_myGrid, m_hisGrid, fQSO, m_setftx, g_pAstro->astroUpdate(t, m_myGrid, m_hisGrid, fQSO, m_setftx,
m_txFreq, m_azelDir); m_txFreq, m_azelDir);
m_setftx=0; m_setftx=0;