Change SummaryOnly from a setting to a session variable

sleepyhead/SleepLib/day.cpp

@@ -779,11 +779,8 @@ bool Day::summaryOnly()
     QList<Session *>::iterator end = sessions.end();
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session & sess = *(*it);
-        QVariant v = sess.setting(CPAP_SummaryOnly);
+        if (sess.summaryOnly())
-        if (!v.isNull()) {
+            return true;
-            if (v.toBool())
-                return true;
-        }
     }
     return false;
 }

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -1223,7 +1223,7 @@ bool PRS1SessionData::ParseSummary()
         session->set_last(qint64(summary->timestamp + duration) * 1000L);
     }
     if (!event) {
-        session->settings[CPAP_SummaryOnly] = true;
+        session->setSummaryOnly(true);
     }
 
     // Minutes. Convert to seconds/hours here?

sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp

@@ -584,7 +584,7 @@ void ResmedImport::run()
 {
     Session * sess = mach->SessionExists(sessionid);
     if (sess) {
-        if (sess->setting(CPAP_SummaryOnly).toBool()) {
+        if (sess->summaryOnly()) {
             // Reuse this session
             sess->wipeSummary();
         } else {
@@ -596,7 +596,7 @@ void ResmedImport::run()
         quint32 key = int(sessionid / 60) * 60;
         sess = mach->SessionExists(key);
         if (sess) {
-            if (sess->setting(CPAP_SummaryOnly).toBool()) {
+            if (sess->summaryOnly()) {
                 sess->Destroy();
                 delete sess;
             }
@@ -624,7 +624,7 @@ void ResmedImport::run()
         return;
     }
 
-    sess->settings[CPAP_SummaryOnly] = false;
+    sess->setSummaryOnly(false);
     sess->SetChanged(true);
 
     /////////////////////////////////////////////////////////////////////////////////
@@ -784,7 +784,7 @@ void ResmedImportStage2::run()
 
     // Claim this record for future imports
     sess->settings[RMS9_MaskOnTime] = R.maskon;
-    sess->settings[CPAP_SummaryOnly] = true;
+    sess->setSummaryOnly(true);
 
     sess->SetChanged(true);
 

sleepyhead/SleepLib/session.cpp

@@ -30,7 +30,7 @@ const quint16 filetype_data = 1;
 
 // This is the uber important database version for SleepyHeads internal storage
 // Increment this after stuffing with Session's save & load code.
-const quint16 summary_version = 13;
+const quint16 summary_version = 14;
 const quint16 events_version = 10;
 
 Session::Session(Machine *m, SessionID session)
@@ -52,7 +52,9 @@ Session::Session(Machine *m, SessionID session)
     s_eventfile = "";
     s_evchecksum_checked = false;
 
+    s_summaryOnly = false;
 }
+
 Session::~Session()
 {
     TrashEvents();
@@ -202,6 +204,8 @@ bool Session::StoreSummary(QString filename)
     out << m_timesummary;
     out << m_gain;
 
+    out << s_summaryOnly;
+
     file.close();
     return true;
 }
@@ -365,6 +369,8 @@ bool Session::LoadSummary(QString filename)
 
         //SetChanged(true);
     } else {
+        // version > 7
+
         in >> settings;
         if (version < 13) {
             QHash<ChannelID, int> cnt2;
@@ -417,14 +423,25 @@ bool Session::LoadSummary(QString filename)
             }
         }
 
-
+        if (version == 13) {
+            QHash<ChannelID, QVariant>::iterator it = settings.find(CPAP_SummaryOnly);
+            if (it != settings.end()) {
+                s_summaryOnly = (*it).toBool();
+            } else s_summaryOnly = false;
+        } else if (version > 13) {
+            in >> s_summaryOnly;
+        }
     }
 
     // not really a good idea to do this... should flag and do a reindex
     if (version < summary_version) {
 
         qDebug() << "Upgrading Summary file to version" << summary_version;
-        UpdateSummaries();
+        if (!s_summaryOnly) {
+            UpdateSummaries();
+        } else {
+            // summary only upgrades go here.
+        }
         StoreSummary(filename);
     }
 

sleepyhead/SleepLib/session.h

@@ -145,14 +145,6 @@ class Session
     //! \brief Sessions Settings List, contianing single settings for this session.
     QHash<ChannelID, QVariant> settings;
 
-    QVariant setting(ChannelID) {
-        QHash<ChannelID, QVariant>::iterator it = settings.find(CPAP_SummaryOnly);
-        if (it != settings.end()) {
-            return (*it);
-        }
-        return QVariant();
-    }
-
     // Session caches
     QHash<ChannelID, EventDataType> m_cnt;
     QHash<ChannelID, double> m_sum;
@@ -315,7 +307,13 @@ class Session
     Machine *machine() { return s_machine; }
 
     //! \brief Returns true if session only contains summary data
-    bool summaryOnly();
+    inline bool summaryOnly() {
+        return s_summaryOnly;
+    }
+
+    inline void setSummaryOnly(bool b) {
+        s_summaryOnly = b;
+    }
 
     //! \brief Completely purges Session from memory and disk.
     bool Destroy();
@@ -339,6 +337,7 @@ protected:
     bool s_lonesession;
     bool s_evchecksum_checked;
     bool _first_session;
+    bool s_summaryOnly;
 
     bool s_events_loaded;
     char s_enabled;

sleepyhead/daily.cpp

@@ -1192,7 +1192,7 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
             ccnt++;
         }
     }
-    if (GraphView->isEmpty() && ((ccnt>0) || (cpap && cpap->settingExists(CPAP_SummaryOnly)))) {
+    if (GraphView->isEmpty() && ((ccnt>0) || (cpap && cpap->summaryOnly()))) {
         html+="<tr><td colspan=5>&nbsp;</td></tr>\n";
         html+=QString("<tr><td colspan=5 align=center><i>%1</i></td></tr>").arg("<b>"+STR_MessageBox_PleaseNote+"</b> "+ tr("This day just contains summary data, only limited information is available ."));
     } else