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
This commit is contained in:
Joe Taylor 2007-09-16 14:10:45 +00:00
parent 4d60c0110d
commit 990b2f03eb
4 changed files with 17 additions and 6 deletions

View File

@ -40,6 +40,11 @@ subroutine ftn_init
lenappdir=iz lenappdir=iz
call pfxdump(appdir(:iz)//'/prefixes.txt') call pfxdump(appdir(:iz)//'/prefixes.txt')
do i=80,1,-1
if(AzElDir(i:i).ne.' ') goto 2
enddo
2 iz2=i
#ifdef Win32 #ifdef Win32
open(11,file=appdir(:iz)//'/decoded.txt',status='unknown', & open(11,file=appdir(:iz)//'/decoded.txt',status='unknown', &
share='denynone',err=910) share='denynone',err=910)
@ -59,10 +64,10 @@ subroutine ftn_init
endfile 12 endfile 12
#ifdef Win32 #ifdef Win32
open(14,file=appdir(:iz)//'/azel.dat',status='unknown', & open(14,file=azeldir(:iz2)//'/azel.dat',status='unknown', &
share='denynone',err=930) share='denynone',err=930)
#else #else
open(14,file=appdir(:iz)//'/azel.dat',status='unknown', & open(14,file=azeldir(:iz2)//'/azel.dat',status='unknown', &
err=930) err=930)
#endif #endif

View File

@ -97,6 +97,7 @@ character*24 fnamea
character*24 fnameb character*24 fnameb
character*24 decodedfile character*24 decodedfile
character*80 AppDir !WSJT installation directory GUI 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 SaveDir !Directory for saved data files GUI
character*80 filetokilla !Filenames (full path) Decoder character*80 filetokilla !Filenames (full path) Decoder
character*80 filetokillb 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, & idinterval,msmax,lenappdir,idf,ndiskdat,nlines,nflat,ntxreq,ntxnow, &
ndepth,nspecial,ndf,nfmid,nfrange,ss1(-224:224),ss2(-224:224), & ndepth,nspecial,ndf,nfmid,nfrange,ss1(-224:224),ss2(-224:224), &
mycall,hiscall,hisgrid,txmsg,sending,mode,fname0,fnamea, & mycall,hiscall,hisgrid,txmsg,sending,mode,fname0,fnamea, &
fnameb,decodedfile,AppDir,SaveDir,filetokilla,filetokillb,utcdate, & fnameb,decodedfile,AppDir,AzElDir,SaveDir,filetokilla,filetokillb, &
pttport,utcdata utcdate,pttport,utcdata
!### volatile /gcom2/ !### volatile /gcom2/

View File

@ -1755,7 +1755,7 @@ try:
elif key == 'Nt2': options.nt2.set(value) elif key == 'Nt2': options.nt2.set(value)
elif key == 'dphi': options.dphi.set(value) elif key == 'dphi': options.dphi.set(value)
elif key == 'SaveDir': options.savedir.set(value) elif key == 'SaveDir': options.savedir.set(value)
elif key == 'AzElDir': options.azeldir.set(value)
elif key == 'TxFirst': TxFirst.set(value) elif key == 'TxFirst': TxFirst.set(value)
elif key == 'KB8RQ': kb8rq.set(value) elif key == 'KB8RQ': kb8rq.set(value)
elif key == 'K2TXB': k2txb.set(value) elif key == 'K2TXB': k2txb.set(value)
@ -1788,6 +1788,7 @@ except:
g.mode=mode.get() g.mode=mode.get()
Audio.gcom2.appdir=(appdir+' ')[:80] Audio.gcom2.appdir=(appdir+' ')[:80]
Audio.gcom2.azeldir=(options.azeldir.get()+' ')[:80]
Audio.gcom2.ndepth=ndepth.get() Audio.gcom2.ndepth=ndepth.get()
f=open(appdir+'/tmp26.txt','w') f=open(appdir+'/tmp26.txt','w')
f.truncate(0) 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("Nt1 " + str(options.nt1.get()) + "\n")
f.write("Nt2 " + str(options.nt2.get()) + "\n") f.write("Nt2 " + str(options.nt2.get()) + "\n")
f.write("SaveDir " + str(options.savedir.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("TxFirst " + str(TxFirst.get()) + "\n")
f.write("KB8RQ " + str(kb8rq.get()) + "\n") f.write("KB8RQ " + str(kb8rq.get()) + "\n")
f.write("K2TXB " + str(k2txb.get()) + "\n") f.write("K2TXB " + str(k2txb.get()) + "\n")

View File

@ -50,6 +50,7 @@ ncsmin=IntVar()
nt1=IntVar() nt1=IntVar()
nt2=IntVar() nt2=IntVar()
savedir=StringVar() savedir=StringVar()
azeldir=StringVar()
mycall=Pmw.EntryField(g1.interior(),labelpos=W,label_text='My Call:', mycall=Pmw.EntryField(g1.interior(),labelpos=W,label_text='My Call:',
value='K1JT',entry_textvariable=MyCall,entry_width=12) 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) label_text='Rx t2:',entry_width=9,value=52,entry_textvariable=nt2)
savedir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='SaveDir:', savedir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='SaveDir:',
entry_width=23,value=g.appdir+'\save',entry_textvariable=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, \ widgets = (temp_prefix,aux_ra,aux_dec,nkeep_entry,dphi_entry, \
fa_entry,fb_entry,fcal_entry,min_callsign_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: for widget in widgets:
widget.pack(padx=2,pady=2) widget.pack(padx=2,pady=2)
Pmw.alignlabels(widgets) Pmw.alignlabels(widgets)