w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-30 20:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Steven Franke 2020-04-15 15:46:31 -05:00
commit 191b478584
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/77bit/packjt77.f90
View File

@ -396,15 +396,19 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
else else
! Suffix ! Suffix
npfx=npfx-nzzz npfx=npfx-nzzz
cpfx=' '
if(npfx.le.35) then if(npfx.le.35) then
cpfx(1:1)=a2(npfx+1:npfx+1) cpfx(1:1)=a2(npfx+1:npfx+1)
else if(npfx.gt.35 .and. npfx.le.1295) then else if(npfx.gt.35 .and. npfx.le.1295) then
cpfx(1:1)=a2(npfx/36+1:npfx/36+1) cpfx(1:1)=a2(npfx/36+1:npfx/36+1)
cpfx(2:2)=a2(mod(npfx,36)+1:mod(npfx,36)+1) cpfx(2:2)=a2(mod(npfx,36)+1:mod(npfx,36)+1)
else else if(npfx.gt.1295 .and. npfx.le.12959) then
cpfx(1:1)=a2(npfx/360+1:npfx/360+1) cpfx(1:1)=a2(npfx/360+1:npfx/360+1)
cpfx(2:2)=a2(mod(npfx/10,36)+1:mod(npfx/10,36)+1) cpfx(2:2)=a2(mod(npfx/10,36)+1:mod(npfx/10,36)+1)
cpfx(3:3)=a2(mod(npfx,10)+1:mod(npfx,10)+1) cpfx(3:3)=a2(mod(npfx,10)+1:mod(npfx,10)+1)
else
unpk77_success=.false.
return
endif endif
msg=trim(call_1)//'/'//trim(adjustl(cpfx))//' '//trim(adjustl(crpt)) msg=trim(call_1)//'/'//trim(adjustl(cpfx))//' '//trim(adjustl(crpt))
endif endif

3
widgets/mainwindow.cpp
View File

@ -793,9 +793,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
for(int i=0; i<19; i++) { //Initialize dBm values for(int i=0; i<19; i++) { //Initialize dBm values
float dbm=(10.0*i)/3.0; float dbm=(10.0*i)/3.0;
// int ndbm=0;
// if(dbm<0) ndbm=int(dbm-0.5);
// if(dbm>=0) ndbm=int(dbm+0.5);
int ndbm=int(dbm+0.5); int ndbm=int(dbm+0.5);
QString t; QString t;
t.sprintf("%d dBm ",ndbm); t.sprintf("%d dBm ",ndbm);