chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve RXChanges progress bar so it displays only if estimated time to completion is more than 4 seconds

Browse Source
This commit is contained in:
Seeker4 2019-07-28 08:18:59 -07:00
parent fa875ed5ca
commit eb756fd2c8
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
oscar/statistics.cpp
View File

@ -17,6 +17,7 @@
#include <QPainter> #include <QPainter>
#include <QMainWindow> #include <QMainWindow>
#include <QProgressDialog> #include <QProgressDialog>
#include <QElapsedTimer>
#include "mainwindow.h" #include "mainwindow.h"
#include "statistics.h" #include "statistics.h"
@ -159,7 +160,18 @@ bool rxAHILessThan(const RXItem * rx1, const RXItem * rx2)
void Statistics::updateRXChanges() void Statistics::updateRXChanges()
{ {
// qDebug() << "updateRXChanges called"; // We may want a progress bar. Start time to see how long it is taking.
QProgressDialog * progress = nullptr;
int lastPctDone = 0;
bool showProgress = false;
QElapsedTimer timer;
timer.start();
int numDays = p_profile->daylist.count();
int daysProcessed = 0;
int timerLimit = 2000; // If it takes 2 seconds for less than half the work, we will start a progress bar
bool timeChecked = false;
qDebug() << "UpdateRXChanges called for" << numDays << "days";
rxitems.clear(); rxitems.clear();
// Read the cache from disk // Read the cache from disk
@ -175,23 +187,6 @@ void Statistics::updateRXChanges()
quint64 tmp; quint64 tmp;
int numDays = p_profile->daylist.count();
int daysProcessed = 0;
int lastPctDone = 0;
bool showProgress = (numDays > 180); // Show progress dialog if more than about 6 months of data
QProgressDialog * progress = nullptr;
if (showProgress) { // arbitrary guess about when we should bother with a progress dialog
progress = new QProgressDialog(QObject::tr("Updating Statistics cache"),
QString(), 0, numDays, 0,
Qt::WindowSystemMenuHint | Qt::WindowTitleHint);
progress->setValue(0);
progress->setMinimumWidth(250);
progress->show();
// qDebug() << "Updating statistics rx cache dialog shown";
}
// Scan through each daylist in ascending date order // Scan through each daylist in ascending date order
for (it = p_profile->daylist.begin(); it != it_end; ++it) { for (it = p_profile->daylist.begin(); it != it_end; ++it) {
const QDate & date = it.key(); const QDate & date = it.key();
@ -499,9 +494,28 @@ void Statistics::updateRXChanges()
rxitems.insert(date, rx); rxitems.insert(date, rx);
} }
// Update progress bar every percent change
if (showProgress) {
daysProcessed++; daysProcessed++;
// See if it is time to show a progress bar: we don't have a progress bar, we haven't checked the timer yet
if (!progress && !timeChecked && (timer.elapsed() > timerLimit)) {
timeChecked = true; // Flag to prevent future calls to timer
{
qDebug() << "updateRXChanges starting progress bar with" << daysProcessed << "days processed of" << numDays << "total";
progress = new QProgressDialog(QObject::tr("Updating Statistics cache"),
QString(), 0, numDays, 0,
Qt::WindowSystemMenuHint | Qt::WindowTitleHint);
progress->setValue(0);
progress->setMinimumWidth(250);
progress->show();
numDays -= daysProcessed; // numDays now is number of days to go
daysProcessed = 1; // None processed yet for remaining days
QCoreApplication::processEvents();
showProgress = true;
}
}
// Update progress bar if one is displayed
if (showProgress) {
int pctDone = (100 * daysProcessed) / numDays; int pctDone = (100 * daysProcessed) / numDays;
if (pctDone != lastPctDone) { if (pctDone != lastPctDone) {
lastPctDone = pctDone; lastPctDone = pctDone;
@ -514,9 +528,8 @@ void Statistics::updateRXChanges()
// Store RX cache to disk // Store RX cache to disk
saveRXChanges(); saveRXChanges();
if (showProgress) // Force progress bar to stop (if we have a progress bar)
if (showProgress) progress->setValue(numDays);
progress->setValue(numDays); // Force progress bar to stop
// Now do the setup for the best worst highlighting // Now do the setup for the best worst highlighting
QList<RXItem *> list; QList<RXItem *> list;