From 990b2f03eb012a91d6fb5ea498ea15d58ed82f15 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 16 Sep 2007 14:10:45 +0000 Subject: [PATCH] Added optional directory for azel.dat. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@520 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- ftn_init.F90 | 9 +++++++-- gcom2.f90 | 5 +++-- map65.py | 4 +++- options.py | 5 ++++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ftn_init.F90 b/ftn_init.F90 index 14f4d5910..4bf7ea591 100644 --- a/ftn_init.F90 +++ b/ftn_init.F90 @@ -40,6 +40,11 @@ subroutine ftn_init lenappdir=iz call pfxdump(appdir(:iz)//'/prefixes.txt') + do i=80,1,-1 + if(AzElDir(i:i).ne.' ') goto 2 + enddo +2 iz2=i + #ifdef Win32 open(11,file=appdir(:iz)//'/decoded.txt',status='unknown', & share='denynone',err=910) @@ -59,10 +64,10 @@ subroutine ftn_init endfile 12 #ifdef Win32 - open(14,file=appdir(:iz)//'/azel.dat',status='unknown', & + open(14,file=azeldir(:iz2)//'/azel.dat',status='unknown', & share='denynone',err=930) #else - open(14,file=appdir(:iz)//'/azel.dat',status='unknown', & + open(14,file=azeldir(:iz2)//'/azel.dat',status='unknown', & err=930) #endif diff --git a/gcom2.f90 b/gcom2.f90 index cd1542dd1..9ffa0d867 100644 --- a/gcom2.f90 +++ b/gcom2.f90 @@ -97,6 +97,7 @@ character*24 fnamea character*24 fnameb character*24 decodedfile character*80 AppDir !WSJT installation directory GUI +character*80 AzElDir !Directory for azel.dat GUI character*80 SaveDir !Directory for saved data files GUI character*80 filetokilla !Filenames (full path) Decoder character*80 filetokillb @@ -115,8 +116,8 @@ common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540), & idinterval,msmax,lenappdir,idf,ndiskdat,nlines,nflat,ntxreq,ntxnow, & ndepth,nspecial,ndf,nfmid,nfrange,ss1(-224:224),ss2(-224:224), & mycall,hiscall,hisgrid,txmsg,sending,mode,fname0,fnamea, & - fnameb,decodedfile,AppDir,SaveDir,filetokilla,filetokillb,utcdate, & - pttport,utcdata + fnameb,decodedfile,AppDir,AzElDir,SaveDir,filetokilla,filetokillb, & + utcdate,pttport,utcdata !### volatile /gcom2/ diff --git a/map65.py b/map65.py index a160f1a0e..6825d8f2b 100644 --- a/map65.py +++ b/map65.py @@ -1755,7 +1755,7 @@ try: elif key == 'Nt2': options.nt2.set(value) elif key == 'dphi': options.dphi.set(value) elif key == 'SaveDir': options.savedir.set(value) - + elif key == 'AzElDir': options.azeldir.set(value) elif key == 'TxFirst': TxFirst.set(value) elif key == 'KB8RQ': kb8rq.set(value) elif key == 'K2TXB': k2txb.set(value) @@ -1788,6 +1788,7 @@ except: g.mode=mode.get() Audio.gcom2.appdir=(appdir+' ')[:80] +Audio.gcom2.azeldir=(options.azeldir.get()+' ')[:80] Audio.gcom2.ndepth=ndepth.get() f=open(appdir+'/tmp26.txt','w') f.truncate(0) @@ -1849,6 +1850,7 @@ f.write("CSmin " + str(options.ncsmin.get()) + "\n") f.write("Nt1 " + str(options.nt1.get()) + "\n") f.write("Nt2 " + str(options.nt2.get()) + "\n") f.write("SaveDir " + str(options.savedir.get()) + "\n") +f.write("AzElDir " + str(options.azeldir.get()) + "\n") f.write("TxFirst " + str(TxFirst.get()) + "\n") f.write("KB8RQ " + str(kb8rq.get()) + "\n") f.write("K2TXB " + str(k2txb.get()) + "\n") diff --git a/options.py b/options.py index fe4793116..12bff7931 100644 --- a/options.py +++ b/options.py @@ -50,6 +50,7 @@ ncsmin=IntVar() nt1=IntVar() nt2=IntVar() savedir=StringVar() +azeldir=StringVar() mycall=Pmw.EntryField(g1.interior(),labelpos=W,label_text='My Call:', value='K1JT',entry_textvariable=MyCall,entry_width=12) @@ -112,9 +113,11 @@ nt2_entry=Pmw.EntryField(g3.interior(),labelpos=W, \ label_text='Rx t2:',entry_width=9,value=52,entry_textvariable=nt2) savedir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='SaveDir:', entry_width=23,value=g.appdir+'\save',entry_textvariable=savedir) +azeldir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='AzElDir:', + entry_width=23,value=g.appdir,entry_textvariable=azeldir) widgets = (temp_prefix,aux_ra,aux_dec,nkeep_entry,dphi_entry, \ fa_entry,fb_entry,fcal_entry,min_callsign_entry, \ - nt1_entry,nt2_entry,savedir_entry,) + nt1_entry,nt2_entry,savedir_entry,azeldir_entry,) for widget in widgets: widget.pack(padx=2,pady=2) Pmw.alignlabels(widgets)