From b544efb9e5c83e2cf998230cdfb8c860807bf0b2 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 21 Nov 2012 21:08:17 +0000 Subject: [PATCH] Implement "nagain", etc. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2761 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/jt9a.F90 | 2 ++ mainwindow.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/jt9a.F90 b/lib/jt9a.F90 index e53f9d8fd..d61bbc5f3 100644 --- a/lib/jt9a.F90 +++ b/lib/jt9a.F90 @@ -85,6 +85,8 @@ subroutine jt9c(ss,savg,c0,id2,nparams0) nparams=nparams0 !Copy parameters into common/npar/ npatience=1 + call flush(6) + if(iand(nrxlog,1).ne.0) then ! write(21,1000) datetime(:17) !1000 format(/'UTC Date: 'a17/78('-')) diff --git a/mainwindow.cpp b/mainwindow.cpp index 08dea078b..8302811f2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -845,6 +845,7 @@ void MainWindow::on_DecodeButton_clicked() //Decode request { if(!m_decoderBusy) { jt9com_.newdat=0; + jt9com_.nagain=1; decode(); } } @@ -854,6 +855,7 @@ void MainWindow::freezeDecode(int n) //freezeDecode() static int ntol[] = {1,2,5,10,20,50,100,200,500,1000}; if(!m_decoderBusy) { jt9com_.newdat=0; + jt9com_.nagain=1; int i; if(m_mode=="JT9-1") i=4; if(m_mode=="JT9-2") i=4; @@ -875,7 +877,7 @@ void MainWindow::decode() //decode() int imin=ms/60000; int ihr=imin/60; imin=imin % 60; - jt9com_.nutc=100*(100*ihr + imin); + jt9com_.nutc=100*ihr + imin; } jt9com_.nfqso=g_pWideGraph->QSOfreq(); @@ -904,14 +906,14 @@ void MainWindow::decode() //decode() char *to = (char*)mem_jt9.data(); char *from = (char*) jt9com_.ss; int size=sizeof(jt9com_); - /* + if(jt9com_.newdat==0) { - int noffset = 4*4*5760000 + 4*4*322*32768 + 4*4*32768; + int noffset = 4*184*22000 + 4*22000 + 4*2*1800*1500 + 2*1800*12000; to += noffset; from += noffset; size -= noffset; } - */ + memcpy(to, from, qMin(mem_jt9.size(), size)); jt9com_.nagain=0; jt9com_.ndiskdat=0;