mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-09-26 15:16:35 -04:00
Merge branch 'hotfix-2.0.0-rc3' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc3
This commit is contained in:
commit
4d5faf9da1
@ -71,17 +71,13 @@ end subroutine hash22
|
|||||||
integer function ihashcall(c0,m)
|
integer function ihashcall(c0,m)
|
||||||
|
|
||||||
integer*8 n8
|
integer*8 n8
|
||||||
character*13 c0,c1
|
character*13 c0
|
||||||
character*38 c
|
character*38 c
|
||||||
data c/' 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ/'/
|
data c/' 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ/'/
|
||||||
|
|
||||||
c1=c0
|
|
||||||
if(c1(1:1).eq.'<') c1=c1(2:)
|
|
||||||
i=index(c1,'>')
|
|
||||||
if(i.gt.0) c1(i:)=' '
|
|
||||||
n8=0
|
n8=0
|
||||||
do i=1,11
|
do i=1,11
|
||||||
j=index(c,c1(i:i)) - 1
|
j=index(c,c0(i:i)) - 1
|
||||||
n8=38*n8 + j
|
n8=38*n8 + j
|
||||||
enddo
|
enddo
|
||||||
ihashcall=ishft(47055833459_8*n8,m-64)
|
ihashcall=ishft(47055833459_8*n8,m-64)
|
||||||
@ -91,7 +87,7 @@ end function ihashcall
|
|||||||
|
|
||||||
subroutine save_hash_call(c13,n10,n12,n22)
|
subroutine save_hash_call(c13,n10,n12,n22)
|
||||||
|
|
||||||
character*13 c13
|
character*13 c13,cw
|
||||||
logical first
|
logical first
|
||||||
data first/.true./
|
data first/.true./
|
||||||
save first
|
save first
|
||||||
@ -105,11 +101,15 @@ subroutine save_hash_call(c13,n10,n12,n22)
|
|||||||
first=.false.
|
first=.false.
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if(c13(1:1).eq.' ' .or. c13(1:5).eq.'<...>') return
|
cw=c13
|
||||||
|
if(cw(1:1).eq.' ' .or. cw(1:5).eq.'<...>') return
|
||||||
|
if(cw(1:1).eq.'<') cw=cw(2:)
|
||||||
|
i=index(cw,'>')
|
||||||
|
if(i.gt.0) cw(i:)=' '
|
||||||
|
|
||||||
n10=ihashcall(c13,10)
|
n10=ihashcall(cw,10)
|
||||||
n12=ihashcall(c13,12)
|
n12=ihashcall(cw,12)
|
||||||
n22=ihashcall(c13,22)
|
n22=ihashcall(cw,22)
|
||||||
do i=1,nzhash
|
do i=1,nzhash
|
||||||
if(ihash22(i).eq.n22) go to 900 !This one is already in the table
|
if(ihash22(i).eq.n22) go to 900 !This one is already in the table
|
||||||
enddo
|
enddo
|
||||||
@ -124,7 +124,7 @@ subroutine save_hash_call(c13,n10,n12,n22)
|
|||||||
ihash10(1)=n10
|
ihash10(1)=n10
|
||||||
ihash12(1)=n12
|
ihash12(1)=n12
|
||||||
ihash22(1)=n22
|
ihash22(1)=n22
|
||||||
callsign(1)=c13
|
callsign(1)=cw
|
||||||
if(nzhash.lt.MAXHASH) nzhash=nzhash+1
|
if(nzhash.lt.MAXHASH) nzhash=nzhash+1
|
||||||
|
|
||||||
900 return
|
900 return
|
||||||
@ -662,7 +662,7 @@ subroutine unpack28(n28_0,c13,success)
|
|||||||
c13=adjustl(c13)
|
c13=adjustl(c13)
|
||||||
|
|
||||||
900 i0=index(c13,' ')
|
900 i0=index(c13,' ')
|
||||||
if(i0.lt.len(trim(c13))) then
|
if(i0.ne.0 .and. i0.lt.len(trim(c13))) then
|
||||||
c13='QU1RK'
|
c13='QU1RK'
|
||||||
success=.false.
|
success=.false.
|
||||||
endif
|
endif
|
||||||
|
@ -2939,7 +2939,8 @@ void MainWindow::readFromStdout() //readFromStdout
|
|||||||
(decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) {
|
(decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) {
|
||||||
auto for_us = decodedtext.string().contains(" " + m_config.my_callsign() + " ") or
|
auto for_us = decodedtext.string().contains(" " + m_config.my_callsign() + " ") or
|
||||||
decodedtext.string().contains(" "+m_baseCall) or
|
decodedtext.string().contains(" "+m_baseCall) or
|
||||||
decodedtext.string().contains(m_baseCall+" ");
|
decodedtext.string().contains(m_baseCall+" ") or
|
||||||
|
decodedtext.string().contains(" <" + m_config.my_callsign() + "> ");
|
||||||
if(decodedtext.string().contains(" DE ")) for_us=true; //Hound with compound callsign
|
if(decodedtext.string().contains(" DE ")) for_us=true; //Hound with compound callsign
|
||||||
if(for_us) {
|
if(for_us) {
|
||||||
QString houndCall,houndGrid;
|
QString houndCall,houndGrid;
|
||||||
|
Loading…
Reference in New Issue
Block a user