From 190dca5501c006e06359d3ac6606d906ee3b0068 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 22 Mar 2022 13:27:24 -0400 Subject: [PATCH] Do not display the "........" bands indicators. --- widgets/activeStations.cpp | 2 +- widgets/mainwindow.cpp | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/widgets/activeStations.cpp b/widgets/activeStations.cpp index d17a30c7d..a001e646f 100644 --- a/widgets/activeStations.cpp +++ b/widgets/activeStations.cpp @@ -21,7 +21,7 @@ ActiveStations::ActiveStations(QSettings * settings, QFont const& font, QWidget ui->RecentStationsPlainTextEdit->setReadOnly (true); changeFont (font); read_settings (); - ui->header_label2->setText(" N Call Grid Az S/N Freq Tx Age Pts Bands"); + ui->header_label2->setText(" N Call Grid Az S/N Freq Tx Age Pts"); connect(ui->RecentStationsPlainTextEdit, SIGNAL(selectionChanged()), this, SLOT(select())); } diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index de838adc2..3b836cd25 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3386,7 +3386,7 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt) &nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,(FCL)6,(FCL)6); int npts=int((500+nDkm)/500); ac.grid4=deGrid; - ac.bands="......."; +// ac.bands="......."; ac.az=nAz; ac.points=npts; m_activeCall[deCall]=ac; @@ -3395,7 +3395,7 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt) m_points=-1; if(m_activeCall.contains(deCall)) { - +/* // Don't display stations we already worked on this band. QString band=m_config.bands()->find(m_freqNominal); if(band=="160m" and m_activeCall[deCall].bands.indexOf("a")>=0) {m_recentCall.remove(deCall); return;} @@ -3405,7 +3405,7 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt) if(band=="15m" and m_activeCall[deCall].bands.indexOf("e")>=0) {m_recentCall.remove(deCall); return;} if(band=="10m" and m_activeCall[deCall].bands.indexOf("f")>=0) {m_recentCall.remove(deCall); return;} if(band=="6m" and m_activeCall[deCall].bands.indexOf("g")>=0) {m_recentCall.remove(deCall); return;} - +*/ // Update the variable data for this deCall rc.dialFreq=m_freqNominal; rc.audioFreq=dt.frequencyOffset(); @@ -3424,7 +3424,7 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt) void MainWindow::ARRL_Digi_Display() { QMutableMapIterator icall(m_recentCall); - QString deCall,deGrid,bands; + QString deCall,deGrid; int age=0; int i=0; int maxAge=m_ActiveStationsWidget->maxAge(); @@ -3452,7 +3452,7 @@ void MainWindow::ARRL_Digi_Display() int az=m_activeCall[deCall].az; deGrid=m_activeCall[deCall].grid4; points=m_activeCall[deCall].points; - bands=m_activeCall[deCall].bands; +// bands=m_activeCall[deCall].bands; if(points>maxPoints) maxPoints=points; float x=float(age)/(maxAge+1); if(x>1.0) x=0; @@ -3460,7 +3460,8 @@ void MainWindow::ARRL_Digi_Display() QString t1; if(!bReady) t1 = t1.asprintf(" %3d %+2.2d %4d %1d %2d %4d",az,snr,freq,itx,age,points); if(bReady) t1 = t1.asprintf(" %3d %+2.2d %4d %1d %2d*%4d",az,snr,freq,itx,age,points); - t1 = (deCall + " ").left(6) + " " + m_activeCall[deCall].grid4 + t1 + " " + bands; +// t1 = (deCall + " ").left(6) + " " + m_activeCall[deCall].grid4 + t1 + " " + bands; + t1 = (deCall + " ").left(6) + " " + m_activeCall[deCall].grid4 + t1; list.append(t1); } }