Make progress dialog more annoying on load

sleepyhead/SleepLib/machine.cpp

@@ -594,7 +594,7 @@ qint64 Machine::diskSpaceBackups()
     return dirSize(getBackupPath());
 }
 
-bool Machine::Load()
+bool Machine::Load(ProgressDialog *progress)
 {
     QString path = getDataPath();
 
@@ -605,19 +605,24 @@ bool Machine::Load()
         return false;
     }
 
-    ProgressDialog * popup = new ProgressDialog(mainwin);
-
     QPixmap image = getPixmap().scaled(64,64);
-    popup->setPixmap(image);
+    progress->setPixmap(image);
-    popup->setMessage(QObject::tr("Loading %1 data for %2...").arg(info.brand).arg(profile->user->userName()));
+    progress->setMessage(QObject::tr("Loading %1 data for %2...").arg(info.brand).arg(profile->user->userName()));
-    popup->open();
 
-    QProgressBar * saveQProgress = qprogress;
+    if (loader()) {
+        mainwin->connect(loader(), SIGNAL(updateMessage(QString)), progress, SLOT(setMessage(QString)));
+        mainwin->connect(loader(), SIGNAL(setProgressMax(int)),   progress, SLOT(setProgressMax(int)));
+        mainwin->connect(loader(), SIGNAL(setProgressValue(int)), progress, SLOT(setProgressValue(int)));
+    }
 
