w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0

This commit is contained in:
Steve Franke 2019-04-30 20:12:42 -05:00
parent b5f0cc7ea7 7f523d37f9
commit 8b483620be
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions.cmake
View File

@ -2,5 +2,5 @@
set (WSJTX_VERSION_MAJOR 2)
set (WSJTX_VERSION_MINOR 1)
set (WSJTX_VERSION_PATCH 0)
set (WSJTX_RC 5) # release candidate number, comment out or zero for development versions
set (WSJTX_RC 6) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

11
lib/azdist.f90
View File

@ -1,7 +1,7 @@
subroutine azdist(grid1,grid2,utch,nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter)
subroutine azdist(MyGrid,HisGrid,utch,nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter)
character*(*) grid1,grid2
character*6 MyGrid,HisGrid,mygrid0,hisgrid0
character(len=*) :: MyGrid,HisGrid
character*6 mygrid0,hisgrid0
real*8 utch,utch0
logical HotABetter,IamEast
real eltab(22),daztab(22)
@ -12,11 +12,6 @@ subroutine azdist(grid1,grid2,utch,nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter)
data mygrid0/" "/,hisgrid0/" "/,utch0/-999.d0/
save
MyGrid=grid1//' '
HisGrid=grid2//' '
if(ichar(MyGrid(5:5)).eq.0) MyGrid(5:6)=' '
if(ichar(HisGrid(5:5)).eq.0) HisGrid(5:6)=' '
if(MyGrid.eq.HisGrid) then
naz=0
nel=0

1
widgets/logqso.cpp
View File

@ -41,6 +41,7 @@ LogQSO::LogQSO(QString const& programTitle, QSettings * settings
ok_->setAutoDefault (false);
ok_->setFocusPolicy (Qt::ClickFocus);
ok_->setStyleSheet ("background-color: green");
cancel_->setAutoDefault (false);
ui->button_layout->addStretch ();
ui->button_layout->addWidget (ok_);

6
widgets/mainwindow.cpp
View File

@ -3341,7 +3341,7 @@ void MainWindow::pskPost (DecodedText const& decodedtext)
QString grid;
decodedtext.deCallAndGrid(/*out*/deCall,grid);
int audioFrequency = decodedtext.frequencyOffset();
if(m_mode=="FT8" or m_mode=="MSK144") {
if(m_mode=="FT8" or m_mode=="MSK144" or m_mode=="FT4") {
audioFrequency=decodedtext.string().mid(16,4).toInt();
}
int snr = decodedtext.snr();
@ -7549,8 +7549,8 @@ void MainWindow::p1ReadFromStdout() //p1readFromStdout
if(grid!="") {
double utch=0.0;
int nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter;
azdist_(const_cast <char *> (m_config.my_grid ().toLatin1().constData()),
const_cast <char *> (grid.toLatin1().constData()),&utch,
azdist_(const_cast <char *> ((m_config.my_grid () + " ").left (6).toLatin1 ().constData ()),
const_cast <char *> ((grid + " ").left (6).toLatin1 ().constData ()),&utch,
&nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6);
QString t1;
if(m_config.miles()) {