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

Use new CProgressBar class instead of QProgressDialog

Browse Source
This commit is contained in:
Seeker4 2019-08-04 08:36:34 -07:00
parent 686d83d5ab
commit 5697ac53e6
1 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
oscar/statistics.cpp
View File

@ -16,11 +16,10 @@
#include <QPrintDialog> #include <QPrintDialog>
#include <QPainter> #include <QPainter>
#include <QMainWindow> #include <QMainWindow>
#include <QProgressDialog>
#include <QElapsedTimer>
#include "mainwindow.h" #include "mainwindow.h"
#include "statistics.h" #include "statistics.h"
#include "CProgressBar.h"
extern MainWindow *mainwin; extern MainWindow *mainwin;
@ -160,18 +159,10 @@ bool rxAHILessThan(const RXItem * rx1, const RXItem * rx2)
void Statistics::updateRXChanges() void Statistics::updateRXChanges()
{ {
// We may want a progress bar. Start time to see how long it is taking. // Set conditional progress bar.
QProgressDialog * progress = nullptr; CProgressBar * progress = new CProgressBar (QObject::tr("Updating Statistics cache"), mainwin, p_profile->daylist.count());
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";
// Clear loaded rx cache
rxitems.clear(); rxitems.clear();
// Read the cache from disk // Read the cache from disk
@ -192,6 +183,8 @@ void Statistics::updateRXChanges()
const QDate & date = it.key(); const QDate & date = it.key();
Day * day = it.value(); Day * day = it.value();
progress->add (1); // Increment progress bar
Machine * mach = day->machine(MT_CPAP); Machine * mach = day->machine(MT_CPAP);
if (mach == nullptr) if (mach == nullptr)
continue; continue;
@ -493,44 +486,10 @@ void Statistics::updateRXChanges()
// And insert into rx record into the rx cache // And insert into rx record into the rx cache
rxitems.insert(date, rx); rxitems.insert(date, rx);
} }
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;
if (pctDone != lastPctDone) {
lastPctDone = pctDone;
progress->setValue(daysProcessed);
QCoreApplication::processEvents();
}
}
} }
// 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)
progress->setValue(numDays);
// 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();
@ -556,8 +515,8 @@ void Statistics::updateRXChanges()
list[0]->highlight = 1; // best list[0]->highlight = 1; // best
} }
// update record box info.. // Close the progress bar
progress->close();
} }