-    qprogress = popup->progress;
+    if (!LoadSummary(progress)) {
-
-    if (!LoadSummary(qprogress)) {
         // No XML index file, so assume upgrading, or it simply just got screwed up or deleted...
+        progress->setMessage(QObject::tr("Scanning Files"));
+        progress->setProgressValue(0);
+        QApplication::processEvents();
+
+
+
         QTime time;
         time.start();
         dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
@@ -636,11 +641,6 @@ bool Machine::Load()
         QStringList filelist = dir.entryList();
         int size = filelist.size();
 
-        if (qprogress) {
-            qprogress->setMinimum(0);
-            qprogress->setValue(0);
-            QApplication::processEvents();
-        }
 
         // Legacy crap.. Summary and Event stuff used to be in one big pile in the machine folder root
         for (auto & filename : filelist) {
@@ -653,11 +653,14 @@ bool Machine::Load()
         dir.setNameFilters(filters);
         filelist = dir.entryList();
         size = filelist.size();
+        progress->setMessage(QObject::tr("Migrating Summary File Location"));
+        progress->setProgressMax(size);
+        QApplication::processEvents();
         if (size > 0) {
             if (!dir.exists(eventpath)) dir.mkpath(eventpath);
             for (int i=0; i< size; i++) {
-                if ((i % 50) == 0) { // This is slow.. :-/
+                if ((i % 20) == 0) { // This is slow.. :-/
-                    if (qprogress) { qprogress->setValue((float(i) / float(size) * 100.0)); }
+                    progress->setProgressValue(i);
 
                     QApplication::processEvents();
                 }
@@ -677,12 +680,9 @@ bool Machine::Load()
         filelist = dir.entryList();
         size = filelist.size();
 
-        if (qprogress) {
+        progress->setMessage("Reading summary files");
-            qprogress->setMinimum(0);
+        progress->setProgressValue(0);
-            qprogress->setMaximum(size);
+        QApplication::processEvents();
-            qprogress->setValue(0);
-            QApplication::processEvents();
-        }
 
         QString sesstr;
         SessionID sessid;
@@ -690,9 +690,8 @@ bool Machine::Load()
 
         for (int i=0; i < size; i++) {
 
-            if ((i % 50) == 0) { // This is slow.. :-/
+            if ((i % 20) == 0) { // This is slow.. :-/
-                if (qprogress) { qprogress->setValue(i); }
+                progress->setProgressValue(i);
-
                 QApplication::processEvents();
             }
 
@@ -715,16 +714,18 @@ bool Machine::Load()
 
         SaveSummaryCache();
         qDebug() << "Loaded" << info.model << "data in" << time.elapsed() << "ms";
-        if (qprogress) { qprogress->setValue(size); }
+        progress->setProgressValue(size);
-    } else {
-        if (qprogress) { qprogress->setValue(100); }
     }
-    loadSessionInfo();
+    progress->setMessage("Loading Session Info");
     QApplication::processEvents();
-    popup->hide();
-    delete popup;
 
-    qprogress = saveQProgress;
+    loadSessionInfo();
+
+    if (loader()) {
+        mainwin->disconnect(loader(), SIGNAL(updateMessage(QString)), progress, SLOT(setMessage(QString)));
+        mainwin->disconnect(loader(), SIGNAL(setProgressMax(int)),   progress, SLOT(setProgressMax(int)));
+        mainwin->disconnect(loader(), SIGNAL(setProgressValue(int)), progress, SLOT(setProgressValue(int)));
+    }
 
     return true;
 }
@@ -943,7 +944,7 @@ void LoadTask::run()
     sess->LoadSummary();
 }
 
-bool Machine::LoadSummary(QProgressBar * progress)
+bool Machine::LoadSummary(ProgressDialog * progress)
 {
     QTime time;
     time.start();
@@ -954,6 +955,8 @@ bool Machine::LoadSummary(QProgressBar * progress)
     QDomDocument doc;
     QFile file(filename);
     qDebug() << "Opening " << filename;
+    progress->setMessage(QObject::tr("Opening Summaries.xml.gz"));
+    QApplication::processEvents();
 
     if (!file.open(QIODevice::ReadOnly)) {
         qWarning() << "Could not open" << filename;
@@ -997,7 +1000,12 @@ bool Machine::LoadSummary(QProgressBar * progress)
 
     QMap<qint64, Session *>  sess_order;
 
+    progress->setProgressMax(size);
     for (int s=0; s < size; ++s) {
+        if ((s % 20) == 0) {
+            progress->setProgressValue(s);
+            QApplication::processEvents();
+        }
         node = sessionlist.at(s);
         QDomElement e = node.toElement();
         SessionID sessid = e.attribute("id", "0").toLong(&s_ok);
@@ -1051,7 +1059,10 @@ bool Machine::LoadSummary(QProgressBar * progress)
     int cnt = 0;
     bool loadSummaries = profile->session->preloadSummaries();
 
-    progress->setMaximum(sess_order.size());
+    progress->setMessage(QObject::tr("Queueing Open Tasks"));
+    QApplication::processEvents();
+
+  //  progress->setMaximum(sess_order.size());
     for (it = sess_order.begin(); it != it_end; ++it, ++cnt) {
         //
 /*        if ((cnt % 100) == 0) {
@@ -1063,12 +1074,24 @@ bool Machine::LoadSummary(QProgressBar * progress)
             delete sess;
         } else {
             if (loadSummaries) {
-                queTask(new LoadTask(sess,this));
+                if (loader()) {
+                    loader()->queTask(new LoadTask(sess,this));
+                } else {
+                    // no progress bar
+                    queTask(new LoadTask(sess,this));
+                }
             }
         }
     }
-    runTasks();
+    progress->setMessage(QObject::tr("Loading Sessions"));
-    progress->setValue(sess_order.size());
+    QApplication::processEvents();
+
+    if (loader()) {
+        loader()->runTasks();
+    } else {
+        runTasks();
+    }
+    progress->setProgressValue(sess_order.size());
     QApplication::processEvents();
 
     qDebug() << "Loaded" << info.series << info.model << "data in" << time.elapsed() << "ms";

sleepyhead/SleepLib/machine.h

@@ -25,6 +25,7 @@
 #include <list>
 
 #include "SleepLib/preferences.h"
+#include "SleepLib/progressdialog.h"
 #include "SleepLib/machine_common.h"
 #include "SleepLib/event.h"
 #include "SleepLib/session.h"
@@ -87,9 +88,9 @@ class Machine
     virtual ~Machine();
 
     //! \brief Load all Machine summary data
-    bool Load();
+    bool Load(ProgressDialog *progress);
 
-    bool LoadSummary(QProgressBar * progress);
+    bool LoadSummary(ProgressDialog *progress);
 
     //! \brief Save all Sessions where changed bit is set.
     bool Save();

sleepyhead/SleepLib/profiles.cpp

@@ -591,7 +591,7 @@ void Profile::UnloadMachineData()
     }
     removeLock();
 }
-void Profile::LoadMachineData()
+void Profile::LoadMachineData(ProgressDialog *progress)
 {
     addLock();
 
@@ -603,16 +603,17 @@ void Profile::LoadMachineData()
                 DataFormatError(mach);
             } else {
                 try {
-                    mach->Load();
+                    mach->Load(progress);
                 } catch (OldDBVersion& e) {
                     Q_UNUSED(e)
                     DataFormatError(mach);
                 }
             }
         } else {
-            mach->Load();
+            mach->Load(progress);
         }
     }
+    progress->setMessage("Loading Channel Information");
     loadChannels();
 }
 

sleepyhead/SleepLib/profiles.h

@@ -14,6 +14,7 @@
 #include <QThread>
 
 #include "version.h"
+#include "progressdialog.h"
 #include "machine.h"
 #include "machine_loader.h"
 #include "preferences.h"
@@ -74,7 +75,7 @@ class Profile : public Preferences
     void DelMachine(Machine *m);
 
     //! \brief Loads all machine (summary) data belonging to this profile
-    void LoadMachineData();
+    void LoadMachineData(ProgressDialog *progress);
 
     //! \brief Unloads all machine (summary) data for this profile to free up memory;
     void UnloadMachineData();

sleepyhead/SleepLib/progressdialog.cpp

@@ -11,7 +11,7 @@
 ProgressDialog::ProgressDialog(QWidget * parent):
     QDialog(parent, Qt::Tool | Qt::FramelessWindowHint)
 {
-    waitmsg = new QLabel(QObject::tr("PLease Wait..."));
+    statusMsg = new QLabel(QObject::tr("Please Wait..."));
     hlayout = new QHBoxLayout;
 
     imglabel = new QLabel(this);
@@ -21,10 +21,12 @@ ProgressDialog::ProgressDialog(QWidget * parent):
     this->setLayout(vlayout);
     vlayout->addLayout(hlayout);
     hlayout->addWidget(imglabel);
-    hlayout->addWidget(waitmsg,1,Qt::AlignCenter);
+    hlayout->addWidget(statusMsg,1,Qt::AlignCenter);
     vlayout->addWidget(progress,1);
     progress->setMaximum(100);
     abortButton = nullptr;
+    setWindowModality(Qt::ApplicationModal);
+
 }
 
 ProgressDialog::~ProgressDialog()
@@ -46,7 +48,7 @@ void ProgressDialog::setProgressValue(int val)
 
 
 void ProgressDialog::setMessage(QString msg) {
-    waitmsg->setText(msg); update();
+    statusMsg->setText(msg);
 }
 
 void ProgressDialog::addAbortButton()

sleepyhead/SleepLib/progressdialog.h

@@ -36,7 +36,7 @@ public slots:
 signals:
     void abortClicked();
 protected:
-    QLabel * waitmsg;
+    QLabel * statusMsg;
     QHBoxLayout *hlayout;
     QLabel * imglabel;
     QVBoxLayout * vlayout;

sleepyhead/mainwindow.cpp

@@ -240,7 +240,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->mainsplitter->setStretchFactor(0,1);
     ui->mainsplitter->setStretchFactor(1,0);
 
-    QTimer::singleShot(0, this, SLOT(Startup()));
+    QTimer::singleShot(50, this, SLOT(Startup()));
 
     ui->backButton->setEnabled(ui->helpBrowser->backwardHistoryCount()>0);
     ui->forwardButton->setEnabled(ui->helpBrowser->forwardHistoryCount()>0);
@@ -432,6 +432,11 @@ bool MainWindow::OpenProfile(QString profileName)
 
     p_profile = prof;
 
+    ProgressDialog * progress = new ProgressDialog(this);
+
+    progress->setMessage(QObject::tr("Loading profile \"%1\"...").arg(profileName));
+    progress->open();
+
 #ifdef LOCK_RESMED_SESSIONS
     QList<Machine *> machines = p_profile->GetMachines(MT_CPAP);
     for (QList<Machine *>::iterator it = machines.begin(); it != machines.end(); ++it) {
@@ -469,7 +474,14 @@ bool MainWindow::OpenProfile(QString profileName)
         connect(loaders.at(i), SIGNAL(machineUnsupported(Machine*)), this, SLOT(MachineUnsupported(Machine*)));
     }
 
-    p_profile->LoadMachineData();
+    p_profile->LoadMachineData(progress);
+    progress->setMessage(tr("Setting up profile \"%1\"").arg(profileName));
+
+    // Show the sheep?
+//    QPixmap sheep=QPixmap(":/docs/sheep.png").scaled(64,64);
+//    progress->setPixmap(sheep);
+
+    QApplication::processEvents();
 
     ui->statStartDate->setDate(p_profile->FirstDay());
     ui->statEndDate->setDate(p_profile->LastDay());
@@ -488,6 +500,7 @@ bool MainWindow::OpenProfile(QString profileName)
 
     if (overview) {
         qCritical() << "OpenProfile called with active Overview object!";
+
         return false;
     }
     overview = new Overview(ui->tabWidget, daily->graphView());
@@ -508,6 +521,10 @@ bool MainWindow::OpenProfile(QString profileName)
     ui->statisticsButton->setDisabled(false);
     ui->importButton->setDisabled(false);
 
+    progress->close();
+    delete progress;
+
+
     //qprogress->hide();
     //qstatus->setText("");
     return true;