w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 10:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.0.0-rc6' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc6

Browse Source
This commit is contained in:
Joe Taylor 2018-12-06 11:11:06 -05:00
commit 8134c334cb
34 changed files with 162 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -322,14 +322,12 @@ set (wsjtx_CXXSRCS
set (wsjt_CXXSRCS set (wsjt_CXXSRCS
lib/crc10.cpp lib/crc10.cpp
lib/crc12.cpp
lib/crc13.cpp lib/crc13.cpp
lib/crc14.cpp lib/crc14.cpp
) )
# deal with a GCC v6 UB error message # deal with a GCC v6 UB error message
set_source_files_properties ( set_source_files_properties (
lib/crc10.cpp lib/crc10.cpp
lib/crc12.cpp
lib/crc13.cpp lib/crc13.cpp
lib/crc14.cpp lib/crc14.cpp
PROPERTIES COMPILE_FLAGS -fpermissive) PROPERTIES COMPILE_FLAGS -fpermissive)
@ -384,13 +382,11 @@ set (wsjt_FSRCS
lib/ft8/baseline.f90 lib/ft8/baseline.f90
lib/bpdecode40.f90 lib/bpdecode40.f90
lib/bpdecode128_90.f90 lib/bpdecode128_90.f90
lib/ft8/bpdecode174.f90
lib/ft8/bpdecode174_91.f90 lib/ft8/bpdecode174_91.f90
lib/baddata.f90 lib/baddata.f90
lib/calibrate.f90 lib/calibrate.f90
lib/ccf2.f90 lib/ccf2.f90
lib/ccf65.f90 lib/ccf65.f90
lib/ft8/chkcrc12a.f90
lib/ft8/chkcrc13a.f90 lib/ft8/chkcrc13a.f90
lib/ft8/chkcrc14a.f90 lib/ft8/chkcrc14a.f90
lib/chkcall.f90 lib/chkcall.f90

1
item_delegates/CallsignDelegate.cpp
View File

@ -28,3 +28,4 @@ void CallsignDelegate::setModelData (QWidget * editor, QAbstractItemModel * mode
{ {
model->setData (index, static_cast<QLineEdit *> (editor)->text (), Qt::EditRole); model->setData (index, static_cast<QLineEdit *> (editor)->text (), Qt::EditRole);
} }

16
lib/crc.f90
View File

@ -34,22 +34,6 @@ module crc
integer (c_int), value :: length integer (c_int), value :: length
end function crc13_check end function crc13_check
function crc12 (data, length) bind (C, name="crc12")
use, intrinsic :: iso_c_binding, only: c_short, c_ptr, c_int
implicit none
integer (c_short) :: crc12
type (c_ptr), value :: data
integer (c_int), value :: length
end function crc12
function crc12_check (data, length) bind (C, name="crc12_check")
use, intrinsic :: iso_c_binding, only: c_bool, c_ptr, c_int
implicit none
logical (c_bool) :: crc12_check
type (c_ptr), value :: data
integer (c_int), value :: length
end function crc12_check
function crc10 (data, length) bind (C, name="crc10") function crc10 (data, length) bind (C, name="crc10")
use, intrinsic :: iso_c_binding, only: c_short, c_ptr, c_int use, intrinsic :: iso_c_binding, only: c_short, c_ptr, c_int
implicit none implicit none

31
lib/crc12.cpp
View File

@ -1,31 +0,0 @@
#include <boost/crc.hpp>
#include <boost/config.hpp>
extern "C"
{
short crc12 (unsigned char const * data, int length);
bool crc12_check (unsigned char const * data, int length);
}
#define POLY 0xc06
#ifdef BOOST_NO_CXX11_CONSTEXPR
#define TRUNCATED_POLYNOMIAL POLY
#else
namespace
{
unsigned long constexpr TRUNCATED_POLYNOMIAL = POLY;
}
#endif
// assumes CRC is last 16 bits of the data and is set to zero
// caller should assign the returned CRC into the message in big endian byte order
short crc12 (unsigned char const * data, int length)
{
return boost::augmented_crc<12, TRUNCATED_POLYNOMIAL> (data, length);
}
bool crc12_check (unsigned char const * data, int length)
{
return !boost::augmented_crc<12, TRUNCATED_POLYNOMIAL> (data, length);
}

4
lib/decoder.f90
View File

@ -470,8 +470,8 @@ contains
real, intent(in) :: dt real, intent(in) :: dt
real, intent(in) :: freq real, intent(in) :: freq
character(len=37), intent(in) :: decoded character(len=37), intent(in) :: decoded
character c1*12,c2*12,g2*4,w*4,ctmp*12 character c1*12,c2*12,g2*4,w*4
integer i0,i1,i2,i3,i4,i5,i6,n30,nwrap integer i0,i1,i2,i3,i4,i5,n30,nwrap
integer, intent(in) :: nap integer, intent(in) :: nap
real, intent(in) :: qual real, intent(in) :: qual
character*2 annot character*2 annot

401
lib/ft8/bpdecode174.f90
View File

@ -1,401 +0,0 @@
subroutine bpdecode174(llr,apmask,maxiterations,decoded,cw,nharderror,iter)
!
! A log-domain belief propagation decoder for the (174,87) code.
!
integer, parameter:: N=174, K=87, M=N-K
integer*1 codeword(N),cw(N),apmask(N)
integer colorder(N)
integer*1 decoded(K)
integer Nm(7,M) ! 5, 6, or 7 bits per check
integer Mn(3,N) ! 3 checks per bit
integer synd(M)
real tov(3,N)
real toc(7,M)
real tanhtoc(7,M)
real zn(N)
real llr(N)
real Tmn
integer nrw(M)
data colorder/ &
0, 1, 2, 3, 30, 4, 5, 6, 7, 8, 9, 10, 11, 32, 12, 40, 13, 14, 15, 16,&
17, 18, 37, 45, 29, 19, 20, 21, 41, 22, 42, 31, 33, 34, 44, 35, 47, 51, 50, 43,&
36, 52, 63, 46, 25, 55, 27, 24, 23, 53, 39, 49, 59, 38, 48, 61, 60, 57, 28, 62,&
56, 58, 65, 66, 26, 70, 64, 69, 68, 67, 74, 71, 54, 76, 72, 75, 78, 77, 80, 79,&
73, 83, 84, 81, 82, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,&
100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,&
120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,&
140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,&
160,161,162,163,164,165,166,167,168,169,170,171,172,173/
data Mn/ &
1, 25, 69, &
2, 5, 73, &
3, 32, 68, &
4, 51, 61, &
6, 63, 70, &
7, 33, 79, &
8, 50, 86, &
9, 37, 43, &
10, 41, 65, &
11, 14, 64, &
12, 75, 77, &
13, 23, 81, &
15, 16, 82, &
17, 56, 66, &
18, 53, 60, &
19, 31, 52, &
20, 67, 84, &
21, 29, 72, &
22, 24, 44, &
26, 35, 76, &
27, 36, 38, &
28, 40, 42, &
30, 54, 55, &
34, 49, 87, &
39, 57, 58, &
45, 74, 83, &
46, 62, 80, &
47, 48, 85, &
59, 71, 78, &
1, 50, 53, &
2, 47, 84, &
3, 25, 79, &
4, 6, 14, &
5, 7, 80, &
8, 34, 55, &
9, 36, 69, &
10, 43, 83, &
11, 23, 74, &
12, 17, 44, &
13, 57, 76, &
15, 27, 56, &
16, 28, 29, &
18, 19, 59, &
20, 40, 63, &
21, 35, 52, &
22, 54, 64, &
24, 62, 78, &
26, 32, 77, &
30, 72, 85, &
31, 65, 87, &
33, 39, 51, &
37, 48, 75, &
38, 70, 71, &
41, 42, 68, &
45, 67, 86, &
46, 81, 82, &
49, 66, 73, &
58, 60, 66, &
61, 65, 85, &
1, 14, 21, &
2, 13, 59, &
3, 67, 82, &
4, 32, 73, &
5, 36, 54, &
6, 43, 46, &
7, 28, 75, &
8, 33, 71, &
9, 49, 76, &
10, 58, 64, &
11, 48, 68, &
12, 19, 45, &
15, 50, 61, &
16, 22, 26, &
17, 72, 80, &
18, 40, 55, &
20, 35, 51, &
23, 25, 34, &
24, 63, 87, &
27, 39, 74, &
29, 78, 83, &
30, 70, 77, &
31, 69, 84, &
22, 37, 86, &
38, 41, 81, &
42, 44, 57, &
47, 53, 62, &
52, 56, 79, &
60, 75, 81, &
1, 39, 77, &
2, 16, 41, &
3, 31, 54, &
4, 36, 78, &
5, 45, 65, &
6, 57, 85, &
7, 14, 49, &
8, 21, 46, &
9, 15, 72, &
10, 20, 62, &
11, 17, 71, &
12, 34, 47, &
13, 68, 86, &
18, 23, 43, &
19, 64, 73, &
24, 48, 79, &
25, 70, 83, &
26, 80, 87, &
27, 32, 40, &
28, 56, 69, &
29, 63, 66, &
30, 42, 50, &
33, 37, 82, &
35, 60, 74, &
38, 55, 84, &
44, 52, 61, &
51, 53, 72, &
58, 59, 67, &
47, 56, 76, &
1, 19, 37, &
2, 61, 75, &
3, 8, 66, &
4, 60, 84, &
5, 34, 39, &
6, 26, 53, &
7, 32, 57, &
9, 52, 67, &
10, 12, 15, &
11, 51, 69, &
13, 14, 65, &
16, 31, 43, &
17, 20, 36, &
18, 80, 86, &
21, 48, 59, &
22, 40, 46, &
23, 33, 62, &
24, 30, 74, &
25, 42, 64, &
27, 49, 85, &
28, 38, 73, &
29, 44, 81, &
35, 68, 70, &
41, 63, 76, &
45, 49, 71, &
50, 58, 87, &
48, 54, 83, &
13, 55, 79, &
77, 78, 82, &
1, 2, 24, &
3, 6, 75, &
4, 56, 87, &
5, 44, 53, &
7, 50, 83, &
8, 10, 28, &
9, 55, 62, &
11, 29, 67, &
12, 33, 40, &
14, 16, 20, &
15, 35, 73, &
17, 31, 39, &
18, 36, 57, &
19, 46, 76, &
21, 42, 84, &
22, 34, 59, &
23, 26, 61, &
25, 60, 65, &
27, 64, 80, &
30, 37, 66, &
32, 45, 72, &
38, 51, 86, &
41, 77, 79, &
43, 56, 68, &
47, 74, 82, &
40, 52, 78, &
54, 61, 71, &
46, 58, 69/
data Nm/ &
1, 30, 60, 89, 118, 147, 0, &
2, 31, 61, 90, 119, 147, 0, &
3, 32, 62, 91, 120, 148, 0, &
4, 33, 63, 92, 121, 149, 0, &
2, 34, 64, 93, 122, 150, 0, &
5, 33, 65, 94, 123, 148, 0, &
6, 34, 66, 95, 124, 151, 0, &
7, 35, 67, 96, 120, 152, 0, &
8, 36, 68, 97, 125, 153, 0, &
9, 37, 69, 98, 126, 152, 0, &
10, 38, 70, 99, 127, 154, 0, &
11, 39, 71, 100, 126, 155, 0, &
12, 40, 61, 101, 128, 145, 0, &
10, 33, 60, 95, 128, 156, 0, &
13, 41, 72, 97, 126, 157, 0, &
13, 42, 73, 90, 129, 156, 0, &
14, 39, 74, 99, 130, 158, 0, &
15, 43, 75, 102, 131, 159, 0, &
16, 43, 71, 103, 118, 160, 0, &
17, 44, 76, 98, 130, 156, 0, &
18, 45, 60, 96, 132, 161, 0, &
19, 46, 73, 83, 133, 162, 0, &
12, 38, 77, 102, 134, 163, 0, &
19, 47, 78, 104, 135, 147, 0, &
1, 32, 77, 105, 136, 164, 0, &
20, 48, 73, 106, 123, 163, 0, &
21, 41, 79, 107, 137, 165, 0, &
22, 42, 66, 108, 138, 152, 0, &
18, 42, 80, 109, 139, 154, 0, &
23, 49, 81, 110, 135, 166, 0, &
16, 50, 82, 91, 129, 158, 0, &
3, 48, 63, 107, 124, 167, 0, &
6, 51, 67, 111, 134, 155, 0, &
24, 35, 77, 100, 122, 162, 0, &
20, 45, 76, 112, 140, 157, 0, &
21, 36, 64, 92, 130, 159, 0, &
8, 52, 83, 111, 118, 166, 0, &
21, 53, 84, 113, 138, 168, 0, &
25, 51, 79, 89, 122, 158, 0, &
22, 44, 75, 107, 133, 155, 172, &
9, 54, 84, 90, 141, 169, 0, &
22, 54, 85, 110, 136, 161, 0, &
8, 37, 65, 102, 129, 170, 0, &
19, 39, 85, 114, 139, 150, 0, &
26, 55, 71, 93, 142, 167, 0, &
27, 56, 65, 96, 133, 160, 174, &
28, 31, 86, 100, 117, 171, 0, &
28, 52, 70, 104, 132, 144, 0, &
24, 57, 68, 95, 137, 142, 0, &
7, 30, 72, 110, 143, 151, 0, &
4, 51, 76, 115, 127, 168, 0, &
16, 45, 87, 114, 125, 172, 0, &
15, 30, 86, 115, 123, 150, 0, &
23, 46, 64, 91, 144, 173, 0, &
23, 35, 75, 113, 145, 153, 0, &
14, 41, 87, 108, 117, 149, 170, &
25, 40, 85, 94, 124, 159, 0, &
25, 58, 69, 116, 143, 174, 0, &
29, 43, 61, 116, 132, 162, 0, &
15, 58, 88, 112, 121, 164, 0, &
4, 59, 72, 114, 119, 163, 173, &
27, 47, 86, 98, 134, 153, 0, &
5, 44, 78, 109, 141, 0, 0, &
10, 46, 69, 103, 136, 165, 0, &
9, 50, 59, 93, 128, 164, 0, &
14, 57, 58, 109, 120, 166, 0, &
17, 55, 62, 116, 125, 154, 0, &
3, 54, 70, 101, 140, 170, 0, &
1, 36, 82, 108, 127, 174, 0, &
5, 53, 81, 105, 140, 0, 0, &
29, 53, 67, 99, 142, 173, 0, &
18, 49, 74, 97, 115, 167, 0, &
2, 57, 63, 103, 138, 157, 0, &
26, 38, 79, 112, 135, 171, 0, &
11, 52, 66, 88, 119, 148, 0, &
20, 40, 68, 117, 141, 160, 0, &
11, 48, 81, 89, 146, 169, 0, &
29, 47, 80, 92, 146, 172, 0, &
6, 32, 87, 104, 145, 169, 0, &
27, 34, 74, 106, 131, 165, 0, &
12, 56, 84, 88, 139, 0, 0, &
13, 56, 62, 111, 146, 171, 0, &
26, 37, 80, 105, 144, 151, 0, &
17, 31, 82, 113, 121, 161, 0, &
28, 49, 59, 94, 137, 0, 0, &
7, 55, 83, 101, 131, 168, 0, &
24, 50, 78, 106, 143, 149, 0/
data nrw/ &
6,6,6,6,6,6,6,6,6,6, &
6,6,6,6,6,6,6,6,6,6, &
6,6,6,6,6,6,6,6,6,6, &
6,6,6,6,6,6,6,6,6,7, &
6,6,6,6,6,7,6,6,6,6, &
6,6,6,6,6,7,6,6,6,6, &
7,6,5,6,6,6,6,6,6,5, &
6,6,6,6,6,6,6,6,6,6, &
5,6,6,6,5,6,6/
ncw=3
decoded=0
toc=0
tov=0
tanhtoc=0
! initialize messages to checks
do j=1,M
do i=1,nrw(j)
toc(i,j)=llr((Nm(i,j)))
enddo
enddo
ncnt=0
do iter=0,maxiterations
! Update bit log likelihood ratios (tov=0 in iteration 0).
do i=1,N
if( apmask(i) .ne. 1 ) then
zn(i)=llr(i)+sum(tov(1:ncw,i))
else
zn(i)=llr(i)
endif
enddo
! Check to see if we have a codeword (check before we do any iteration).
cw=0
where( zn .gt. 0. ) cw=1
ncheck=0
do i=1,M
synd(i)=sum(cw(Nm(1:nrw(i),i)))
if( mod(synd(i),2) .ne. 0 ) ncheck=ncheck+1
! if( mod(synd(i),2) .ne. 0 ) write(*,*) 'check ',i,' unsatisfied'
enddo
! write(*,*) 'number of unsatisfied parity checks ',ncheck
if( ncheck .eq. 0 ) then ! we have a codeword - reorder the columns and return it
codeword=cw(colorder+1)
decoded=codeword(M+1:N)
nerr=0
do i=1,N
if( (2*cw(i)-1)*llr(i) .lt. 0.0 ) nerr=nerr+1
enddo
nharderror=nerr
return
endif
if( iter.gt.0 ) then ! this code block implements an early stopping criterion
! if( iter.gt.10000 ) then ! this code block implements an early stopping criterion
nd=ncheck-nclast
if( nd .lt. 0 ) then ! # of unsatisfied parity checks decreased
ncnt=0 ! reset counter
else
ncnt=ncnt+1
endif
! write(*,*) iter,ncheck,nd,ncnt
if( ncnt .ge. 5 .and. iter .ge. 10 .and. ncheck .gt. 15) then
nharderror=-1
return
endif
endif
nclast=ncheck
! Send messages from bits to check nodes
do j=1,M
do i=1,nrw(j)
ibj=Nm(i,j)
toc(i,j)=zn(ibj)
do kk=1,ncw ! subtract off what the bit had received from the check
if( Mn(kk,ibj) .eq. j ) then
toc(i,j)=toc(i,j)-tov(kk,ibj)
endif
enddo
enddo
enddo
! send messages from check nodes to variable nodes
do i=1,M
tanhtoc(1:7,i)=tanh(-toc(1:7,i)/2)
enddo
do j=1,N
do i=1,ncw
ichk=Mn(i,j) ! Mn(:,j) are the checks that include bit j
Tmn=product(tanhtoc(1:nrw(ichk),ichk),mask=Nm(1:nrw(ichk),ichk).ne.j)
call platanh(-Tmn,y)
! y=atanh(-Tmn)
tov(i,j)=2*y
enddo
enddo
enddo
nharderror=-1
return
end subroutine bpdecode174

24
lib/ft8/chkcrc12a.f90
View File

@ -1,24 +0,0 @@
subroutine chkcrc12a(decoded,nbadcrc)
use crc
integer*1 decoded(87)
integer*1, target:: i1Dec8BitBytes(11)
character*87 cbits
! Write decoded bits into cbits: 75-bit message plus 12-bit CRC
write(cbits,1000) decoded
1000 format(87i1)
read(cbits,1001) i1Dec8BitBytes
1001 format(11b8)
read(cbits,1002) ncrc12 !Received CRC12
1002 format(75x,b12)
i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32)
i1Dec8BitBytes(11)=0
icrc12=crc12(c_loc(i1Dec8BitBytes),11) !CRC12 computed from 75 msg bits
nbadcrc=1
if(ncrc12.eq.icrc12) nbadcrc=0
return
end subroutine chkcrc12a

1
lib/ft8/foxgen.f90
View File

@ -20,7 +20,6 @@ subroutine foxgen()
character*37 msg,msgsent character*37 msg,msgsent
integer itone(79) integer itone(79)
integer*1 msgbits(77),msgbits2 integer*1 msgbits(77),msgbits2
integer*1, target:: i1Msg8BitBytes(11)
integer*1, target:: mycall integer*1, target:: mycall
real x(NFFT) real x(NFFT)
real*8 dt,twopi,f0,fstep,dfreq,phi,dphi real*8 dt,twopi,f0,fstep,dfreq,phi,dphi

1
lib/ft8/ft8apset.f90
View File

@ -4,7 +4,6 @@ subroutine ft8apset(mycall12,hiscall12,apsym)
character*37 msg character*37 msg
character*12 mycall12,hiscall12,hiscall character*12 mycall12,hiscall12,hiscall
integer apsym(58) integer apsym(58)
integer*1 msgbits(77)
logical nohiscall logical nohiscall
if(len(trim(mycall12)).eq.0) then if(len(trim(mycall12)).eq.0) then

5
lib/ft8/ft8b.f90
View File

@ -7,12 +7,10 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
use packjt77 use packjt77
include 'ft8_params.f90' include 'ft8_params.f90'
parameter(NP2=2812) parameter(NP2=2812)
character*37 msg37,msgsent37 character*37 msg37
character*12 mycall12,hiscall12,hiscall12_0 character*12 mycall12,hiscall12,hiscall12_0
character*77 c77 character*77 c77
character*6 mycall6,hiscall6,c1,c2
character*13 c13 character*13 c13
character*87 cbits
real a(5) real a(5)
real s8(0:7,NN) real s8(0:7,NN)
real s2(0:511),s2l(0:511) real s2(0:511),s2l(0:511)
@ -28,7 +26,6 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
integer nappasses(0:5) !Number of decoding passes to use for each QSO state integer nappasses(0:5) !Number of decoding passes to use for each QSO state
integer naptypes(0:5,4) ! (nQSOProgress, decoding pass) maximum of 4 passes for now integer naptypes(0:5,4) ! (nQSOProgress, decoding pass) maximum of 4 passes for now
integer ncontest,ncontest0 integer ncontest,ncontest0
integer*1, target:: i1hiscall(12)
logical one(0:511,0:8) logical one(0:511,0:8)
integer graymap(0:7) integer graymap(0:7)
complex cd0(0:3199) complex cd0(0:3199)

9
lib/ft8/ft8code.f90
View File

@ -8,14 +8,11 @@ program ft8code
include 'ft8_testmsg.f90' include 'ft8_testmsg.f90'
parameter (NWAVE=NN*NSPS) parameter (NWAVE=NN*NSPS)
character*77 c77
character*37 msg,msgsent character*37 msg,msgsent
character*9 comment character*9 comment
character bad*1,msgtype*16 character bad*1,msgtype*18
character*91 cbits
integer itone(NN) integer itone(NN)
integer*1 msgbits(77) integer*1 msgbits(77)
logical unpk77_success
! Get command-line argument(s) ! Get command-line argument(s)
nargs=iargc() nargs=iargc()
@ -69,10 +66,10 @@ program ft8code
if(msg.ne.msgsent) bad="*" if(msg.ne.msgsent) bad="*"
if(n3.ge.0) then if(n3.ge.0) then
write(*,1020) imsg,msg,msgsent,bad,i3,n3,msgtype,comment write(*,1020) imsg,msg,msgsent,bad,i3,n3,msgtype,comment
1020 format(i2,'.',1x,a37,1x,a37,1x,a1,2x,i1,'.',i1,1x,a16,1x,a9) 1020 format(i2,'.',1x,a37,1x,a37,1x,a1,2x,i1,'.',i1,1x,a18,1x,a9)
else else
write(*,1022) imsg,msg,msgsent,bad,i3,msgtype,comment write(*,1022) imsg,msg,msgsent,bad,i3,msgtype,comment
1022 format(i2,'.',1x,a37,1x,a37,1x,a1,2x,i1,'.',1x,1x,a16,1x,a9) 1022 format(i2,'.',1x,a37,1x,a37,1x,a1,2x,i1,'.',1x,1x,a18,1x,a9)
endif endif
enddo enddo

2
lib/ft8/ft8sim.f90
View File

@ -9,7 +9,7 @@ program ft8sim
parameter (NWAVE=NN*NSPS) parameter (NWAVE=NN*NSPS)
type(hdr) h !Header for .wav file type(hdr) h !Header for .wav file
character arg*12,fname*17 character arg*12,fname*17
character msg37*37,msgsent37*37,msg40*40 character msg37*37,msgsent37*37
character c77*77 character c77*77
complex c0(0:NMAX-1) complex c0(0:NMAX-1)
complex c(0:NMAX-1) complex c(0:NMAX-1)

8
lib/msk144code.f90
View File

@ -5,7 +5,7 @@ program msk144code
use packjt77 use packjt77
character*77 c77 character*77 c77
character msg*37,msgsent*37,decoded,bad*1,msgtype*16 character msg*37,msgsent*37,decoded,bad*1,msgtype*18
integer*4 i4tone(144) integer*4 i4tone(144)
include 'msk144_testmsg.f90' include 'msk144_testmsg.f90'
@ -61,13 +61,13 @@ program msk144code
if(msg.ne.msgsent) bad="*" if(msg.ne.msgsent) bad="*"
if(i3.eq.0.and.n3.ge.0) then if(i3.eq.0.and.n3.ge.0) then
write(*,1020) imsg,msg,msgsent,bad,i3,n3,msgtype write(*,1020) imsg,msg,msgsent,bad,i3,n3,msgtype
1020 format(i2,'.',1x,a37,1x,a37,1x,a1,2x,i1,'.',i1,1x,a16) 1020 format(i2,'.',1x,a37,1x,a37,1x,a1,2x,i1,'.',i1,1x,a18)
elseif(i3.ge.1) then elseif(i3.ge.1) then
write(*,1022) imsg,msg,msgsent,bad,i3,msgtype write(*,1022) imsg,msg,msgsent,bad,i3,msgtype
1022 format(i2,'.',1x,a37,1x,a37,1x,a1,2x,i1,'.',1x,1x,a16) 1022 format(i2,'.',1x,a37,1x,a37,1x,a1,2x,i1,'.',1x,1x,a18)
elseif(i3.lt.0) then elseif(i3.lt.0) then
write(*,1024) imsg,msg,msgsent,bad,msgtype write(*,1024) imsg,msg,msgsent,bad,msgtype
1024 format(i2,'.',1x,a37,1x,a37,1x,a1,6x,a16) 1024 format(i2,'.',1x,a37,1x,a37,1x,a1,6x,a18)
endif endif
enddo enddo

2
lib/msk144decodeframe.f90
View File

@ -100,7 +100,7 @@ subroutine msk144decodeframe(c,softbits,msgreceived,nsuccess)
if( nharderror .ge. 0 .and. nharderror .lt. 18 ) then if( nharderror .ge. 0 .and. nharderror .lt. 18 ) then
nsuccess=1 nsuccess=1
write(c77,'(77i1)') decoded77 write(c77,'(77i1)') decoded77
read(c77(72:77),'(2b3)'),n3,i3 read(c77(72:77),'(2b3)') n3,i3
if( (i3.eq.0.and.(n3.eq.1 .or. n3.eq.3 .or. n3.eq.4 .or. n3.gt.5)) .or. i3.eq.3 .or. i3.gt.4 ) then if( (i3.eq.0.and.(n3.eq.1 .or. n3.eq.3 .or. n3.eq.4 .or. n3.gt.5)) .or. i3.eq.3 .or. i3.gt.4 ) then
nsuccess=0 nsuccess=0
else else

1
lib/msk144sim.f90
View File

@ -5,7 +5,6 @@ program msk144sim
real pings(0:NMAX-1) real pings(0:NMAX-1)
real waveform(0:NMAX-1) real waveform(0:NMAX-1)
character arg*8,msg*37,msgsent*37,fname*40 character arg*8,msg*37,msgsent*37,fname*40
character*77 c77
real wave(0:NMAX-1) !Simulated received waveform real wave(0:NMAX-1) !Simulated received waveform
real*8 twopi,freq,phi,dphi0,dphi1,dphi real*8 twopi,freq,phi,dphi0,dphi1,dphi
type(hdr) h !Header for .wav file type(hdr) h !Header for .wav file

9
main.cpp
View File

@ -6,6 +6,8 @@
#include <locale.h> #include <locale.h>
#include <fftw3.h> #include <fftw3.h>
#include <QSharedMemory>
#include <QTemporaryFile>
#include <QDateTime> #include <QDateTime>
#include <QApplication> #include <QApplication>
#include <QRegularExpression> #include <QRegularExpression>
@ -21,6 +23,7 @@
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QCommandLineOption> #include <QCommandLineOption>
#include <QSqlDatabase> #include <QSqlDatabase>
#include <QSqlQuery>
#include <QSqlError> #include <QSqlError>
#include "revision_utils.hpp" #include "revision_utils.hpp"
@ -288,6 +291,12 @@ int main(int argc, char *argv[])
throw std::runtime_error {("Database Error: " + db.lastError ().text ()).toStdString ()}; throw std::runtime_error {("Database Error: " + db.lastError ().text ()).toStdString ()};
} }
// better performance traded for a risk of d/b corruption
// on system crash or application crash
// db.exec ("PRAGMA synchronous=OFF"); // system crash risk
// db.exec ("PRAGMA journal_mode=MEMORY"); // application crash risk
db.exec ("PRAGMA locking_mode=EXCLUSIVE");
int result; int result;
do do
{ {

14
models/CabrilloLog.cpp
View File

@ -59,6 +59,12 @@ CabrilloLog::impl::impl (Configuration const * configuration)
setHeaderData (fieldIndex ("exchange_sent"), Qt::Horizontal, tr ("Sent")); setHeaderData (fieldIndex ("exchange_sent"), Qt::Horizontal, tr ("Sent"));
setHeaderData (fieldIndex ("exchange_rcvd"), Qt::Horizontal, tr ("Rcvd")); setHeaderData (fieldIndex ("exchange_rcvd"), Qt::Horizontal, tr ("Rcvd"));
setHeaderData (fieldIndex ("band"), Qt::Horizontal, tr ("Band")); setHeaderData (fieldIndex ("band"), Qt::Horizontal, tr ("Band"));
// This descending order by time is important, it makes the view
// place the latest row at the top, without this the model/view
// interactions are both sluggish and unhelpful.
setSort (fieldIndex ("when"), Qt::DescendingOrder);
SQL_error_check (*this, &QSqlTableModel::select); SQL_error_check (*this, &QSqlTableModel::select);
} }
@ -113,11 +119,11 @@ bool CabrilloLog::add_QSO (Frequency frequency, QDateTime const& when, QString c
{ {
m_->revert (); // discard any uncommitted changes m_->revert (); // discard any uncommitted changes
} }
m_->setEditStrategy (QSqlTableModel::OnManualSubmit);
ConditionalTransaction transaction {*m_};
auto ok = m_->insertRecord (-1, record); auto ok = m_->insertRecord (-1, record);
if (ok) transaction.submit ();
{ m_->setEditStrategy (QSqlTableModel::OnFieldChange);
m_->select (); // to refresh views
}
return ok; return ok;
} }

