diff --git a/widgets/activeStations.cpp b/widgets/activeStations.cpp index e286ec0a5..2fb1091fe 100644 --- a/widgets/activeStations.cpp +++ b/widgets/activeStations.cpp @@ -18,9 +18,11 @@ ActiveStations::ActiveStations(QSettings * settings, QFont const& font, QWidget ui->setupUi(this); setWindowTitle (QApplication::applicationName () + " - " + tr ("Active Stations")); ui->ActiveStationsPlainTextEdit->setReadOnly (true); + ui->RecentStationsPlainTextEdit->setReadOnly (true); changeFont (font); read_settings (); ui->header_label->setText("Pts Call Grid Az S/N Dial Freq"); + ui->header_label2->setText(" Call Grid Age Points"); } ActiveStations::~ActiveStations() @@ -33,10 +35,14 @@ void ActiveStations::changeFont (QFont const& font) ui->header_label->setStyleSheet (font_as_stylesheet (font)); ui->ActiveStationsPlainTextEdit->setStyleSheet (font_as_stylesheet (font)); setContentFont (font); + + ui->header_label2->setStyleSheet (font_as_stylesheet (font)); + ui->RecentStationsPlainTextEdit->setStyleSheet (font_as_stylesheet (font)); +// setContentFont (font); + updateGeometry (); } - void ActiveStations::setContentFont(QFont const& font) { ui->ActiveStationsPlainTextEdit->setFont (font); diff --git a/widgets/activeStations.ui b/widgets/activeStations.ui index d5210ab89..0c9eb8640 100644 --- a/widgets/activeStations.ui +++ b/widgets/activeStations.ui @@ -16,40 +16,7 @@ - - - - - 0 - 2 - - - - QPlainTextEdit::NoWrap - - - - - - - - 0 - 1 - - - - - - - - Points Call Grid AZ SNR Freq Band - - - 3 - - - - + @@ -119,6 +86,46 @@ + + + + + 0 + 2 + + + + QPlainTextEdit::NoWrap + + + + + + + + 0 + 1 + + + + + + + + Points Call Grid AZ SNR Freq Band + + + 3 + + + + + + + Call Grid Age Points + + + diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 8a1cb8417..fb1cc6f01 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3406,14 +3406,6 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt) if(bCQ or deGrid=="RR73" or deGrid=="73") rc.ready2call=true; rc.decodeTime=m_latestDecodeTime; m_recentCall[deCall]=rc; - /* - ac=m_activeCall[deCall]; - if(rc.ready2call != bCQ) { - qDebug() << "aa" << deCall << ac.grid4 << ac.az - << rc.dialFreq/1000000.0 << rc.audioFreq - << rc.snr << rc.decodeTime << ac.points << rc.ready2call << bCQ; - } - */ } } @@ -3443,7 +3435,7 @@ void MainWindow::ARRL_Digi_Display() if(points>maxPoints) maxPoints=points; pts[i-1]=points - float(age)/(maxAge+1); QString t1; - t1 = t1.asprintf(" %2d %2d",age,points); + t1 = t1.asprintf(" %2d %5d",age,points); t1 = (deCall + " ").left(6) + " " + m_activeCall[deCall].grid4 + t1; list.append(t1); } @@ -3456,7 +3448,6 @@ void MainWindow::ARRL_Digi_Display() t += (list[k] + "\n"); } if(m_ActiveStationsWidget!=NULL) m_ActiveStationsWidget->displayRecentStations(t); - qDebug() << "dd" << maxRecent << maxAge; } void MainWindow::readFromStdout() //readFromStdout