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

Do 45-deg steps for QRA64 decode. Tweaks to GUI.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7519 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-17 14:23:18 +00:00
parent ae1a6a8486
commit 9cfe3c3c07
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libm65/qra64c.f90
View File

@ -70,11 +70,11 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, &
naptype=maxaptype naptype=maxaptype
npts2=NFFT2 npts2=NFFT2
do ip=0,1 do ip=0,3
!###
if(ip.eq.0) c00(0:NFFT2-1)=conjg(cx) if(ip.eq.0) c00(0:NFFT2-1)=conjg(cx)
if(ip.eq.1) c00(0:NFFT2-1)=conjg(cy) if(ip.eq.1) c00(0:NFFT2-1)=conjg(cx+cy)
!### if(ip.eq.2) c00(0:NFFT2-1)=conjg(cy)
if(ip.eq.3) c00(0:NFFT2-1)=conjg(cx-cy)
call sync64(c00,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk0,sync, & call sync64(c00,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk0,sync, &
sync2,width) sync2,width)
@ -124,7 +124,7 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, &
dtxkeep=jpk/6000.0 - 1.0 dtxkeep=jpk/6000.0 - 1.0
itry0keep=itry0 itry0keep=itry0
iterkeep=iter iterkeep=iter
npolkeep=ip*90 npolkeep=ip*45
endif endif
enddo enddo
if(irc.eq.0) goto 5 if(irc.eq.0) goto 5
@ -144,7 +144,7 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, &
10 decoded=' ' 10 decoded=' '
if(irc.ge.0) then if(irc.ge.0) then
if(irc.eq.0) npol=ip*90 if(irc.eq.0) npol=ip*45
call unpackmsg(dat4,decoded) !Unpack the user message call unpackmsg(dat4,decoded) !Unpack the user message
call fmtmsg(decoded,iz) call fmtmsg(decoded,iz)
if(index(decoded,"000AAA ").ge.1) then if(index(decoded,"000AAA ").ge.1) then

4
mainwindow.cpp
View File

@ -382,6 +382,7 @@ void MainWindow::writeSettings()
settings.setValue("Mode",m_mode); settings.setValue("Mode",m_mode);
settings.setValue("nModeJT65",m_modeJT65); settings.setValue("nModeJT65",m_modeJT65);
settings.setValue("nModeQRA64",m_modeQRA64); settings.setValue("nModeQRA64",m_modeQRA64);
settings.setValue("TxMode",m_modeTx);
settings.setValue("SaveNone",ui->actionNone->isChecked()); settings.setValue("SaveNone",ui->actionNone->isChecked());
settings.setValue("SaveAll",ui->actionSave_all->isChecked()); settings.setValue("SaveAll",ui->actionSave_all->isChecked());
settings.setValue("NDepth",m_ndepth); settings.setValue("NDepth",m_ndepth);
@ -468,12 +469,15 @@ void MainWindow::readSettings()
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();
m_modeQRA64=settings.value("nModeQRA64",2).toInt(); m_modeQRA64=settings.value("nModeQRA64",2).toInt();
m_modeTx=settings.value("TxMode","JT65").toString();
if(m_modeQRA64==0) ui->actionNoQRA64->setChecked(true); if(m_modeQRA64==0) ui->actionNoQRA64->setChecked(true);
if(m_modeQRA64==1) ui->actionQRA64A->setChecked(true); if(m_modeQRA64==1) ui->actionQRA64A->setChecked(true);
if(m_modeQRA64==2) ui->actionQRA64B->setChecked(true); if(m_modeQRA64==2) ui->actionQRA64B->setChecked(true);
if(m_modeQRA64==3) ui->actionQRA64C->setChecked(true); if(m_modeQRA64==3) ui->actionQRA64C->setChecked(true);
if(m_modeQRA64==4) ui->actionQRA64D->setChecked(true); if(m_modeQRA64==4) ui->actionQRA64D->setChecked(true);
if(m_modeQRA64==5) ui->actionQRA64E->setChecked(true); if(m_modeQRA64==5) ui->actionQRA64E->setChecked(true);
if(m_modeTx=="JT65") ui->pbTxMode->setText("Tx JT65 #");
if(m_modeTx=="QRA64") ui->pbTxMode->setText("Tx QRA64 #");
ui->actionNone->setChecked(settings.value("SaveNone",true).toBool()); ui->actionNone->setChecked(settings.value("SaveNone",true).toBool());
ui->actionSave_all->setChecked(settings.value("SaveAll",false).toBool()); ui->actionSave_all->setChecked(settings.value("SaveAll",false).toBool());

6
mainwindow.ui
View File

@ -508,6 +508,12 @@ p, li { white-space: pre-wrap; }
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Tx QRA64 $</string> <string>Tx QRA64 $</string>
</property> </property>