From 82f5af175984fdb092188984e96a5dfd46fc10c5 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 27 Oct 2008 19:20:07 +0000 Subject: [PATCH] Changed label on "Set Tx Freq" button. Write *.tf2 file is chunks, to see if it fixes occasional crashes when saving data. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1037 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- map65.py | 2 +- map65a.F90 | 2 +- savetf2.F90 | 24 ++++++++++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/map65.py b/map65.py index 4ab3cd7c8..b1378b1a2 100644 --- a/map65.py +++ b/map65.py @@ -1670,7 +1670,7 @@ f5b.pack(side=LEFT,expand=1,fill=BOTH) f5c=Frame(iframe5,bd=2,relief=GROOVE) txfirst=Checkbutton(f5c,text='Tx First',justify=RIGHT,variable=TxFirst) f5c2=Frame(f5c,bd=0) -ftx=Button(f5c,text='Set fTx',underline=0,command=set_ftx, +ftx=Button(f5c,text='Set Tx Freq',underline=0,command=set_ftx, padx=1,pady=1) genmsg=Button(f5c,text='GenStdMsgs',underline=0,command=GenStdMsgs, padx=1,pady=1) diff --git a/map65a.F90 b/map65a.F90 index 85e80ad53..ceb69159a 100644 --- a/map65a.F90 +++ b/map65a.F90 @@ -101,7 +101,7 @@ subroutine map65a(newdat) tavg(ii)=savg(jp,iii) else print*,'Error in iii:',iii,ia,ib,fa,fb - stop + go to 999 endif enddo call pctile(tavg,tmp,101,50,base(jp)) diff --git a/savetf2.F90 b/savetf2.F90 index ad04ed6cd..3e4463653 100644 --- a/savetf2.F90 +++ b/savetf2.F90 @@ -31,16 +31,32 @@ subroutine savetf2(id,fnamedate,savedir) #else open(17,file=fname,status='unknown',access='stream',err=998) #endif - write(17,err=997) id + +! write(17,err=997) id + do i=1,1024 + i0=(i-1)*5625 + 1 + call w17(id(1,i0),ierr) + if(ierr.ne.0) print*,'Error writing tf2 file' + enddo + close(17) go to 999 -997 print*,'Error writing tf2 file' - print*,fname - go to 999 +!997 print*,'Error writing tf2 file' +! print*,fname +! go to 999 998 print*,'Cannot open file:' print*,fname 999 return end subroutine savetf2 + +subroutine w17(id,ierr) + integer*2 id(4,5625) + write(17,err=998) id + ierr=0 + go to 999 +998 ierr=1 +999 return +end subroutine w17