diff --git a/widgets/AbstractLogWindow.cpp b/widgets/AbstractLogWindow.cpp index 656eff7f1..667573ce0 100644 --- a/widgets/AbstractLogWindow.cpp +++ b/widgets/AbstractLogWindow.cpp @@ -72,7 +72,7 @@ void AbstractLogWindow::impl::delete_QSOs () { // We must work with source model indexes because we don't want row // removes to invalidate model indexes we haven't yet processed. We - // achieve that by processing them in decending row order. + // achieve that by processing them in descending row order. for (auto& row_index : row_indexes) { row_index = model_.mapToSource (row_index); @@ -80,11 +80,12 @@ void AbstractLogWindow::impl::delete_QSOs () // reverse sort by row std::sort (row_indexes.begin (), row_indexes.end (), row_is_higher); + for (auto index : row_indexes) { - auto row = model_.mapFromSource (index).row (); - model_.removeRow (row); - self_->log_model_changed (); + auto row = model_.mapFromSource(index).row(); + model_.removeRow(row); + self_->log_model_changed(); } } } diff --git a/widgets/CabrilloLogWindow.cpp b/widgets/CabrilloLogWindow.cpp index 3315181a0..4a7611193 100644 --- a/widgets/CabrilloLogWindow.cpp +++ b/widgets/CabrilloLogWindow.cpp @@ -88,6 +88,7 @@ void CabrilloLogWindow::log_model_changed (int row) { m_->log_model_->select (); } + this->set_nQSO(m_->log_model_->rowCount()); } void CabrilloLogWindow::set_nQSO(int n) diff --git a/widgets/CabrilloLogWindow.ui b/widgets/CabrilloLogWindow.ui index 1b44d0652..1457d9564 100644 --- a/widgets/CabrilloLogWindow.ui +++ b/widgets/CabrilloLogWindow.ui @@ -28,13 +28,20 @@ - + 100 16777215 + + * { + font-family: Courier; + font-size: 10pt; + font-weight: bold; + } + 0 QSOs diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 8d0aecf42..3c87a92bd 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -2779,7 +2779,7 @@ void MainWindow::on_contest_log_action_triggered() m_contestLogWindow->showNormal (); m_contestLogWindow->raise (); m_contestLogWindow->activateWindow (); - m_contestLogWindow->set_nQSO(m_logBook.contest_log()->n_qso()); + //m_contestLogWindow->set_nQSO(m_logBook.contest_log()->n_qso()); } void MainWindow::on_actionColors_triggered() @@ -4678,7 +4678,7 @@ void MainWindow::guiUpdate() //Once per second (onesec) if(nsec != m_sec0) { // qDebug() << "AAA" << nsec; - if(m_contestLogWindow) m_contestLogWindow->set_nQSO(m_logBook.contest_log()->n_qso()); + //if(m_contestLogWindow) m_contestLogWindow->set_nQSO(m_logBook.contest_log()->n_qso()); if(m_mode=="FST4") chk_FST4_freq_range(); m_currentBand=m_config.bands()->find(m_freqNominal); @@ -6377,9 +6377,7 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call, m_xSent.clear (); m_xRcvd.clear (); - if(m_contestLogWindow) { - m_contestLogWindow->set_nQSO(m_logBook.contest_log()->n_qso()); - } + } void MainWindow::updateRate()