Added Ignore Older Sessions preference, plus some purge fixes

sleepyhead/Graphs/gSummaryChart.cpp

@@ -33,9 +33,9 @@ SummaryChart::SummaryChart(QString label, GraphType type)
 SummaryChart::~SummaryChart()
 {
 }
-void SummaryChart::SetDay(Day *nullday)
+void SummaryChart::SetDay(Day * nullday)
 {
-    Day *day = nullday;
+    Day *day = nullptr;
     Layer::SetDay(day);
 
     m_values.clear();

sleepyhead/Graphs/layer.cpp

@@ -61,8 +61,8 @@ Layer::~Layer()
 
 void Layer::SetDay(Day *d)
 {
+    m_day = d;
     if (d) {
-        m_day = d;
         m_minx = d->first(m_code);
         m_maxx = d->last(m_code);
         m_miny = d->Min(m_code);

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -1547,6 +1547,7 @@ bool PRS1Loader::OpenFile(Machine *mach, QString filename)
 
     pos = 0;
     bool wasfaulty = false, faulty = false;
+    qint64 ignorebefore = PROFILE.session->ignoreOlderSessionsDate().toTime_t();
 
     for (chunk = 0; pos < filesize; ++chunk, pos += size) {
         header = &m_buffer[pos];
@@ -1570,6 +1571,11 @@ bool PRS1Loader::OpenFile(Machine *mach, QString filename)
         sequence = (header[10] << 24) | (header[9] << 16) | (header[8] << 8) | header[7];
         timestamp = (header[14] << 24) | (header[13] << 16) | (header[12] << 8) | header[11];
 
+        if (timestamp < ignorebefore) {
+            // Don't bother with this block
+            continue;
+        }
+
         qDebug() << "family: " << family << " familyversion: " << familyVersion;
 
         if (ext == 5) {

sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp

@@ -1203,7 +1203,9 @@ int ResmedLoader::Open(QString &path, Profile *profile)
             // Ignore all the rest of the sumary data, because there is enough available to calculate it with higher accuracy.
 
             if (sess->length() > 0) {
-                m->AddSession(sess, profile);
+                if (m->AddSession(sess, profile).isNull()) {
+                    continue;
+                }
             } else {
                 // Hmm.. this means a ton of these could slow down import.
                 // I could instead set these to disabled by default, or implement a dodgy session marker
@@ -1241,11 +1243,16 @@ int ResmedLoader::Open(QString &path, Profile *profile)
 
     size = strsess.size();
     cnt=0;
+    quint32 ignoreolder = PROFILE.session->ignoreOlderSessionsDate().toTime_t();
+
     // Look for the nearest matching str record
     for (it = strsess.begin(); it != end; ++it) {
         STRRecord &R = *it;
-        Q_ASSERT(R.sessionid == 0);
+
-        //if (R.sessionid > 0) continue;
+        if (R.maskon < ignoreolder) continue;
+
+        //Q_ASSERT(R.sessionid == 0);
+        if (R.sessionid > 0) continue;
 
 
         if ((++cnt % 10) == 0) {

sleepyhead/SleepLib/machine.cpp

@@ -109,6 +109,15 @@ QDate Machine::AddSession(Session *s, Profile *p)
         return QDate();
     }
 
+    if (profile->session->ignoreOlderSessions()) {
+        qint64 ignorebefore = profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch();
+        if (s->last() < ignorebefore) {
+            skipped_sessions++;
+            delete s;
+            return QDate();
+        }
+    }
+
     if (s->session() > highest_sessionid) {
         highest_sessionid = s->session();
     }
@@ -165,7 +174,7 @@ QDate Machine::AddSession(Session *s, Profile *p)
     }
 
     if (session_length < ignore_sessions) {
-        //if (!closest_session || (closest_session>=60))
+        // keep the session to save importing it again, but don't add it to the day record this time
         return QDate();
     }
 

sleepyhead/SleepLib/machine.h

@@ -143,6 +143,9 @@ class Machine
     QMutex savelistMutex;
     QSemaphore *savelistSem;
 
+    void clearSkipped() { skipped_sessions = 0; }
+    int skippedSessions() { return skipped_sessions; }
+
   protected:
     QDate firstday, lastday;
     SessionID highest_sessionid;
@@ -153,6 +156,8 @@ class Machine
     Profile *profile;
     bool changed;
     bool firstsession;
+
+    int skipped_sessions;
 };
 
 

sleepyhead/SleepLib/profiles.h

@@ -240,6 +240,8 @@ const QString STR_IS_Multithreading = "EnableMultithreading";
 const QString STR_IS_BackupCardData = "BackupCardData";
 const QString STR_IS_CompressBackupData = "CompressBackupData";
 const QString STR_IS_CompressSessionData = "CompressSessionData";
+const QString STR_IS_IgnoreOlderSessions = "IgnoreOlderSessions";
+const QString STR_IS_IgnoreOlderSessionsDate = "IgnoreOlderSessionsDate";
 
 // AppearanceSettings Strings
 const QString STR_AS_GraphHeight = "GraphHeight";
@@ -542,6 +544,8 @@ class SessionSettings : public ProfileSettings
         initPref(STR_IS_BackupCardData, true);
         initPref(STR_IS_CompressBackupData, false);
         initPref(STR_IS_CompressSessionData, false);
+        initPref(STR_IS_IgnoreOlderSessions, false);
+        initPref(STR_IS_IgnoreOlderSessionsDate, QDateTime(QDate::currentDate().addYears(-1), daySplitTime()) );
     }
 
     QTime daySplitTime() const { return getPref(STR_IS_DaySplitTime).toTime(); }
@@ -552,6 +556,8 @@ class SessionSettings : public ProfileSettings
     bool compressSessionData() const { return getPref(STR_IS_CompressSessionData).toBool(); }
     bool compressBackupData() const { return getPref(STR_IS_CompressBackupData).toBool(); }
     bool backupCardData() const { return getPref(STR_IS_BackupCardData).toBool(); }
+    bool ignoreOlderSessions() const { return getPref(STR_IS_IgnoreOlderSessions).toBool(); }
+    QDateTime ignoreOlderSessionsDate() const { return getPref(STR_IS_IgnoreOlderSessionsDate).toDateTime(); }
 
     void setDaySplitTime(QTime time) { setPref(STR_IS_DaySplitTime, time); }
     void setCacheSessions(bool c) { setPref(STR_IS_CacheSessions, c); }
@@ -561,6 +567,8 @@ class SessionSettings : public ProfileSettings
     void setBackupCardData(bool enabled) { setPref(STR_IS_BackupCardData, enabled); }
     void setCompressBackupData(bool enabled) { setPref(STR_IS_CompressBackupData, enabled); }
     void setCompressSessionData(bool enabled) { setPref(STR_IS_CompressSessionData, enabled); }
+    void setIgnoreOlderSessions(bool enabled) { setPref(STR_IS_IgnoreOlderSessions, enabled); }
+    void setIgnoreOlderSessionsDate(QDate date) { setPref(STR_IS_IgnoreOlderSessionsDate, QDateTime(date, daySplitTime())); }
 };
 
 /*! \class AppearanceSettings

sleepyhead/daily.cpp

@@ -534,6 +534,8 @@ void Daily::Link_clicked(const QUrl &url)
 
 void Daily::ReloadGraphs()
 {
+    GraphView->setDay(nullptr);
+
     ui->splitter->setVisible(true);
     QDate d;
 
@@ -547,9 +549,12 @@ void Daily::ReloadGraphs()
     }
     on_calendar_currentPageChanged(d.year(),d.month());
     // this fires a signal which unloads the old and loads the new
+    ui->calendar->blockSignals(true);
     ui->calendar->setSelectedDate(d);
-    //Load(d);
+    ui->calendar->blockSignals(false);
+    Load(d);
 }
+
 void Daily::on_calendar_currentPageChanged(int year, int month)
 {
     QDate d(year,month,1);
@@ -560,6 +565,7 @@ void Daily::on_calendar_currentPageChanged(int year, int month)
         this->UpdateCalendarDay(d);
     }
 }
+
 void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
 {
     tree->clear();

sleepyhead/mainwindow.cpp

@@ -1755,19 +1755,21 @@ void MainWindow::purgeMachine(Machine * mach)
                              tr("Not all session data could be removed, you have to delete the following folder manually.")
                              +"\n\n"+
                              QDir::toNativeSeparators(PROFILE.Get(mach->properties[STR_PROP_Path])), QMessageBox::Ok, QMessageBox::Ok);
-        if (overview) { overview->ReloadGraphs(); }
+        if (overview) overview->ReloadGraphs();
+
         if (daily) {
             daily->clearLastDay(); // otherwise Daily will crash
-            daily->LoadDate(daily->getDate());
+            daily->ReloadGraphs();
         }
         GenerateStatistics();
         return;
     }
 
-    if (overview) { overview->ReloadGraphs(); }
+    if (overview) overview->ReloadGraphs();
+
     if (daily) {
         daily->clearLastDay(); // otherwise Daily will crash
-        daily->LoadDate(daily->getDate());
+        daily->ReloadGraphs();
     }
     GenerateStatistics();
     QApplication::processEvents();
@@ -1783,9 +1785,10 @@ void MainWindow::purgeMachine(Machine * mach)
         delete mach;
     } else {
         importCPAP(PROFILE.Get(mach->properties[STR_PROP_BackupPath]),tr("Please wait, importing..."));
-        if (overview) { overview->ReloadGraphs(); }
+        if (overview) overview->ReloadGraphs();
         if (daily) {
-            daily->LoadDate(daily->getDate());
+            daily->clearLastDay(); // otherwise Daily will crash
+            daily->ReloadGraphs();
         }
     }
     GenerateStatistics();

sleepyhead/preferencesdialog.cpp

@@ -209,6 +209,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     ui->compressSDBackups->setEnabled(bcd);
     ui->compressSDBackups->setChecked(profile->session->compressBackupData());
     ui->compressSessionData->setChecked(profile->session->compressSessionData());
+    ui->ignoreOlderSessionsCheck->setChecked(profile->session->ignoreOlderSessions());
+    ui->ignoreOlderSessionsDate->setDate(profile->session->ignoreOlderSessionsDate().date());
 
     ui->graphHeight->setValue(profile->appearance->graphHeight());
 
@@ -426,6 +428,8 @@ bool PreferencesDialog::Save()
     profile->session->setCombineCloseSessions(ui->combineSlider->value());
     profile->session->setIgnoreShortSessions(ui->IgnoreSlider->value());
     profile->session->setDaySplitTime(ui->timeEdit->time());
+    profile->session->setIgnoreOlderSessions(ui->ignoreOlderSessionsCheck->isChecked());
+    profile->session->setIgnoreOlderSessionsDate(ui->ignoreOlderSessionsDate->date());
 
     profile->cpap->setClockDrift(ui->clockDrift->value());
 

sleepyhead/preferencesdialog.ui

@@ -301,6 +301,75 @@ p, li { white-space: pre-wrap; }
             </item>
            </layout>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_18">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QCheckBox" name="ignoreOlderSessionsCheck">
+              <property name="text">
+               <string>Do not import sessions older than:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QDateEdit" name="ignoreOlderSessionsDate">
+              <property name="toolTip">
+               <string>Sessions older than this date will not be imported</string>
+              </property>
+              <property name="wrapping">
+               <bool>true</bool>
+              </property>
+              <property name="frame">
+               <bool>true</bool>
+              </property>
+              <property name="maximumDate">
+               <date>
+                <year>2099</year>
+                <month>12</month>
+                <day>31</day>
+               </date>
+              </property>
+              <property name="minimumDate">
+               <date>
+                <year>1970</year>
+                <month>1</month>
+                <day>2</day>
+               </date>
+              </property>
+              <property name="currentSection">
+               <enum>QDateTimeEdit::DaySection</enum>
+              </property>
+              <property name="displayFormat">
+               <string>dd MMMM yyyy</string>
+              </property>
+              <property name="calendarPopup">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_6">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>