mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-29 04:42:28 -04:00
1. Trapped specjt error about "images do not match".
2. Fixed grid2deg to be case-insensitive for grid locator. 3. Bumped Revision number to 5.9.3. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@116 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
499f968d9a
commit
f54c6029d4
@ -80,8 +80,7 @@ can learn more at http://developer.berlios.de/projects/wsjt/.
|
|||||||
The first significant result of the group effort has been to create
|
The first significant result of the group effort has been to create
|
||||||
versions of WSJT that run under the Linux and FreeBSD operating
|
versions of WSJT that run under the Linux and FreeBSD operating
|
||||||
systems. Porting WSJT to the Macintosh platform should be
|
systems. Porting WSJT to the Macintosh platform should be
|
||||||
straightforward, as well, although the development team does not
|
straightforward, as well, but has not yet been attempted.
|
||||||
yet include anyone with Macintosh hardware.
|
|
||||||
|
|
||||||
If you are interested in testing and using WSJT on your own Linux or
|
If you are interested in testing and using WSJT on your own Linux or
|
||||||
FreeBSD system, we'd like to hear from you.
|
FreeBSD system, we'd like to hear from you.
|
||||||
|
18
grid2deg.f
18
grid2deg.f
@ -1,12 +1,24 @@
|
|||||||
subroutine grid2deg(grid,dlong,dlat)
|
subroutine grid2deg(grid0,dlong,dlat)
|
||||||
|
|
||||||
C Converts Maidenhead grid locator to degrees of West longitude
|
C Converts Maidenhead grid locator to degrees of West longitude
|
||||||
C and North latitude.
|
C and North latitude.
|
||||||
|
|
||||||
character*6 grid
|
character*6 grid0,grid
|
||||||
character*1 g1,g2,g3,g4,g5,g6
|
character*1 g1,g2,g3,g4,g5,g6
|
||||||
|
|
||||||
if(grid(5:5).eq.' ') grid(5:6)='mm'
|
grid=grid0
|
||||||
|
i=ichar(grid(5:5))
|
||||||
|
if(grid(5:5).eq.' ' .or. i.le.64 .or. i.ge.128) grid(5:6)='mm'
|
||||||
|
|
||||||
|
if(grid(1:1).ge.'a' .and. grid(1:1).le.'z') grid(1:1)=
|
||||||
|
+ char(ichar(grid(1:1))+ichar('A')-ichar('a'))
|
||||||
|
if(grid(2:2).ge.'a' .and. grid(2:2).le.'z') grid(2:2)=
|
||||||
|
+ char(ichar(grid(2:2))+ichar('A')-ichar('a'))
|
||||||
|
if(grid(5:5).ge.'A' .and. grid(5:5).le.'Z') grid(5:5)=
|
||||||
|
+ char(ichar(grid(5:5))-ichar('A')+ichar('a'))
|
||||||
|
if(grid(6:6).ge.'A' .and. grid(6:6).le.'Z') grid(6:6)=
|
||||||
|
+ char(ichar(grid(6:6))-ichar('A')+ichar('a'))
|
||||||
|
|
||||||
g1=grid(1:1)
|
g1=grid(1:1)
|
||||||
g2=grid(2:2)
|
g2=grid(2:2)
|
||||||
g3=grid(3:3)
|
g3=grid(3:3)
|
||||||
|
@ -228,7 +228,10 @@ def update():
|
|||||||
n=Audio.gcom2.nlines
|
n=Audio.gcom2.nlines
|
||||||
box=(0,0,750,300-n) #Define region
|
box=(0,0,750,300-n) #Define region
|
||||||
region=im.crop(box) #Get all but last line(s)
|
region=im.crop(box) #Get all but last line(s)
|
||||||
im.paste(region,(0,n)) #Move waterfall down
|
try:
|
||||||
|
im.paste(region,(0,n)) #Move waterfall down
|
||||||
|
except:
|
||||||
|
print "Images did not match, continuing anyway."
|
||||||
for i in range(n):
|
for i in range(n):
|
||||||
line0.putdata(a[750*i:750*(i+1)]) #One row of pixels to line0
|
line0.putdata(a[750*i:750*(i+1)]) #One row of pixels to line0
|
||||||
im.paste(line0,(0,i)) #Paste in new top line
|
im.paste(line0,(0,i)) #Paste in new top line
|
||||||
|
6
wsjt.py
6
wsjt.py
@ -1,4 +1,4 @@
|
|||||||
#--------------------------------------------------------------- WSJT
|
#---------------------------------------------------------------- WSJT
|
||||||
from Tkinter import *
|
from Tkinter import *
|
||||||
from tkFileDialog import *
|
from tkFileDialog import *
|
||||||
import Pmw
|
import Pmw
|
||||||
@ -15,7 +15,7 @@ from types import *
|
|||||||
import array
|
import array
|
||||||
|
|
||||||
root = Tk()
|
root = Tk()
|
||||||
Version="5.9.2 r" + "$Rev$"[6:-1]
|
Version="5.9.3 r" + "$Rev$"[6:-1]
|
||||||
print "******************************************************************"
|
print "******************************************************************"
|
||||||
print "WSJT Version " + Version + ", by K1JT"
|
print "WSJT Version " + Version + ", by K1JT"
|
||||||
print "Revision date: " + \
|
print "Revision date: " + \
|
||||||
@ -1253,7 +1253,7 @@ def update():
|
|||||||
g.ndop,g.ndop00,g.dbMoon,g.RAMoon,g.DecMoon,g.HA8,g.Dgrd, \
|
g.ndop,g.ndop00,g.dbMoon,g.RAMoon,g.DecMoon,g.HA8,g.Dgrd, \
|
||||||
g.sd,g.poloffset,g.MaxNR,g.dfdt,g.dfdt0,g.RaAux,g.DecAux, \
|
g.sd,g.poloffset,g.MaxNR,g.dfdt,g.dfdt0,g.RaAux,g.DecAux, \
|
||||||
g.AzAux,g.ElAux = Audio.astro0(utc[0],utc[1],utc[2], \
|
g.AzAux,g.ElAux = Audio.astro0(utc[0],utc[1],utc[2], \
|
||||||
utchours,nfreq.get(),options.MyGrid.get(), \
|
utchours,nfreq.get(),options.MyGrid.get().upper(), \
|
||||||
options.auxra.get()+' '[:9], \
|
options.auxra.get()+' '[:9], \
|
||||||
options.auxdec.get()+' '[:9])
|
options.auxdec.get()+' '[:9])
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user