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

Fix the save/restore logic for NoJT65, NoQRA64; correct a flaw in extract.f90.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7527 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-17 20:15:52 +00:00
parent 8ee47c1768
commit 9bdfee3095
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libm65/extract.f90
View File

@ -34,7 +34,7 @@ subroutine extract(s3,nadd,ncount,nhist,decoded,ltext)
if(nhist.ge.20) then if(nhist.ge.20) then
nfail=nfail+1 nfail=nfail+1
call pctile(s3,tmp,4032,50,base) ! ### or, use ave from demod64a call pctile(s3,4032,50,base) ! ### or, use ave from demod64a
s3(ipk,1:63)=base s3(ipk,1:63)=base
if(nfail.gt.30) then if(nfail.gt.30) then
decoded=' ' decoded=' '

2
libm65/m65.f90
View File

@ -73,7 +73,7 @@ program m65
k=0 k=0
fcenter=144.125d0 fcenter=144.125d0
mousedf=0 mousedf=0
mousefqso=126 mousefqso=125
newdat=1 newdat=1
mycall='K1JT' mycall='K1JT'

7
mainwindow.cpp
View File

@ -225,12 +225,14 @@ MainWindow::MainWindow(QWidget *parent) :
g_pBandMap->setColors(m_colors); g_pBandMap->setColors(m_colors);
g_pAstro->setFontSize(m_astroFont); g_pAstro->setFontSize(m_astroFont);
if(m_modeQRA64==0) on_actionNoQRA64_triggered();
if(m_modeQRA64==1) on_actionQRA64A_triggered(); if(m_modeQRA64==1) on_actionQRA64A_triggered();
if(m_modeQRA64==2) on_actionQRA64B_triggered(); if(m_modeQRA64==2) on_actionQRA64B_triggered();
if(m_modeQRA64==3) on_actionQRA64C_triggered(); if(m_modeQRA64==3) on_actionQRA64C_triggered();
if(m_modeQRA64==4) on_actionQRA64D_triggered(); if(m_modeQRA64==4) on_actionQRA64D_triggered();
if(m_modeQRA64==5) on_actionQRA64E_triggered(); if(m_modeQRA64==5) on_actionQRA64E_triggered();
if(m_modeJT65==0) on_actionNoJT65_triggered();
if(m_modeJT65==1) on_actionJT65A_triggered(); if(m_modeJT65==1) on_actionJT65A_triggered();
if(m_modeJT65==2) on_actionJT65B_triggered(); if(m_modeJT65==2) on_actionJT65B_triggered();
if(m_modeJT65==3) on_actionJT65C_triggered(); if(m_modeJT65==3) on_actionJT65C_triggered();
@ -467,6 +469,11 @@ void MainWindow::readSettings()
"PaletteLinrad",false).toBool()); "PaletteLinrad",false).toBool());
m_mode=settings.value("Mode","JT65B").toString(); m_mode=settings.value("Mode","JT65B").toString();
m_modeJT65=settings.value("nModeJT65",2).toInt(); m_modeJT65=settings.value("nModeJT65",2).toInt();
if(m_modeJT65==0) ui->actionNoJT65->setChecked(true);
if(m_modeJT65==1) ui->actionJT65A->setChecked(true);
if(m_modeJT65==2) ui->actionJT65B->setChecked(true);
if(m_modeJT65==3) ui->actionJT65C->setChecked(true);
m_modeQRA64=settings.value("nModeQRA64",2).toInt(); m_modeQRA64=settings.value("nModeQRA64",2).toInt();
m_modeTx=settings.value("TxMode","JT65").toString(); m_modeTx=settings.value("TxMode","JT65").toString();
if(m_modeQRA64==0) ui->actionNoQRA64->setChecked(true); if(m_modeQRA64==0) ui->actionNoQRA64->setChecked(true);