11
models/FoxLog.cpp
View File

@ -51,6 +51,12 @@ FoxLog::impl::impl ()
setHeaderData (fieldIndex ("report_sent"), Qt::Horizontal, tr ("Sent")); setHeaderData (fieldIndex ("report_sent"), Qt::Horizontal, tr ("Sent"));
setHeaderData (fieldIndex ("report_rcvd"), Qt::Horizontal, tr ("Rcvd")); setHeaderData (fieldIndex ("report_rcvd"), Qt::Horizontal, tr ("Rcvd"));
setHeaderData (fieldIndex ("band"), Qt::Horizontal, tr ("Band")); setHeaderData (fieldIndex ("band"), Qt::Horizontal, tr ("Band"));
// This descending order by time is important, it makes the view
// place the latest row at the top, without this the model/view
// interactions are both sluggish and unhelpful.
setSort (fieldIndex ("when"), Qt::DescendingOrder);
SQL_error_check (*this, &QSqlTableModel::select); SQL_error_check (*this, &QSqlTableModel::select);
} }
@ -104,11 +110,14 @@ bool FoxLog::add_QSO (QDateTime const& when, QString const& call, QString const&
{ {
m_->revert (); // discard any uncommitted changes m_->revert (); // discard any uncommitted changes
} }
m_->setEditStrategy (QSqlTableModel::OnManualSubmit);
ConditionalTransaction transaction {*m_};
auto ok = m_->insertRecord (-1, record); auto ok = m_->insertRecord (-1, record);
if (ok) if (ok)
{ {
m_->select (); // to refresh views ok = transaction.submit (false);
} }
m_->setEditStrategy (QSqlTableModel::OnFieldChange);
return ok; return ok;
} }

