diff --git a/qmap/libqmap/q65b.f90 b/qmap/libqmap/q65b.f90
index b5f3ee2e3..84b9485a3 100644
--- a/qmap/libqmap/q65b.f90
+++ b/qmap/libqmap/q65b.f90
@@ -112,8 +112,8 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
ndecodes=ndecodes+1
frx=0.001*k0*df+nkhz_center-48.0+1.0 - 0.001*nfcal
fsked=frx - 0.001*ndop00/2.0 - 1.5
- write(result(ndecodes),1120) nutc,fsked,xdt0,nsnr0,trim(msg0)
-1120 format(i4.4,f9.3,f7.2,i5,2x,a,i6)
+ write(result(ndecodes),1120) nutc,frx,fsked,xdt0,nsnr0,trim(msg0)
+1120 format(i4.4,f9.3,f7.1,f7.2,i5,2x,a)
write(12,1130) datetime,trim(result(ndecodes)(5:))
1130 format(a11,1x,a)
result(ndecodes)=trim(result(ndecodes))//char(0)
diff --git a/qmap/mainwindow.ui b/qmap/mainwindow.ui
index 6fae7b2f2..f9a9b423d 100644
--- a/qmap/mainwindow.ui
+++ b/qmap/mainwindow.ui
@@ -6,7 +6,7 @@
0
0
- 472
+ 550
431
@@ -18,7 +18,7 @@
- 472
+ 550
0
@@ -59,7 +59,7 @@
- UTC Freq DT dB Message
+ UTC Freq Fsked DT dB Message
-
@@ -72,7 +72,7 @@
- 421
+ 500
100
@@ -111,19 +111,79 @@ p, li { white-space: pre-wrap; }
-
-
-
-
+
-
+
50
- 150
+ 0
-
- QFrame::StyledPanel
+
+ &Erase
-
- QFrame::Raised
+
+
+ -
+
+
+ Maximum drift rate in units of symbol rate per transmissiion.
+
+
+ Qt::AlignCenter
+
+
+ Max Drift
+
+
+ 50
+
+
+ 5
+
+
+
+ -
+
+
+
+ 16777215
+ 35
+
+
+
+
+ 16
+
+
+
+ QFrame::Panel
+
+
+ 1296.080
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ &Decode
+
+
+
+ -
+
+
+ NB
@@ -158,6 +218,22 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+
+ 50
+ 150
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
-
@@ -183,32 +259,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
-
- 50
- 0
-
-
-
- &Erase
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- &Decode
-
-
-
-
-
@@ -294,25 +344,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
- Maximum drift rate in units of symbol rate per transmissiion.
-
-
- Qt::AlignCenter
-
-
- Max Drift
-
-
- 50
-
-
- 5
-
-
-
-
@@ -344,37 +375,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
- NB
-
-
-
- -
-
-
-
- 16777215
- 35
-
-
-
-
- 16
-
-
-
- QFrame::Panel
-
-
- 1296.080
-
-
- Qt::AlignCenter
-
-
-
@@ -386,7 +386,7 @@ p, li { white-space: pre-wrap; }
0
0
- 472
+ 550
21
diff --git a/widgets/activeStations.cpp b/widgets/activeStations.cpp
index 39dbda71e..04e79f477 100644
--- a/widgets/activeStations.cpp
+++ b/widgets/activeStations.cpp
@@ -62,7 +62,7 @@ void ActiveStations::displayRecentStations(QString mode, QString const& t)
m_mode=mode;
bool b=(m_mode=="Q65");
if(b) {
- ui->header_label2->setText(" N Freq S/N Call Grid Tx Age");
+ ui->header_label2->setText(" N Frx Fsked S/N Call Grid Tx Age");
ui->label->setText("QSOs:");
} else {
ui->header_label2->setText(" N Call Grid Az S/N Freq Tx Age Pts");
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index ee9e4b86d..14863ba96 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -3689,12 +3689,12 @@ void MainWindow::callSandP2(int n)
if(m_mode!="Q65" and m_ready2call[n]=="") return;
QStringList w=m_ready2call[n].split(' ', SkipEmptyParts);
if(m_mode=="Q65") {
- double kHz=w[0].toDouble();
+ double kHz=w[1].toDouble();
int nMHz=m_freqNominal/1000000;
m_freqNominal=(nMHz*1000 + kHz)* 1000;
- m_deCall=w[2];
- m_deGrid=w[3];
- m_txFirst=(w[4]=="0");
+ m_deCall=w[3];
+ m_deGrid=w[4];
+ m_txFirst=(w[5]=="0");
// ui->TxFreqSpinBox->setValue(1500);
} else {
m_deCall=w[0];
@@ -3706,7 +3706,7 @@ void MainWindow::callSandP2(int n)
ui->dxCallEntry->setText(m_deCall);
ui->dxGridEntry->setText(m_deGrid);
if(m_mode=="Q65") {
- genStdMsgs(w[1]);
+ genStdMsgs(w[2]);
} else {
genStdMsgs(w[3]);
}
@@ -9238,13 +9238,15 @@ void MainWindow::readWidebandDecodes()
QString line=QString::fromLatin1(qmapcom.result[m_fetched]);
nhr=line.mid(0,2).toInt();
nmin=line.mid(2,2).toInt();
- double fsked=line.mid(4,9).toDouble();
- QString msg=line.mid(27,-1);
+ double frx=line.mid(4,9).toDouble();
+ double fsked=line.mid(13,7).toDouble();
+ QString msg=line.mid(34,-1);
int i1=msg.indexOf(" ");
int i2=i1 +1 + msg.mid(i1+1,-1).indexOf(" ");
QString dxcall=msg.mid(i1+1,i2-i1-1);
QString w3=msg.mid(i2+1,-1);
- nsnr=line.mid(22,3).toInt();
+ nsnr=line.mid(29,3).toInt();
+ m_EMECall[dxcall].frx=frx;
m_EMECall[dxcall].fsked=fsked;
m_EMECall[dxcall].nsnr=nsnr;
m_EMECall[dxcall].t=60*nhr + nmin;
@@ -9289,10 +9291,10 @@ void MainWindow::readWidebandDecodes()
dxcall=(i.key()+" ").left(8);
dxgrid4=(i->grid4+"... ").left(4);
if(i->worked) {
- t1=t1.asprintf("%5.1f %+03d %8s %4s %3d %3d\n",i->fsked,snr,dxcall.toLatin1().constData(),
+ t1=t1.asprintf("%7.3f %5.1f %+03d %8s %4s %3d %3d\n",i->frx,i->fsked,snr,dxcall.toLatin1().constData(),
dxgrid4.toLatin1().constData(),odd,age);
} else {
- t1=t1.asprintf("%5.1f %+03d %8s %4s %3d %3d*\n",i->fsked,snr,dxcall.toLatin1().constData(),
+ t1=t1.asprintf("%7.3f %5.1f %+03d %8s %4s %3d %3d*\n",i->frx,i->fsked,snr,dxcall.toLatin1().constData(),
dxgrid4.toLatin1().constData(),odd,age);
}
f[k]=i->fsked;
@@ -9308,7 +9310,7 @@ void MainWindow::readWidebandDecodes()
indexx_(f,&kz,indx);
for(int k=0; k