Recompressing events doesn't need to recalculate summaries

sleepyhead/SleepLib/session.cpp

@@ -1,4 +1,4 @@
-/* SleepLib Session Implementation
+/* SleepLib Session Implementation
  * This stuff contains the base calculation smarts
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
@@ -137,10 +137,10 @@ bool Session::Destroy()
     QString summaryfile = s_machine->getSummariesPath() + base + ".000";
     QString eventfile = s_machine->getEventsPath() + base + ".001";
     if (!dir.remove(summaryfile)) {
-        qDebug() << "Could not delete" << summaryfile;
+       // qDebug() << "Could not delete" << summaryfile;
     }
     if (!dir.remove(eventfile)) {
-        qDebug() << "Could not delete" << eventfile;
+      //  qDebug() << "Could not delete" << eventfile;
     }
 
     return s_machine->unlinkSession(this); //!dir.exists(base + ".000") && !dir.exists(base + ".001");
@@ -714,7 +714,6 @@ bool Session::StoreEvents()
             }
         }
     }
-
     for (i = eventlist.begin(); i != i_end; i++) {
         ev_size=i.value().size();
 

sleepyhead/logger.cpp

@@ -45,9 +45,9 @@ void MyOutputHandler(QtMsgType type, const QMessageLogContext &context, const QS
     if (logger && logger->isRunning()) {
         logger->append(msg);
     }
-    //else {
+    else {
         fprintf(stderr, "%s\n", msg.toLocal8Bit().data());
-//    }
+    }
 
     if (type == QtFatalMsg) {
         abort();

sleepyhead/mainwindow.cpp

@@ -2209,6 +2209,10 @@ void MainWindow::on_filterBookmarksButton_clicked()
     }
 }
 
+void MainWindow::recompressEvents()
+{
+    QTimer::singleShot(0, this, SLOT(doRecompressEvents()));
+}
 void MainWindow::reprocessEvents(bool restart)
 {
     m_restartRequired = restart;
@@ -2245,12 +2249,11 @@ void MainWindow::MachineUnsupported(Machine * m)
     QMessageBox::information(this, STR_MessageBox_Error, QObject::tr("Sorry, your %1 %2 machine is not currently supported.").arg(m->brand()).arg(m->model()), QMessageBox::Ok);
 }
 
-void MainWindow::doReprocessEvents()
+void MainWindow::doRecompressEvents()
 {
     if (p_profile->countDays(MT_CPAP, p_profile->FirstDay(), p_profile->LastDay()) == 0) {
         return;
     }
-
     m_inRecalculation = true;
     QDate first = p_profile->FirstDay();
     QDate date = p_profile->LastDay();
@@ -2265,8 +2268,72 @@ void MainWindow::doReprocessEvents()
     int daycount = first.daysTo(date);
     int idx = 0;
 
+    qstatus->setText(tr("Re/Decompressing Session Event Data"));
+
+    if (qprogress) {
+        qprogress->setValue(0);
+        qprogress->setVisible(true);
+        qprogress->setMaximum(daycount);
+    }
+
+    bool isopen;
+
+    do {
+        day = p_profile->GetDay(date, MT_CPAP);
+
+        if (day) {
+            for (int i = 0; i < day->size(); i++) {
+                sess = (*day)[i];
+                isopen = sess->eventsLoaded();
+
+                // Load the events if they aren't loaded already
+                sess->OpenEvents();
+
+                sess->SetChanged(true);
+
+                sess->machine()->SaveSession(sess);
+
+                if (!isopen) {
+                    sess->TrashEvents();
+                }
+            }
+        }
+
+        date = date.addDays(-1);
+        qprogress->setValue(idx);
+        QApplication::processEvents();
+        idx++;
+    } while (date >= first);
+
+    qstatus->setText(tr(""));
+    qprogress->setVisible(false);
+    m_inRecalculation = false;
+
+    Notify(tr("Session re/decompression are now complete."), tr("Task Completed"));
+}
+void MainWindow::doReprocessEvents()
+{
+    if (p_profile->countDays(MT_CPAP, p_profile->FirstDay(), p_profile->LastDay()) == 0) {
+        return;
+    }
+
+    m_inRecalculation = true;
+    QDate first = p_profile->FirstDay();
+    QDate date = p_profile->LastDay();
+    Session *sess;
+    Day *day;
+    //FlowParser flowparser;
+
+    mainwin->Notify(tr("Performance will be degraded during these recalculations."),
+                    tr("Recompressing Session Data"));
+
+    // For each day in history
+    int daycount = first.daysTo(date);
+    int idx = 0;
+
     QList<Machine *> machines = p_profile->GetMachines(MT_CPAP);
 
+
     // Disabling multithreaded save as it appears it's causing problems
     bool cache_sessions = false; //p_profile->session->cacheSessions();
 

sleepyhead/mainwindow.h

@@ -134,6 +134,7 @@ class MainWindow : public QMainWindow
 
     //! \brief Sets up recalculation of all event summaries and flags
     void reprocessEvents(bool restart = false);
+    void recompressEvents();
 
 
     //! \brief Internal function to set Records Box html from statistics module
@@ -149,6 +150,7 @@ class MainWindow : public QMainWindow
   public slots:
     //! \brief Recalculate all event summaries and flags
     void doReprocessEvents();
+    void doRecompressEvents();
 
     void MachineUnsupported(Machine * m);
 

sleepyhead/preferencesdialog.cpp

@@ -659,6 +659,7 @@ PreferencesDialog::~PreferencesDialog()
 
 bool PreferencesDialog::Save()
 {
+    bool recompress_events = false;
     bool recalc_events = false;
     bool needs_restart = false;
 
@@ -719,9 +720,18 @@ bool PreferencesDialog::Save()
     }
 
     if (profile->session->compressSessionData() != ui->compressSessionData->isChecked()) {
-        recalc_events = true;
+        recompress_events = true;
     }
 
+    if (recompress_events) {
+        if (profile->countDays(MT_CPAP, profile->FirstDay(), profile->LastDay()) > 0) {
+            if (QMessageBox::question(this, tr("Data Processing Required"),
+                                      tr("A data re/decompression proceedure is required to apply these changes. This operation may take a couple of minutes to complete.\n\nAre you sure you want to make these changes?"),
+                                      QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
+                return false;
+            }
+        } else { recompress_events = false; }
+    }
     if (recalc_events) {
         if (profile->countDays(MT_CPAP, profile->FirstDay(), profile->LastDay()) > 0) {
             if (QMessageBox::question(this, tr("Data Reindex Required"),
@@ -895,7 +905,9 @@ bool PreferencesDialog::Save()
     PREF.Save();
     profile->Save();
 
-    if (recalc_events) {
+    if (recompress_events) {
+        mainwin->recompressEvents();
+    } else if (recalc_events) {
         // send a signal instead?
         mainwin->reprocessEvents(needs_restart);
     } else if (needs_restart) {