From 2375e2000caefe1ae1600ac99559c8aacb0b2395 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Tue, 28 Feb 2023 11:54:08 -0500
Subject: [PATCH] Mark "ready2call" * and "new initial" # in Q65 Active
Stations window.
---
widgets/mainwindow.cpp | 15 +++++++--------
widgets/mainwindow.h | 1 +
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index a72258b79..5b815a3af 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -9386,10 +9386,11 @@ void MainWindow::readWidebandDecodes()
m_EMECall[dxcall].nsnr=nsnr;
m_EMECall[dxcall].t=60*nhr + nmin;
if(w3.contains(grid_regexp)) m_EMECall[dxcall].grid4=w3;
+ bool bCQ=line.contains(" CQ ");
+ m_EMECall[dxcall].ready2call=(bCQ or line.contains(" 73") or line.contains(" RR73"));
m_fetched++;
Frequency frequency = (m_freqNominal/1000000) * 1000000 + int(fsked*1000.0);
- bool bCQ=line.contains(" CQ ");
bool bFromDisk=qmapcom.nQDecoderDone==2;
if(!bFromDisk and (m_EMECall[dxcall].grid4.contains(grid_regexp) or bCQ)) {
qDebug() << "To PSKreporter:" << dxcall << m_EMECall[dxcall].grid4 << frequency << m_mode << nsnr;
@@ -9420,17 +9421,15 @@ void MainWindow::readWidebandDecodes()
int snr=i->nsnr;
int odd=1 - (i->t)%2;
int age=60*nhr + nmin - (i->t);
+ char c2[3]={32,32,0};
if(age<0) age += 1440;
if(age<=maxAge) {
dxcall=(i.key()+" ").left(8);
dxgrid4=(i->grid4+"... ").left(4);
- if(m_EMEworked[dxcall.trimmed()]) {
- 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("%7.3f %5.1f %+03d %8s %4s %3d %3d*\n",i->frx,i->fsked,snr,dxcall.toLatin1().constData(),
- dxgrid4.toLatin1().constData(),odd,age);
- }
+ if(!m_EMEworked[dxcall.trimmed()]) c2[0]=35; //# for not in log
+ if(i->ready2call) c2[1]=42; //* for ready to call
+ t1=t1.asprintf("%7.3f %5.1f %+03d %8s %4s %3d %3d %2s\n",i->frx,i->fsked,snr,dxcall.toLatin1().constData(),
+ dxgrid4.toLatin1().constData(),odd,age,c2);
f[k]=i->fsked;
list.append(t1);
k++;
diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h
index a0cf8328b..6be4c5e48 100644
--- a/widgets/mainwindow.h
+++ b/widgets/mainwindow.h
@@ -714,6 +714,7 @@ private:
qint32 nsnr;
qint32 t;
bool worked;
+ bool ready2call;
};
QMap<QString,EMECall> m_EMECall;