w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-28 23:28:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not display the "........" bands indicators.

Browse Source
This commit is contained in:
Joe Taylor 2022-03-22 13:27:24 -04:00
parent be2ce2a6c4
commit 190dca5501
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widgets/activeStations.cpp
View File

@ -21,7 +21,7 @@ ActiveStations::ActiveStations(QSettings * settings, QFont const& font, QWidget
ui->RecentStationsPlainTextEdit->setReadOnly (true); ui->RecentStationsPlainTextEdit->setReadOnly (true);
changeFont (font); changeFont (font);
read_settings (); 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())); connect(ui->RecentStationsPlainTextEdit, SIGNAL(selectionChanged()), this, SLOT(select()));
} }

13
widgets/mainwindow.cpp
View File

@ -3386,7 +3386,7 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt)
&nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,(FCL)6,(FCL)6); &nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,(FCL)6,(FCL)6);
int npts=int((500+nDkm)/500); int npts=int((500+nDkm)/500);
ac.grid4=deGrid; ac.grid4=deGrid;
ac.bands="......."; // ac.bands=".......";
ac.az=nAz; ac.az=nAz;
ac.points=npts; ac.points=npts;
m_activeCall[deCall]=ac; m_activeCall[deCall]=ac;
@ -3395,7 +3395,7 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt)
m_points=-1; m_points=-1;
if(m_activeCall.contains(deCall)) { if(m_activeCall.contains(deCall)) {
/*
// Don't display stations we already worked on this band. // Don't display stations we already worked on this band.
QString band=m_config.bands()->find(m_freqNominal); QString band=m_config.bands()->find(m_freqNominal);
if(band=="160m" and m_activeCall[deCall].bands.indexOf("a")>=0) {m_recentCall.remove(deCall); return;} 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=="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=="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;} if(band=="6m" and m_activeCall[deCall].bands.indexOf("g")>=0) {m_recentCall.remove(deCall); return;}
*/
// Update the variable data for this deCall // Update the variable data for this deCall
rc.dialFreq=m_freqNominal; rc.dialFreq=m_freqNominal;
rc.audioFreq=dt.frequencyOffset(); rc.audioFreq=dt.frequencyOffset();
@ -3424,7 +3424,7 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt)
void MainWindow::ARRL_Digi_Display() void MainWindow::ARRL_Digi_Display()
{ {
QMutableMapIterator<QString,RecentCall> icall(m_recentCall); QMutableMapIterator<QString,RecentCall> icall(m_recentCall);
QString deCall,deGrid,bands; QString deCall,deGrid;
int age=0; int age=0;
int i=0; int i=0;
int maxAge=m_ActiveStationsWidget->maxAge(); int maxAge=m_ActiveStationsWidget->maxAge();
@ -3452,7 +3452,7 @@ void MainWindow::ARRL_Digi_Display()
int az=m_activeCall[deCall].az; int az=m_activeCall[deCall].az;
deGrid=m_activeCall[deCall].grid4; deGrid=m_activeCall[deCall].grid4;
points=m_activeCall[deCall].points; points=m_activeCall[deCall].points;
bands=m_activeCall[deCall].bands; // bands=m_activeCall[deCall].bands;
if(points>maxPoints) maxPoints=points; if(points>maxPoints) maxPoints=points;
float x=float(age)/(maxAge+1); float x=float(age)/(maxAge+1);
if(x>1.0) x=0; if(x>1.0) x=0;
@ -3460,7 +3460,8 @@ void MainWindow::ARRL_Digi_Display()
QString t1; 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);
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); list.append(t1);
} }
} }