chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed jumping of band activity and call activity tables on update

Browse Source
This commit is contained in:
Jordan Sherer 2018-08-15 23:24:16 -04:00
parent 9815c4dde9
commit 5fad5497d2
1 changed files with 163 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mainwindow.cpp
View File

@ -1275,15 +1275,18 @@ void MainWindow::not_GA_warning_message ()
"and carry a responsiblity to report any problems to:\n" "and carry a responsiblity to report any problems to:\n"
"Jordan Sherer (KN4CRD) kn4crd@gmail.com\n\n").arg(QApplication::applicationName()).arg(eol.toString())); "Jordan Sherer (KN4CRD) kn4crd@gmail.com\n\n").arg(QApplication::applicationName()).arg(eol.toString()));
#if 0
for(int i = 0; i < 13; i++){
CallDetail cd; CallDetail cd;
cd.call = "KN4CRD"; cd.call = QString("KN%1CRD").arg(i);
cd.freq = 1200; cd.freq = 1200;
cd.bits = Varicode::FT8CallLast; cd.bits = Varicode::FT8CallLast;
cd.utcTimestamp = QDateTime::currentDateTimeUtc(); cd.utcTimestamp = QDateTime::currentDateTimeUtc();
logCallActivity(cd, false); logCallActivity(cd, false);
m_rxDirty = true; m_rxDirty = true;
} }
#endif
}
void MainWindow::initialize_fonts () void MainWindow::initialize_fonts ()
{ {
@ -8965,12 +8968,18 @@ void MainWindow::displayBandActivity() {
selectedOffset = selectedItems.first()->text().toInt(); selectedOffset = selectedItems.first()->text().toInt();
} }
ui->tableWidgetRXAll->setUpdatesEnabled(false);
{
// Scroll Position
auto currentScrollPos = ui->tableWidgetRXAll->verticalScrollBar()->value();
// Clear the table // Clear the table
clearTableWidget(ui->tableWidgetRXAll); clearTableWidget(ui->tableWidgetRXAll);
// Sort directed & recent messages first // Sort directed & recent messages first
QList < int > keys = m_bandActivity.keys(); QList < int > keys = m_bandActivity.keys();
qSort(keys.begin(), keys.end(), [this](const int left, int right) { qSort(keys.begin(), keys.end(), [this](const int left, int right) {
#if 0
if (m_rxDirectedCache.contains(left / 10 * 10)) { if (m_rxDirectedCache.contains(left / 10 * 10)) {
return true; return true;
} }
@ -8983,6 +8992,7 @@ void MainWindow::displayBandActivity() {
if (m_rxRecentCache.contains(right / 10 * 10)) { if (m_rxRecentCache.contains(right / 10 * 10)) {
return false; return false;
} }
#endif
return left < right; return left < right;
}); });
@ -9059,7 +9069,7 @@ void MainWindow::displayBandActivity() {
textItem->setBackground(QBrush(m_config.color_CQ())); textItem->setBackground(QBrush(m_config.color_CQ()));
} }
if (m_rxDirectedCache.contains(offset / 10 * 10)) { if (isDirectedOffset(offset)) {
offsetItem->setBackground(QBrush(m_config.color_MyCall())); offsetItem->setBackground(QBrush(m_config.color_MyCall()));
ageItem->setBackground(QBrush(m_config.color_MyCall())); ageItem->setBackground(QBrush(m_config.color_MyCall()));
snrItem->setBackground(QBrush(m_config.color_MyCall())); snrItem->setBackground(QBrush(m_config.color_MyCall()));
@ -9078,6 +9088,11 @@ void MainWindow::displayBandActivity() {
ui->tableWidgetRXAll->resizeColumnToContents(0); ui->tableWidgetRXAll->resizeColumnToContents(0);
ui->tableWidgetRXAll->resizeColumnToContents(1); ui->tableWidgetRXAll->resizeColumnToContents(1);
ui->tableWidgetRXAll->resizeColumnToContents(2); ui->tableWidgetRXAll->resizeColumnToContents(2);
// Reset the scroll position
ui->tableWidgetRXAll->verticalScrollBar()->setValue(currentScrollPos);
}
ui->tableWidgetRXAll->setUpdatesEnabled(true);
} }
void MainWindow::displayCallActivity() { void MainWindow::displayCallActivity() {
@ -9086,6 +9101,10 @@ void MainWindow::displayCallActivity() {
// Selected callsign // Selected callsign
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
ui->tableWidgetCalls->setUpdatesEnabled(false);
{
auto currentScrollPos = ui->tableWidgetCalls->verticalScrollBar()->value();
// Clear the table // Clear the table
clearTableWidget(ui->tableWidgetCalls); clearTableWidget(ui->tableWidgetCalls);
@ -9134,6 +9153,11 @@ void MainWindow::displayCallActivity() {
ui->tableWidgetCalls->resizeColumnToContents(1); ui->tableWidgetCalls->resizeColumnToContents(1);
ui->tableWidgetCalls->resizeColumnToContents(2); ui->tableWidgetCalls->resizeColumnToContents(2);
ui->tableWidgetCalls->resizeColumnToContents(3); ui->tableWidgetCalls->resizeColumnToContents(3);
// Reset the scroll position
ui->tableWidgetCalls->verticalScrollBar()->setValue(currentScrollPos);
}
ui->tableWidgetCalls->setUpdatesEnabled(true);
} }
void MainWindow::postWSPRDecode (bool is_new, QStringList parts) void MainWindow::postWSPRDecode (bool is_new, QStringList parts)