55
widgets/AbstractLogWindow.cpp
View File

@ -84,10 +84,23 @@ AbstractLogWindow::AbstractLogWindow (QString const& settings_key, QSettings * s
: QWidget {parent} : QWidget {parent}
, m_ {this, settings_key, settings, configuration} , m_ {this, settings_key, settings, configuration}
{ {
// ensure view scrolls to latest new row // this attempt to scroll to the last new record doesn't work, some
connect (&m_->model_, &QAbstractItemModel::rowsInserted, [this] (QModelIndex const& /*parent*/, int /*first*/, int /*last*/) { // sort of issue with model indexes and optimized DB fetches. For
if (m_->log_view_) m_->log_view_->scrollToBottom (); // now sorting by the same column and direction as the underlying DB
}); // select and that DB select being in descending order so new rows
// at the end appear at view row 0 gets the job done
// // ensure view scrolls to latest new row
// connect (&m_->model_, &QAbstractItemModel::rowsInserted, this, [this] (QModelIndex const& parent, int first, int last) {
// // note col 0 is hidden so use col 1
// // queued connection required otherwise row may not be available
// // in time
// auto index = m_->model_.index (last, 1, parent);
// if (m_->log_view_)
// {
// m_->log_view_->scrollTo (index);
// }
// }, Qt::QueuedConnection);
} }
AbstractLogWindow::~AbstractLogWindow () AbstractLogWindow::~AbstractLogWindow ()
@ -102,23 +115,27 @@ void AbstractLogWindow::set_log_view (QTableView * log_view)
SettingsGroup g {m_->settings_, m_->settings_key_}; SettingsGroup g {m_->settings_, m_->settings_key_};
restoreGeometry (m_->settings_->value ("window/geometry").toByteArray ()); restoreGeometry (m_->settings_->value ("window/geometry").toByteArray ());
m_->log_view_ = log_view; m_->log_view_ = log_view;
m_->log_view_->setContextMenuPolicy (Qt::ActionsContextMenu); set_log_view_font (m_->configuration_->decoded_text_font ());
m_->log_view_->setAlternatingRowColors (true); log_view->setSortingEnabled (true);
m_->log_view_->setSelectionBehavior (QAbstractItemView::SelectRows); log_view->setContextMenuPolicy (Qt::ActionsContextMenu);
m_->log_view_->setSelectionMode (QAbstractItemView::ExtendedSelection); log_view->setAlternatingRowColors (true);
m_->model_.setSourceModel (m_->log_view_->model ()); log_view->setSelectionBehavior (QAbstractItemView::SelectRows);
m_->log_view_->setModel (&m_->model_); log_view->setSelectionMode (QAbstractItemView::ExtendedSelection);
m_->log_view_->setColumnHidden (0, true); log_view->setVerticalScrollMode (QAbstractItemView::ScrollPerPixel);
m_->model_.setSourceModel (log_view->model ());
log_view->setModel (&m_->model_);
log_view->setColumnHidden (0, true);
auto horizontal_header = log_view->horizontalHeader (); auto horizontal_header = log_view->horizontalHeader ();
horizontal_header->setResizeContentsPrecision (0); // visible region only
horizontal_header->setSectionResizeMode (QHeaderView::ResizeToContents); horizontal_header->setSectionResizeMode (QHeaderView::ResizeToContents);
horizontal_header->setSectionsMovable (true); horizontal_header->setSectionsMovable (true);
m_->log_view_->verticalHeader ()->setSectionResizeMode (QHeaderView::ResizeToContents); auto vertical_header = log_view->horizontalHeader ();
set_log_view_font (m_->configuration_->decoded_text_font ()); vertical_header->setResizeContentsPrecision (0); // visible region only
m_->log_view_->scrollToBottom (); vertical_header->setSectionResizeMode (QHeaderView::ResizeToContents);
// actions // actions
auto delete_action = new QAction {tr ("&Delete ..."), m_->log_view_}; auto delete_action = new QAction {tr ("&Delete ..."), log_view};
m_->log_view_->insertAction (nullptr, delete_action); log_view->insertAction (nullptr, delete_action);
connect (delete_action, &QAction::triggered, [this] (bool /*checked*/) { connect (delete_action, &QAction::triggered, [this] (bool /*checked*/) {
m_->delete_QSOs (); m_->delete_QSOs ();
}); });
@ -126,8 +143,8 @@ void AbstractLogWindow::set_log_view (QTableView * log_view)
void AbstractLogWindow::set_log_view_font (QFont const& font) void AbstractLogWindow::set_log_view_font (QFont const& font)
{ {
// m_->log_view_->setFont (font); m_->log_view_->setFont (font);
// m_->log_view_->horizontalHeader ()->setFont (font); m_->log_view_->horizontalHeader ()->setFont (font);
// m_->log_view_->verticalHeader ()->setFont (font); m_->log_view_->verticalHeader ()->setFont (font);
m_->model_.set_font (font); m_->model_.set_font (font);
} }

3
widgets/CabrilloLogWindow.cpp
View File

@ -67,7 +67,8 @@ CabrilloLogWindow::CabrilloLogWindow (QSettings * settings, Configuration const
m_->ui_.log_table_view->setItemDelegateForColumn (2, new DateTimeAsSecsSinceEpochDelegate {this}); m_->ui_.log_table_view->setItemDelegateForColumn (2, new DateTimeAsSecsSinceEpochDelegate {this});
m_->ui_.log_table_view->setItemDelegateForColumn (3, new CallsignDelegate {this}); m_->ui_.log_table_view->setItemDelegateForColumn (3, new CallsignDelegate {this});
m_->ui_.log_table_view->setItemDelegateForColumn (6, new ForeignKeyDelegate {configuration->bands (), 0, this}); m_->ui_.log_table_view->setItemDelegateForColumn (6, new ForeignKeyDelegate {configuration->bands (), 0, this});
m_->ui_.log_table_view->horizontalHeader ()->moveSection (6, 1); // band to first column auto h_header = m_->ui_.log_table_view->horizontalHeader ();
h_header->moveSection (6, 1); // band to first column
} }
CabrilloLogWindow::~CabrilloLogWindow () CabrilloLogWindow::~CabrilloLogWindow ()

