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

Close to OK with message averaging? 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2541 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-08-30 14:57:46 +00:00
parent 46280056b0
commit 6fce19c9f1
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libm65/decode0.f90
View File

@ -53,15 +53,15 @@ subroutine decode0(dd,ss,savg,nstandalone)
call timer('map65a ',0)
call map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
mousedf,mousefqso,nagain,ndecdone,ndiskdat,nfshift,ndphi, &
nfcal,nkeep,mcall3b,nsum,nsave0,nxant,rmsdd,mycall,mygrid, &
nfcal,nkeep,mcall3b,nsum,nsave,nxant,rmsdd,mycall,mygrid, &
neme,ndepth,hiscall,hisgrid,nhsym,nfsample,nxpol,mode65)
call timer('map65a ',1)
call timer('decode0 ',1)
if(nstandalone.eq.0) call timer('decode0 ',101)
write(*,1010) nsum,nsave0
1010 format('<m65aFinished>',2i4)
write(*,1010) nsum,nsave
1010 format('<DecodeFinished>',2i4)
flush(6)
return

5
libm65/map65a.f90
View File

@ -325,6 +325,11 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
endif
if(ndphi.eq.1 .and.iloop.eq.12) call getdphi(qphi)
if(nqd.eq.1) then
write(*,1013) nsum,nsave
1013 format('<QuickDecodeDone>',2i4)
flush(6)
endif
if(nagain.eq.1) go to 999
enddo

21
mainwindow.cpp
View File

@ -821,6 +821,12 @@ void MainWindow::createStatusBar() //createStatusBar
lab5->setMinimumSize(QSize(50,10));
lab5->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab5);
lab6 = new QLabel("Avg: 0/0");
lab6->setAlignment(Qt::AlignHCenter);
lab6->setMinimumSize(QSize(50,10));
lab6->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab6);
}
void MainWindow::on_tolSpinBox_valueChanged(int i) //tolSpinBox
@ -1254,13 +1260,14 @@ void MainWindow::readFromStdout() //readFromStdout
while(proc_m65.canReadLine())
{
QByteArray t=proc_m65.readLine();
if(t.indexOf("<m65aFinished>") >= 0) {
// int nsum,nsave;
// scanf("<m65aFinished> %d %d",&nsum,&nsave);
// m_nsum=nsum;
// m_nsave=nsave;
// qDebug() << m_nsum << m_nsave;
qDebug() << t;
if(t.indexOf("<QuickDecodeDone>") >= 0) {
m_nsum=t.mid(17,4).toInt();
m_nsave=t.mid(21,4).toInt();
QString t2;
t2.sprintf("Avg: %d/%d",m_nsum,m_nsave);
lab6->setText(t2);
}
if(t.indexOf("<DecodeFinished>") >= 0) {
if(m_widebandDecode) {
g_pMessages->setText(m_messagesText);
g_pBandMap->setText(m_bandmapText);