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

Show progress bar if recomputing rxchanges cache and looking at more than 180 days of data

Browse Source
This commit is contained in:
Seeker4 2019-07-25 06:27:02 -07:00
parent f635302058
commit 96ba683599
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
oscar/statistics.cpp
View File

@ -16,6 +16,7 @@
#include <QPrintDialog> #include <QPrintDialog>
#include <QPainter> #include <QPainter>
#include <QMainWindow> #include <QMainWindow>
#include <QProgressDialog>
#include "mainwindow.h" #include "mainwindow.h"
#include "statistics.h" #include "statistics.h"
@ -158,6 +159,7 @@ bool rxAHILessThan(const RXItem * rx1, const RXItem * rx2)
void Statistics::updateRXChanges() void Statistics::updateRXChanges()
{ {
// qDebug() << "updateRXChanges called";
rxitems.clear(); rxitems.clear();
// Read the cache from disk // Read the cache from disk
@ -173,6 +175,23 @@ 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();
@ -480,11 +499,25 @@ void Statistics::updateRXChanges()
rxitems.insert(date, rx); rxitems.insert(date, rx);
} }
// Update progress bar every percent change
if (showProgress) {
daysProcessed++;
int pctDone = (100 * daysProcessed) / numDays;
if (pctDone != lastPctDone) {
lastPctDone = pctDone;
progress->setValue(daysProcessed);
QCoreApplication::processEvents();
}
}
} }
// Store RX cache to disk // Store RX cache to disk
saveRXChanges(); saveRXChanges();
if (showProgress)
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;
ri_end = rxitems.end(); ri_end = rxitems.end();
@ -641,7 +674,7 @@ QString Statistics::generateHeader(bool onScreen)
html += "p,a,td,body { font-family: 'Helvetica'; }"; html += "p,a,td,body { font-family: 'Helvetica'; }";
// "p,a,td,body { font-size: 10px; }"; // "p,a,td,body { font-size: 10px; }";
} }
qDebug() << "generateHeader font" << html; // qDebug() << "generateHeader font" << html;
html += "table.curved {" // Borders not supported without webkit html += "table.curved {" // Borders not supported without webkit
// "border: 1px solid gray;" // "border: 1px solid gray;"
// "border-radius:10px;" // "border-radius:10px;"