2
widgets/echoplot.cpp
View File

@ -1,6 +1,8 @@
#include "echoplot.h" #include "echoplot.h"
#include "commons.h" #include "commons.h"
#include <math.h> #include <math.h>
#include <QPainter>
#include <QPen>
#include <QDebug> #include <QDebug>
#include "moc_echoplot.cpp" #include "moc_echoplot.cpp"

11
widgets/echoplot.h
View File

@ -4,17 +4,20 @@
// For more details see the accompanying file LICENSE_WHEATLEY.TXT // For more details see the accompanying file LICENSE_WHEATLEY.TXT
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef EPLOTTER_H #ifndef EPLOTTER_H_
#define EPLOTTER_H #define EPLOTTER_H_
#include <QtWidgets>
#include <QFrame> #include <QFrame>
#include <QSize>
#include <QImage> #include <QImage>
#include <cstring> #include <QString>
#define VERT_DIVS 7 //specify grid screen divisions #define VERT_DIVS 7 //specify grid screen divisions
#define HORZ_DIVS 20 #define HORZ_DIVS 20
class QPaintEvent;
class QResizeEvent;
class EPlotter : public QFrame class EPlotter : public QFrame
{ {
Q_OBJECT Q_OBJECT

1
widgets/fastgraph.cpp
View File

@ -3,6 +3,7 @@
#include "commons.h" #include "commons.h"
#include <QSettings> #include <QSettings>
#include <QApplication> #include <QApplication>
#include <QKeyEvent>
#include "fastplot.h" #include "fastplot.h"
#include "SettingsGroup.hpp" #include "SettingsGroup.hpp"

6
widgets/fastgraph.h
View File

@ -1,5 +1,5 @@
#ifndef FASTGRAPH_H #ifndef FASTGRAPH_H_
#define FASTGRAPH_H #define FASTGRAPH_H_
#include <QDialog> #include <QDialog>
#include <QScopedPointer> #include <QScopedPointer>
@ -9,6 +9,8 @@ namespace Ui {
} }
class QSettings; class QSettings;
class QCloseEvent;
class QKeyEvent;
class FastGraph : public QDialog class FastGraph : public QDialog
{ {

4
widgets/fastplot.cpp
View File

@ -1,6 +1,10 @@
#include "fastplot.h" #include "fastplot.h"
#include "commons.h" #include "commons.h"
#include <math.h> #include <math.h>
#include <QPainter>
#include <QPen>
#include <QMouseEvent>
#include <QDateTime>
#include <QDebug> #include <QDebug>
#include "moc_fastplot.cpp" #include "moc_fastplot.cpp"

13
widgets/fastplot.h
View File

@ -4,13 +4,16 @@
// For more details see the accompanying file LICENSE_WHEATLEY.TXT // For more details see the accompanying file LICENSE_WHEATLEY.TXT
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef FPLOTTER_H #ifndef FPLOTTER_H_
#define FPLOTTER_H #define FPLOTTER_H_
#include <QtWidgets>
#include <QFrame> #include <QFrame>
#include <QImage> #include <QString>
#include <cstring> #include <QPixmap>
#include <QVector>
#include <QColor>
class QMouseEvent;
class FPlotter : public QFrame class FPlotter : public QFrame
{ {

4
widgets/logqso.h
View File

@ -1,6 +1,6 @@
// -*- Mode: C++ -*- // -*- Mode: C++ -*-
#ifndef LogQSO_H #ifndef LogQSO_H_
#define LogQSO_H #define LogQSO_H_
#include <QDialog> #include <QDialog>

51
widgets/mainwindow.cpp
View File

@ -1,12 +1,20 @@
//---------------------------------------------------------- MainWindow //---------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include <cinttypes> #include <cinttypes>
#include <cstring>
#include <limits> #include <limits>
#include <functional> #include <functional>
#include <fstream> #include <fstream>
#include <iterator> #include <iterator>
#include <algorithm> #include <algorithm>
#include <fftw3.h> #include <fftw3.h>
#include <QStringListModel>
#include <QSettings>
#include <QKeyEvent>
#include <QSharedMemory>
#include <QFileDialog>
#include <QTextBlock>
#include <QProgressBar>
#include <QLineEdit> #include <QLineEdit>
#include <QRegExpValidator> #include <QRegExpValidator>
#include <QRegExp> #include <QRegExp>
@ -2953,18 +2961,22 @@ void MainWindow::decodeDone ()
void MainWindow::readFromStdout() //readFromStdout void MainWindow::readFromStdout() //readFromStdout
{ {
while(proc_jt9.canReadLine()) { while(proc_jt9.canReadLine()) {
QByteArray t=proc_jt9.readLine(); auto line_read = proc_jt9.readLine ();
if (auto p = std::strpbrk (line_read.constData (), "\n\r"))
{
// truncate before line ending chars
line_read = line_read.left (p - line_read.constData ());
}
if(m_mode!="FT8") { if(m_mode!="FT8") {
//Pad 22-char msg to 37 chars //Pad 22-char msg to at least 37 chars
t=t.left(43) + " " + t.mid(43,-1); line_read = line_read.left(43) + " " + line_read.mid(43);
t=t.trimmed();
} }
// qint64 ms=QDateTime::currentMSecsSinceEpoch() - m_msec0; // qint64 ms=QDateTime::currentMSecsSinceEpoch() - m_msec0;
bool bAvgMsg=false; bool bAvgMsg=false;
int navg=0; int navg=0;
if(t.indexOf("<DecodeFinished>") >= 0) { if(line_read.indexOf("<DecodeFinished>") >= 0) {
if(m_mode=="QRA64") m_wideGraph->drawRed(0,0); if(m_mode=="QRA64") m_wideGraph->drawRed(0,0);
m_bDecoded = t.mid(20).trimmed().toInt() > 0; m_bDecoded = line_read.mid(20).trimmed().toInt() > 0;
int mswait=3*1000*m_TRperiod/4; int mswait=3*1000*m_TRperiod/4;
if(!m_diskData) killFileTimer.start(mswait); //Kill in 3/4 period if(!m_diskData) killFileTimer.start(mswait); //Kill in 3/4 period
decodeDone (); decodeDone ();
@ -2976,16 +2988,16 @@ void MainWindow::readFromStdout() //readFromStdout
return; return;
} else { } else {
if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64" or m_mode=="FT8") { if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64" or m_mode=="FT8") {
int n=t.indexOf("f"); int n=line_read.indexOf("f");
if(n<0) n=t.indexOf("d"); if(n<0) n=line_read.indexOf("d");
if(n>0) { if(n>0) {
QString tt=t.mid(n+1,1); QString tt=line_read.mid(n+1,1);
navg=tt.toInt(); navg=tt.toInt();
if(navg==0) { if(navg==0) {
char c = tt.data()->toLatin1(); char c = tt.data()->toLatin1();
if(int(c)>=65 and int(c)<=90) navg=int(c)-54; if(int(c)>=65 and int(c)<=90) navg=int(c)-54;
} }
if(navg>1 or t.indexOf("f*")>0) bAvgMsg=true; if(navg>1 or line_read.indexOf("f*")>0) bAvgMsg=true;
} }
} }
@ -2998,8 +3010,7 @@ void MainWindow::readFromStdout() //readFromStdout
<< m_mode << endl; << m_mode << endl;
m_RxLog=0; m_RxLog=0;
} }
int n=t.length(); out << line_read.left (line_read.size() - 2).trimmed () << endl;
out << t.mid(0,n-2) << endl;
f.close(); f.close();
} else { } else {
MessageBox::warning_message (this, tr ("File Open Error") MessageBox::warning_message (this, tr ("File Open Error")
@ -3015,10 +3026,8 @@ void MainWindow::readFromStdout() //readFromStdout
m_blankLine = false; m_blankLine = false;
} }
DecodedText decodedtext0 {QString::fromUtf8(t.constData()) DecodedText decodedtext0 {QString::fromUtf8(line_read.constData())};
.remove(QRegularExpression {"\r|\n"})}; DecodedText decodedtext {QString::fromUtf8(line_read.constData()).remove("TU; ")};
DecodedText decodedtext {QString::fromUtf8(t.constData())
.remove(QRegularExpression {"\r|\n"}).remove("TU; ")};
if(m_mode=="FT8" and SpecOp::FOX == m_config.special_op_id() and if(m_mode=="FT8" and SpecOp::FOX == m_config.special_op_id() and
(decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) { (decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) {
@ -3101,7 +3110,7 @@ void MainWindow::readFromStdout() //readFromStdout
if(w.at(0)==m_config.my_callsign() or w.at(0)==Radio::base_callsign(m_config.my_callsign())) { if(w.at(0)==m_config.my_callsign() or w.at(0)==Radio::base_callsign(m_config.my_callsign())) {
//### Check for ui->dxCallEntry->text()==foxCall before logging! ### //### Check for ui->dxCallEntry->text()==foxCall before logging! ###
ui->stopTxButton->click (); ui->stopTxButton->click ();
on_logQSOButton_clicked(); logQSOTimer.start(0);
} }
if((w.at(2)==m_config.my_callsign() or w.at(2)==Radio::base_callsign(m_config.my_callsign())) if((w.at(2)==m_config.my_callsign() or w.at(2)==Radio::base_callsign(m_config.my_callsign()))
and ui->tx3->text().length()>0) { and ui->tx3->text().length()>0) {
@ -3119,7 +3128,7 @@ void MainWindow::readFromStdout() //readFromStdout
ui->tx3->text().length()>0) { ui->tx3->text().length()>0) {
if(w.at(2)=="RR73") { if(w.at(2)=="RR73") {
ui->stopTxButton->click (); ui->stopTxButton->click ();
on_logQSOButton_clicked(); logQSOTimer.start(0);
} else { } else {
if(w.at(1)==Radio::base_callsign(ui->dxCallEntry->text()) and if(w.at(1)==Radio::base_callsign(ui->dxCallEntry->text()) and
(w.at(2).mid(0,1)=="+" or w.at(2).mid(0,1)=="-")) { (w.at(2).mid(0,1)=="+" or w.at(2).mid(0,1)=="-")) {
@ -4454,7 +4463,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
m_nextCall=""; //### Temporary: disable use of "TU;" message m_nextCall=""; //### Temporary: disable use of "TU;" message
if(SpecOp::RTTY == m_config.special_op_id() and m_nextCall!="") { if(SpecOp::RTTY == m_config.special_op_id() and m_nextCall!="") {
// We're in RTTY contest and have "nextCall" queued up: send a "TU; ..." message // We're in RTTY contest and have "nextCall" queued up: send a "TU; ..." message
on_logQSOButton_clicked(); logQSOTimer.start(0);
ui->tx3->setText(ui->tx3->text().remove("TU; ")); ui->tx3->setText(ui->tx3->text().remove("TU; "));
useNextCall(); useNextCall();
QString t="TU; " + ui->tx3->text(); QString t="TU; " + ui->tx3->text();
@ -4463,7 +4472,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
} else { } else {
// if(SpecOp::RTTY == m_config.special_op_id()) { // if(SpecOp::RTTY == m_config.special_op_id()) {
if(false) { if(false) {
on_logQSOButton_clicked(); logQSOTimer.start(0);
m_ntx=6; m_ntx=6;
ui->txrb6->setChecked(true); ui->txrb6->setChecked(true);
} else { } else {
@ -8217,7 +8226,7 @@ list2Done:
{ {
writeFoxQSO (QString {" Log: %1 %2 %3 %4 %5"}.arg (m_hisCall).arg (m_hisGrid) writeFoxQSO (QString {" Log: %1 %2 %3 %4 %5"}.arg (m_hisCall).arg (m_hisGrid)
.arg (m_rptSent).arg (m_rptRcvd).arg (m_lastBand)); .arg (m_rptSent).arg (m_rptRcvd).arg (m_lastBand));
on_logQSOButton_clicked(); logQSOTimer.start(0);
m_foxRateQueue.enqueue (now); //Add present time in seconds m_foxRateQueue.enqueue (now); //Add present time in seconds
//to Rate queue. //to Rate queue.
} }

14
widgets/mainwindow.h
View File

@ -1,12 +1,12 @@
// -*- Mode: C++ -*- // -*- Mode: C++ -*-
#ifndef MAINWINDOW_H #ifndef MAINWINDOW_H
#define MAINWINDOW_H #define MAINWINDOW_H
#ifdef QT5
#include <QtWidgets> #include <QMainWindow>
#else #include <QLabel>
#include <QtGui>
#endif
#include <QThread> #include <QThread>
#include <QProcess>
#include <QProgressBar>
#include <QTimer> #include <QTimer>
#include <QDateTime> #include <QDateTime>
#include <QList> #include <QList>
@ -58,6 +58,8 @@ namespace Ui {
class MainWindow; class MainWindow;
} }
class QSharedMemory;
class QSplashScreen;
class QSettings; class QSettings;
class QLineEdit; class QLineEdit;
class QFont; class QFont;
@ -102,6 +104,8 @@ public:
QWidget *parent = nullptr); QWidget *parent = nullptr);
~MainWindow(); ~MainWindow();
int decoderBusy () const {return m_decoderBusy;}
public slots: public slots:
void showSoundInError(const QString& errorMsg); void showSoundInError(const QString& errorMsg);
void showSoundOutError(const QString& errorMsg); void showSoundOutError(const QString& errorMsg);

6
widgets/plotter.cpp
View File

@ -1,5 +1,11 @@
#include "plotter.h" #include "plotter.h"
#include <math.h> #include <math.h>
#include <QAction>
#include <QMenu>
#include <QPainter>
#include <QDateTime>
#include <QPen>
#include <QMouseEvent>
#include <QDebug> #include <QDebug>
#include "commons.h" #include "commons.h"
#include "moc_plotter.cpp" #include "moc_plotter.cpp"

12
widgets/plotter.h
View File

@ -5,18 +5,14 @@
// For more details see the accompanying file LICENSE_WHEATLEY.TXT // For more details see the accompanying file LICENSE_WHEATLEY.TXT
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef PLOTTER_H #ifndef PLOTTER_H_
#define PLOTTER_H #define PLOTTER_H_
#ifdef QT5
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QFrame> #include <QFrame>
#include <QSize>
#include <QImage> #include <QImage>
#include <QVector> #include <QVector>
#include <cstring> #include <QColor>
#define VERT_DIVS 7 //specify grid screen divisions #define VERT_DIVS 7 //specify grid screen divisions
#define HORZ_DIVS 20 #define HORZ_DIVS 20

2
widgets/widegraph.cpp
View File

@ -3,6 +3,8 @@
#include <algorithm> #include <algorithm>
#include <QApplication> #include <QApplication>
#include <QSettings> #include <QSettings>
#include <QDateTime>
#include <QKeyEvent>
#include "ui_widegraph.h" #include "ui_widegraph.h"
#include "commons.h" #include "commons.h"
#include "Configuration.hpp" #include "Configuration.hpp"

4
widgets/widegraph.h
View File

@ -1,6 +1,6 @@
// -*- Mode: C++ -*- // -*- Mode: C++ -*-
#ifndef WIDEGRAPH_H #ifndef WIDEGRAPH_H_
#define WIDEGRAPH_H #define WIDEGRAPH_H_
#include <QDialog> #include <QDialog>
#include <QScopedPointer> #include <QScopedPointer>

2
widgets/widgets.pri
View File

@ -19,7 +19,7 @@ HEADERS += \
widgets/echoplot.h widgets/echograph.h widgets/fastgraph.h \ widgets/echoplot.h widgets/echograph.h widgets/fastgraph.h \
widgets/fastplot.h widgets/MessageBox.hpp widgets/colorhighlighting.h \ widgets/fastplot.h widgets/MessageBox.hpp widgets/colorhighlighting.h \
widgets/ExportCabrillo.h widgets/AbstractLogWindow.hpp \ widgets/ExportCabrillo.h widgets/AbstractLogWindow.hpp \
widgets/FoxLogWindow.cpp widgets/CabrilloLogWindow.cpp widgets/FoxLogWindow.hpp widgets/CabrilloLogWindow.hpp
FORMS += \ FORMS += \
widgets/mainwindow.ui widgets/about.ui \ widgets/mainwindow.ui widgets/about.ui \