From e27232423ea432e4c5765d077a21eb98211a8cd0 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 21 Aug 2014 03:17:13 +1000 Subject: [PATCH] Restructure Day object to allow for multiple machine sessions --- sleepyhead/Graphs/MinutesAtPressure.cpp | 9 +- sleepyhead/Graphs/gSummaryChart.cpp | 320 ++++++++-------- sleepyhead/Graphs/gdailysummary.cpp | 11 +- sleepyhead/SleepLib/day.cpp | 210 ++++++++++- sleepyhead/SleepLib/day.h | 37 +- sleepyhead/SleepLib/journal.cpp | 4 +- sleepyhead/SleepLib/machine.cpp | 21 +- sleepyhead/SleepLib/machine_loader.cpp | 3 +- sleepyhead/SleepLib/profiles.cpp | 148 +++----- sleepyhead/SleepLib/profiles.h | 6 +- sleepyhead/SleepLib/session.cpp | 8 +- sleepyhead/SleepLib/session.h | 4 +- sleepyhead/daily.cpp | 473 ++++++++++++------------ sleepyhead/daily.h | 14 +- sleepyhead/mainwindow.cpp | 15 +- sleepyhead/oximeterimport.cpp | 4 +- sleepyhead/reports.cpp | 107 +++--- sleepyhead/statistics.cpp | 6 +- sleepyhead/welcome.cpp | 19 +- 19 files changed, 798 insertions(+), 621 deletions(-) diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp index 5b88ec10..475b3337 100644 --- a/sleepyhead/Graphs/MinutesAtPressure.cpp +++ b/sleepyhead/Graphs/MinutesAtPressure.cpp @@ -48,17 +48,18 @@ void MinutesAtPressure::SetDay(Day *day) Layer::SetDay(day); // look at session summaryValues. - if (day) { + Machine * cpap = nullptr; + if (day) cpap = day->machine(MT_CPAP); + if (cpap) { QList::iterator sit; EventDataType minpressure = 40; EventDataType maxpressure = 0; - Machine * mach = day->machine; QMap::iterator it; - QMap::iterator day_end = mach->day.end(); + QMap::iterator day_end = cpap->day.end(); // look at overall pressure ranges and find the max - for (it = mach->day.begin(); it != day_end; ++it) { + for (it = cpap->day.begin(); it != day_end; ++it) { Day * d = it.value(); QList::iterator sess_end = d->end(); for (sit = d->begin(); sit != sess_end; ++sit) { diff --git a/sleepyhead/Graphs/gSummaryChart.cpp b/sleepyhead/Graphs/gSummaryChart.cpp index 8496ea45..25638681 100644 --- a/sleepyhead/Graphs/gSummaryChart.cpp +++ b/sleepyhead/Graphs/gSummaryChart.cpp @@ -124,7 +124,7 @@ void SummaryChart::SetDay(Day * nullday) bool first = true; // For each day in the main profile daylist - QMap >::iterator d; + QMap::iterator d; for (d = p_profile->daylist.begin(); d != p_profile->daylist.end(); d++) { @@ -154,64 +154,61 @@ void SummaryChart::SetDay(Day * nullday) } // for each day object on record for this date - int dlistsize = d.value().size(); - for (int i = 0; i < dlistsize; ++i) { - day = d.value().at(i); + day = d.value(); - // skip any empty or irrelevant day records - if (!day || (day->machine_type() != m_machinetype)) { continue; } + // skip any empty or irrelevant day records + if (!day || (day->machine(m_machinetype) == nullptr)) { continue; } - int ft = qint64(day->first()) / 1000L; - ft += tz_offset; // convert to local time + int ft = qint64(day->first()) / 1000L; + ft += tz_offset; // convert to local time - int dz2 = ft / 86400; - dz2 *= 86400; - // ft = first sessions time, rounded back to midnight.. + int dz2 = ft / 86400; + dz2 *= 86400; + // ft = first sessions time, rounded back to midnight.. - // For each session in this day record - for (int s = 0; s < day->size(); s++) { - Session *sess = (*day)[s]; + // For each session in this day record + for (int s = 0; s < day->size(); s++) { + Session *sess = (*day)[s]; - if (!sess->enabled()) { continue; } + if (!sess->enabled()) { continue; } - // Get session duration - tmp = sess->hours(); - m_values[dn][s] = tmp; + // Get session duration + tmp = sess->hours(); + m_values[dn][s] = tmp; - total += tmp; + total += tmp; - // Get session start timestamp - zt = qint64(sess->first()) / 1000L; - zt += tz_offset; + // Get session start timestamp + zt = qint64(sess->first()) / 1000L; + zt += tz_offset; - // Calculate the starting hour - tmp2 = zt - dn * 86400; - tmp2 /= 3600.0; + // Calculate the starting hour + tmp2 = zt - dn * 86400; + tmp2 /= 3600.0; - m_times[dn][s] = tmp2; + m_times[dn][s] = tmp2; - // Update min & max Y values - if (first) { + // Update min & max Y values + if (first) { + m_miny = tmp2; + m_maxy = tmp2 + tmp; + first = false; + } else { + if (tmp2 < m_miny) { m_miny = tmp2; - m_maxy = tmp2 + tmp; - first = false; - } else { - if (tmp2 < m_miny) { - m_miny = tmp2; - } - - if (tmp2 + tmp > m_maxy) { - m_maxy = tmp2 + tmp; - } } - } // for each session - // if total hours for all sessions more than 0, register the day as valid - if (total > 0) { - m_days[dn] = day; - m_hours[dn] = total; - m_empty = false; + if (tmp2 + tmp > m_maxy) { + m_maxy = tmp2 + tmp; + } } + } // for each session + + // if total hours for all sessions more than 0, register the day as valid + if (total > 0) { + m_days[dn] = day; + m_hours[dn] = total; + m_empty = false; } } else { ////////////////////////////////////////////////////////////////////////////// @@ -225,139 +222,136 @@ void SummaryChart::SetDay(Day * nullday) type = m_type[j]; EventDataType typeval = m_typeval[j]; - // for each machine object for this day - for (int i = 0; i < d.value().size(); i++) { - day = d.value()[i]; + day = d.value(); - CPAPMode mode = (CPAPMode)(int)day->settings_max(CPAP_Mode); + CPAPMode mode = (CPAPMode)(int)day->settings_max(CPAP_Mode); - // ignore irrelevent day objects - if (day->machine_type() != m_machinetype) { continue; } + // ignore irrelevent day objects + if (day->machine(m_machinetype) == nullptr) { continue; } - bool hascode = //day->channelHasData(code) || - type == ST_HOURS || - type == ST_SESSIONS || - day->settingExists(code) || - day->hasData(code, type); + bool hascode = //day->channelHasData(code) || + type == ST_HOURS || + type == ST_SESSIONS || + day->settingExists(code) || + day->hasData(code, type); - if (code == CPAP_Pressure) { - if ((cpapmode > MODE_CPAP) && (mode == MODE_CPAP)) { - hascode = false; + if (code == CPAP_Pressure) { + if ((cpapmode > MODE_CPAP) && (mode == MODE_CPAP)) { + hascode = false; - if ((type == ST_WAVG) || (type == ST_AVG) || ((type == ST_PERC) && (typeval == 0.5))) { - type = ST_SETWAVG; - hascode = true; - } - } else { - type = m_type[j]; + if ((type == ST_WAVG) || (type == ST_AVG) || ((type == ST_PERC) && (typeval == 0.5))) { + type = ST_SETWAVG; + hascode = true; } - } - - //if (code==CPAP_Hypopnea) { // Make sure at least one of the CPAP data gets through with 0 - // hascode=true; - //} - if (hascode) { - m_days[dn] = day; - - switch (type) { - case ST_AVG: - tmp = day->avg(code); - break; - - case ST_SUM: - tmp = day->sum(code); - break; - - case ST_WAVG: - tmp = day->wavg(code); - break; - - case ST_90P: - tmp = day->p90(code); - break; - - case ST_PERC: - tmp = day->percentile(code, typeval); - break; - - case ST_MIN: - tmp = day->Min(code); - break; - - case ST_MAX: - tmp = day->Max(code); - break; - - case ST_CNT: - tmp = day->count(code); - break; - - case ST_CPH: - tmp = day->count(code) / day->hours(); - break; - - case ST_SPH: - tmp = day->sph(code); - break; - - case ST_HOURS: - tmp = day->hours(); - break; - - case ST_SESSIONS: - tmp = day->size(); - break; - - case ST_SETMIN: - tmp = day->settings_min(code); - break; - - case ST_SETMAX: - tmp = day->settings_max(code); - break; - - case ST_SETAVG: - tmp = day->settings_avg(code); - break; - - case ST_SETWAVG: - tmp = day->settings_wavg(code); - break; - - case ST_SETSUM: - tmp = day->settings_sum(code); - break; - - default: - tmp = 0; - break; - } - - if (suboffset > 0) { - tmp -= suboffset; - - if (tmp < 0) { tmp = 0; } - } - - total += tmp; - m_values[dn][j + 1] = tmp; - - if (tmp < m_miny) { m_miny = tmp; } - - if (tmp > m_maxy) { m_maxy = tmp; } - - m_goodcodes[j] = true; - fnd = true; - break; + } else { + type = m_type[j]; } } + + //if (code==CPAP_Hypopnea) { // Make sure at least one of the CPAP data gets through with 0 + // hascode=true; + //} + if (hascode) { + m_days[dn] = day; + + switch (type) { + case ST_AVG: + tmp = day->avg(code); + break; + + case ST_SUM: + tmp = day->sum(code); + break; + + case ST_WAVG: + tmp = day->wavg(code); + break; + + case ST_90P: + tmp = day->p90(code); + break; + + case ST_PERC: + tmp = day->percentile(code, typeval); + break; + + case ST_MIN: + tmp = day->Min(code); + break; + + case ST_MAX: + tmp = day->Max(code); + break; + + case ST_CNT: + tmp = day->count(code); + break; + + case ST_CPH: + tmp = day->count(code) / day->hours(m_machinetype); + break; + + case ST_SPH: + tmp = day->sph(code); + break; + + case ST_HOURS: + tmp = day->hours(m_machinetype); + break; + + case ST_SESSIONS: + tmp = day->size(); + break; + + case ST_SETMIN: + tmp = day->settings_min(code); + break; + + case ST_SETMAX: + tmp = day->settings_max(code); + break; + + case ST_SETAVG: + tmp = day->settings_avg(code); + break; + + case ST_SETWAVG: + tmp = day->settings_wavg(code); + break; + + case ST_SETSUM: + tmp = day->settings_sum(code); + break; + + default: + tmp = 0; + break; + } + + if (suboffset > 0) { + tmp -= suboffset; + + if (tmp < 0) { tmp = 0; } + } + + total += tmp; + m_values[dn][j + 1] = tmp; + + if (tmp < m_miny) { m_miny = tmp; } + + if (tmp > m_maxy) { m_maxy = tmp; } + + m_goodcodes[j] = true; + fnd = true; + } + } if (fnd) { if (!m_fday) { m_fday = dn; } m_values[dn][0] = total; - m_hours[dn] = day->hours(); + m_hours[dn] = day->hours(m_machinetype); if (m_graphtype == GT_BAR) { if (total < m_miny) { m_miny = total; } diff --git a/sleepyhead/Graphs/gdailysummary.cpp b/sleepyhead/Graphs/gdailysummary.cpp index 2ab67831..5be2ba9d 100644 --- a/sleepyhead/Graphs/gdailysummary.cpp +++ b/sleepyhead/Graphs/gdailysummary.cpp @@ -34,7 +34,11 @@ void gDailySummary::SetDay(Day *day) pie_total = 0; m_day = day; - if (day) { + Machine * cpap = nullptr; + if (day) cpap = day->machine(MT_CPAP); + + if (cpap) { + m_minx = m_day->first(); m_maxx = m_day->last();; @@ -103,8 +107,9 @@ void gDailySummary::SetDay(Day *day) info.append(QObject::tr("%1: %2").arg(STR_TR_AHI).arg(day->calcAHI(),0,'f',2)); info_background.append(QColor("orange")); - settings.append(day->machine->brand()+ " " + day->machine->series()); - settings.append(day->machine->model()+ " " + day->machine->modelnumber()); + + settings.append(cpap->brand()+ " " + cpap->series()); + settings.append(cpap->model()+ " " + cpap->modelnumber()); settings.append(schema::channel[CPAP_Mode].option(mode)); if (mode == MODE_CPAP) { diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp index bfd48163..fbabc993 100644 --- a/sleepyhead/SleepLib/day.cpp +++ b/sleepyhead/SleepLib/day.cpp @@ -15,8 +15,7 @@ #include "day.h" #include "profiles.h" -Day::Day(Machine *m) - : machine(m) +Day::Day() { d_firstsession = true; } @@ -26,10 +25,53 @@ Day::~Day() delete(*s); } } -MachineType Day::machine_type() const + +Session * Day::firstSession(MachineType type) { - return machine->type(); + for (int i=0; ienabled()) continue; + if (sess->machine()->type() == type) { + return sess; + } + } + return nullptr; } + +bool Day::addMachine(Machine *mach) +{ + if (!machines.contains(mach->type())) { + machines[mach->type()] = mach; + return true; + } + return false; +} +Machine *Day::machine(MachineType type) +{ + QHash::iterator it = machines.find(type); + if (it != machines.end()) + return it.value(); + return nullptr; +} + +QList Day::getSessions(MachineType type) +{ + QList::iterator it; + QList::iterator sess_end = sessions.end(); + + QList newlist; + + for (it = sessions.begin(); it != sess_end; ++it) { + if (!(*it)->enabled()) + continue; + + if ((*it)->machine()->type() == type) + newlist.append((*it)); + } + + return newlist; +} + Session *Day::find(SessionID sessid) { QList::iterator end=sessions.end(); @@ -42,11 +84,18 @@ Session *Day::find(SessionID sessid) return nullptr; } -void Day::AddSession(Session *s) +void Day::addSession(Session *s) { - if (!s) { - qWarning("Day::AddSession called with nullptr session object"); - return; + Q_ASSERT(s!=nullptr); + QHash::iterator mi = machines.find(s->machine()->type()); + + if (mi != machines.end()) { + if (mi.value() != s->machine()) { + qDebug() << "SleepyHead can't add session" << s->session() << "to this day record, as it already contains a different machine of the same MachineType"; + return; + } + } else { + machines[s->machine()->type()] = s->machine(); } sessions.push_back(s); @@ -489,7 +538,7 @@ qint64 Day::total_time() for (QList::iterator it = sessions.begin(); it != end; ++it) { Session &sess = *(*it); - if (sess.enabled()) { + if (sess.enabled() && (sess.machine()->type() != MT_JOURNAL)) { first = sess.first(); last = sess.last(); @@ -536,6 +585,68 @@ qint64 Day::total_time() return total; //d_totaltime; } +// Total session time in milliseconds, only considering machinetype +qint64 Day::total_time(MachineType type) +{ + qint64 d_totaltime = 0; + QMultiMap range; + //range.reserve(size()*2); + + // Remember sessions may overlap.. + + qint64 first, last; + QList::iterator end = sessions.end(); + for (QList::iterator it = sessions.begin(); it != end; ++it) { + Session &sess = *(*it); + + if ((sess.machine()->type() == type) && sess.enabled()) { + first = sess.first(); + last = sess.last(); + + // This algorithm relies on non zero length, and correctly ordered sessions + if (last > first) { + range.insert(first, 0); + range.insert(last, 1); + d_totaltime += sess.length(); + } + } + } + + bool b; + int nest = 0; + qint64 ti = 0; + qint64 total = 0; + + // This is my implementation of a typical "brace counting" algorithm mentioned here: + // http://stackoverflow.com/questions/7468948/problem-calculating-overlapping-date-ranges + + QMultiMap::iterator rend = range.end(); + for (QMultiMap::iterator rit = range.begin(); rit != rend; ++rit) { + b = rit.value(); + + if (!b) { + if (!ti) { + ti = rit.key(); + } + + nest++; + } else { + if (--nest <= 0) { + total += rit.key() - ti; + ti = 0; + } + } + } + + if (total != d_totaltime) { + // They can overlap.. tough. +// qDebug() << "Sessions Times overlaps!" << total << d_totaltime; + } + + return total; //d_totaltime; +} + + bool Day::hasEnabledSessions() { QList::iterator end = sessions.end(); @@ -549,6 +660,19 @@ bool Day::hasEnabledSessions() return false; } +bool Day::hasEnabledSessions(MachineType type) +{ + QList::iterator end = sessions.end(); + + for (QList::iterator it = sessions.begin(); it != end; ++it) { + if (((*it)->machine()->type() == type) && (*it)->enabled()) { + return true; + } + } + + return false; +} + /*EventDataType Day::percentile(ChannelID code,double percent) { double val=0; @@ -946,7 +1070,12 @@ void Day::CloseEvents() QList Day::getSortedMachineChannels(quint32 chantype) { - QList available = machine->availableChannels(chantype); + QList available; + QHash::iterator mi_end = machines.end(); + for (QHash::iterator mi = machines.begin(); mi != mi_end; mi++) { + if (mi.key() == MT_JOURNAL) continue; + available.append(mi.value()->availableChannels(chantype)); + } QMultiMap order; @@ -965,6 +1094,31 @@ QList Day::getSortedMachineChannels(quint32 chantype) return channels; } +qint64 Day::first(MachineType type) +{ + qint64 date = 0; + qint64 tmp; + + QList::iterator end = sessions.end(); + for (QList::iterator it = sessions.begin(); it != end; ++it) { + Session & sess = *(*it); + + if ((sess.machine()->type() == type) && sess.enabled()) { + tmp = sess.first(); + + if (!tmp) { continue; } + + if (!date) { + date = tmp; + } else { + if (tmp < date) { date = tmp; } + } + } + } + + return date; +} + qint64 Day::first() { qint64 date = 0; @@ -1017,6 +1171,33 @@ qint64 Day::last() return date; } +qint64 Day::last(MachineType type) +{ + qint64 date = 0; + qint64 tmp; + + QList::iterator end = sessions.end(); + + + for (QList::iterator it = sessions.begin(); it != end; ++it) { + Session & sess = *(*it); + + if ((sess.machine()->type() == type) && sess.enabled()) { + tmp = sess.last(); + + if (!tmp) { continue; } + + if (!date) { + date = tmp; + } else { + if (tmp > date) { date = tmp; } + } + } + } + + return date; +} + bool Day::removeSession(Session *sess) { return sessions.removeAll(sess) > 0; @@ -1024,7 +1205,7 @@ bool Day::removeSession(Session *sess) QString Day::getCPAPMode() { - Q_ASSERT(machine_type() == MT_CPAP); + Q_ASSERT(machine(MT_CPAP) != nullptr); CPAPMode mode = (CPAPMode)(int)qRound(settings_wavg(CPAP_Mode)); if (mode == MODE_CPAP) { @@ -1047,7 +1228,10 @@ QString Day::getCPAPMode() QString Day::getPressureRelief() { - CPAPLoader * loader = qobject_cast(machine->loader()); + Machine * mach = machine(MT_CPAP); + if (!mach) return STR_MessageBox_Error; + + CPAPLoader * loader = qobject_cast(mach->loader()); if (!loader) return STR_MessageBox_Error; @@ -1072,7 +1256,7 @@ QString Day::getPressureRelief() QString Day::getPressureSettings() { - Q_ASSERT(machine_type() == MT_CPAP); + Q_ASSERT(machine(MT_CPAP) != nullptr); CPAPMode mode = (CPAPMode)(int)settings_max(CPAP_Mode); QString units = schema::channel[CPAP_Pressure].units(); diff --git a/sleepyhead/SleepLib/day.h b/sleepyhead/SleepLib/day.h index e858aa1a..a444403a 100644 --- a/sleepyhead/SleepLib/day.h +++ b/sleepyhead/SleepLib/day.h @@ -31,14 +31,20 @@ class Session; class Day { public: - Day(Machine *m); + Day(); ~Day(); - //! \brief Add Session to this Day object (called during Load) - void AddSession(Session *s); + //! \brief Add a new machine to this day record + bool addMachine(Machine *m); - //! \brief Returns this machines type - MachineType machine_type() const; + //! \brief Returns a machine record if present of specified machine type + Machine *machine(MachineType type); + + //! \brief Returns a list of sessions for the specified machine type + QList getSessions(MachineType type); + + //! \brief Add Session to this Day object (called during Load) + void addSession(Session *s); //! \brief Returns the count of all this days sessions' events for this day EventDataType count(ChannelID code); @@ -113,6 +119,13 @@ class Day //! \brief Returns the last session time of this day qint64 last(); + //! \brief Returns the first session time of this machine type for this day + qint64 first(MachineType type); + + //! \brief Returns the last session time of this machine type for this day + qint64 last(MachineType type); + + // //! \brief Sets the first session time of this day // void setFirst(qint64 val) { d_first=val; } @@ -128,11 +141,18 @@ class Day //! \brief Returns the total time in milliseconds for this day qint64 total_time(); + //! \brief Returns the total time in milliseconds for this day for given machine type + qint64 total_time(MachineType type); + + //! \brief Returns true if this day has enabled sessions for supplied machine type + bool hasEnabledSessions(MachineType); + //! \brief Returns true if this day has enabled sessions bool hasEnabledSessions(); //! \brief Return the total time in decimal hours for this day EventDataType hours() { return double(total_time()) / 3600000.0; } + EventDataType hours(MachineType type) { return double(total_time(type)) / 3600000.0; } //! \brief Return the session indexed by i Session *operator [](int i) { return sessions[i]; } @@ -153,8 +173,6 @@ class Day //! \brief Returns the number of Sessions in this day record int size() { return sessions.size(); } - Machine *machine; - //! \brief Loads all Events files for this Days Sessions void OpenEvents(); @@ -239,8 +257,13 @@ class Day EventDataType calc(ChannelID code, ChannelCalcType type); + Session * firstSession(MachineType type); + + //! \brief A QList containing all Sessions objects for this day QList sessions; + QHash machines; + protected: //! \brief A Vector containing all sessions for this day QHash > perc_cache; diff --git a/sleepyhead/SleepLib/journal.cpp b/sleepyhead/SleepLib/journal.cpp index 39527f1c..fab2a804 100644 --- a/sleepyhead/SleepLib/journal.cpp +++ b/sleepyhead/SleepLib/journal.cpp @@ -64,7 +64,7 @@ JournalEntry::JournalEntry(QDate date) session = nullptr; day = p_profile->GetDay(date, MT_JOURNAL); if (!day) { - session = day->sessions[0]; + session = day->firstSession(MT_JOURNAL); } else { // Doesn't exist.. create a new one.. session = new Session(jmach,0); @@ -227,7 +227,7 @@ void BackupJournal(QString filename) Day * journal = p_profile->GetDay(date, MT_JOURNAL); if (!journal) continue; - Session * sess = journal->sessions[0]; + Session * sess = journal->firstSession(MT_JOURNAL); if (!sess) continue; QDomElement day = doc.createElement("day"); day.setAttribute("date", date.toString()); diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp index 872e69f0..094da381 100644 --- a/sleepyhead/SleepLib/machine.cpp +++ b/sleepyhead/SleepLib/machine.cpp @@ -59,10 +59,6 @@ Machine::Machine(MachineID id) Machine::~Machine() { qDebug() << "Destroy Machine" << info.loadername << hex << m_id; - - for (QMap::iterator d = day.begin(); d != day.end(); d++) { - delete d.value(); - } } Session *Machine::SessionExists(SessionID session) { @@ -208,17 +204,11 @@ bool Machine::AddSession(Session *s) dit = day.find(date); if (dit == day.end()) { - //QString dstr=date.toString("yyyyMMdd"); - //qDebug("Adding Profile Day %s",dstr.toLatin1().data()); - dd = new Day(this); - day[date] = dd; - // Add this Day record to profile - p_profile->AddDay(date, dd, m_type); - } else { - dd = *dit; + dit = day.insert(date, p_profile->addDay(date)); } + dd = dit.value(); - dd->AddSession(s); + dd->addSession(s); if (combine_next_day) { for (QList::iterator i = nextday.value()->begin(); i != nextday.value()->end(); i++) { @@ -229,7 +219,7 @@ bool Machine::AddSession(Session *s) sessionlist[(*i)->session()] = *i; - dd->AddSession(*i); + dd->addSession(*i); } // QMap >::iterator nd = p_profile->daylist.find(date.addDays(1)); @@ -692,7 +682,6 @@ QList Machine::availableChannels(quint32 chantype) { QHash chanhash; - // look through the daylist and return a list of available channels for this machine QMap::iterator dit; QMap::iterator day_end = day.end(); @@ -701,6 +690,8 @@ QList Machine::availableChannels(quint32 chantype) for (QList::iterator sit = dit.value()->begin(); sit != sess_end; ++sit) { Session * sess = (*sit); + if (sess->machine() != this) continue; + int size = sess->availableChannels().size(); for (int i=0; i < size; ++i) { ChannelID code = sess->availableChannels().at(i); diff --git a/sleepyhead/SleepLib/machine_loader.cpp b/sleepyhead/SleepLib/machine_loader.cpp index 3953eade..3785237f 100644 --- a/sleepyhead/SleepLib/machine_loader.cpp +++ b/sleepyhead/SleepLib/machine_loader.cpp @@ -103,6 +103,7 @@ Machine * MachineLoader::CreateMachine(MachineInfo info, MachineID id) break; case MT_JOURNAL: m = new Machine(id); + m->setType(MT_JOURNAL); break; default: m = new Machine(id); @@ -246,7 +247,7 @@ void MachineLoader::runTasks(bool threaded) QList CPAPLoader::eventFlags(Day * day) { - Machine * mach = day->machine; + Machine * mach = day->machine(MT_CPAP); QList list; diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index 37d1ef5b..fd0a2a5b 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -84,6 +84,11 @@ Profile::~Profile() } m_opened=false; } + + for (QMap::iterator d = daylist.begin(); d != daylist.end(); d++) { + delete d.value(); + } + } bool Profile::Save(QString filename) @@ -572,16 +577,16 @@ QDomElement Profile::ExtraSave(QDomDocument &doc) } return mach; - } -void Profile::AddDay(QDate date, Day *day, MachineType mt) + +Day *Profile::addDay(QDate date) { - //date+=wxTimeSpan::Day(); - if (!day) { - qDebug() << "Profile::AddDay called with null day object"; - return; + QMap::iterator dit = daylist.find(date); + if (dit == daylist.end()) { + dit = daylist.insert(date, new Day()); } + Day * day = dit.value(); if (is_first_day) { m_first = m_last = date; @@ -595,23 +600,7 @@ void Profile::AddDay(QDate date, Day *day, MachineType mt) if (m_last < date) { m_last = date; } - - // Check for any other machines of same type.. Throw an exception if one already exists. - QList &dl = daylist[date]; - - for (QList::iterator a = dl.begin(); a != dl.end(); a++) { - if ((*a)->machine->type() == mt) { - - // disabled this because two machines isn't all that bad - // if (QMessageBox::question(nullptr,"Different Machine Detected","This data comes from another machine to what's usually imported, and has overlapping data.\nThis new data will override any older data from the old machine. Are you sure you want to do this?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) { - // throw OneTypePerDay(); - // } - daylist[date].erase(a); - break; - } - } - - daylist[date].push_back(day); + return day; } // Get Day record if data available for date and machine type, @@ -622,14 +611,10 @@ Day *Profile::GetGoodDay(QDate date, MachineType type) if (!day) return nullptr; - // Just return the day if not matching for a machine. - if (type == MT_UNKNOWN) - return day; - // For a machine match, find at least one enabled Session. - Q_ASSERT(day->machine_type() == type); for (int i = 0; i < day->size(); ++i) { - if ((*day)[i]->enabled()) + Session * sess = (*day)[i]; + if (((type == MT_UNKNOWN) || (sess->machine()->type() == type)) && sess->enabled()) return day; } @@ -639,24 +624,14 @@ Day *Profile::GetGoodDay(QDate date, MachineType type) Day *Profile::GetDay(QDate date, MachineType type) { - if (!daylist.contains(date)) - return nullptr; + QMap::iterator di = daylist.find(date); + if (di == daylist.end()) return nullptr; - QList list(daylist.value(date)); + Day * day = di.value(); - QList::iterator it = list.begin(); - QList::iterator list_end = list.end(); + if (type == MT_UNKNOWN) return day; // just want the day record - for (; it != list_end; ++it) { - Day * day = (*it); - - Q_ASSERT(day != nullptr); - - // Just return the day if not matching for a machine. - if (day->machine_type() == type || type == MT_UNKNOWN) { - return day; - } - } + if (day->machines.contains(type)) return day; return nullptr; } @@ -765,33 +740,17 @@ Machine *Profile::GetMachine(MachineType t) bool Profile::unlinkDay(Day * day) { - bool b=false; - - QList dates; - - QMap >::iterator it; - QMap >::iterator it_end = daylist.end(); + QMap::iterator it; + QMap::iterator it_end = daylist.end(); + // Find the key... for (it = daylist.begin(); it != it_end; ++it) { - if (it.value().contains(day)) { - dates.push_back(it.key()); + if (it.value() == day) { + daylist.erase(it); + return true; } } - - for (int i=0; i < dates.size(); ++i) { - it = daylist.find(dates.at(i)); - - if (it != daylist.end()) { - it.value().removeAll(day); - // TODO: Check it doesn't change from the above... - - if (it.value().size() == 0) { - daylist.erase(it); - } - } - } - - return b; + return false; } @@ -847,6 +806,7 @@ Profile *Create(QString name) p_profile->Set(STR_GEN_DataFolder, QString("{home}/Profiles/{") + QString(STR_UI_UserName) + QString("}")); Machine *m = new Machine(0); + m->setType(MT_JOURNAL); MachineInfo info(MT_JOURNAL, 0, STR_MACH_Journal, "SleepyHead", STR_MACH_Journal, QString(), m->hexid(), QString(), QDateTime::currentDateTime(), 0); m->setInfo(info); @@ -906,35 +866,42 @@ void Scan() // Returns a list of all days records matching machine type between start and end date QList Profile::getDays(MachineType mt, QDate start, QDate end) { - QList daylist; + QList list; if (!start.isValid()) { - return daylist; + return list; } if (!end.isValid()) { - return daylist; + return list; } QDate date = start; if (date.isNull()) { - return daylist; + return list; } - do { - Day *day = GetGoodDay(date, mt); + QMap::iterator it; - if (day) { - if ((mt == MT_UNKNOWN) || (day->machine->type() == mt)) { - daylist.push_back(day); + do { + it = daylist.find(date); + if (it != daylist.end()) { + Day *day = it.value(); + if (mt != MT_UNKNOWN) { + if (day->hasEnabledSessions(mt)) { + list.push_back(day); + } + } else { + if (day->hasEnabledSessions()) { + list.push_back(day); + } } } - date = date.addDays(1); } while (date <= end); - return daylist; + return list; } int Profile::countDays(MachineType mt, QDate start, QDate end) @@ -959,7 +926,7 @@ int Profile::countDays(MachineType mt, QDate start, QDate end) Day *day = GetGoodDay(date, mt); if (day) { - if ((mt == MT_UNKNOWN) || (day->machine->type() == mt)) { days++; } + days++; } date = date.addDays(1); @@ -993,7 +960,7 @@ int Profile::countCompliantDays(MachineType mt, QDate start, QDate end) Day *day = GetGoodDay(date, mt); if (day) { - if ((day->machine->type() == mt) && (day->hours() > compliance)) { days++; } + if (day->hours(mt) > compliance) { days++; } } date = date.addDays(1); @@ -1671,9 +1638,7 @@ bool Profile::hasChannel(ChannelID code) return false; } - QMap >::iterator dit; - QList::iterator di; - QList::iterator di_end; + QMap::iterator dit; bool found = false; @@ -1681,23 +1646,14 @@ bool Profile::hasChannel(ChannelID code) dit = daylist.find(d); if (dit != daylist.end()) { + Day *day = dit.value(); - di = dit.value().begin(); - di_end = dit.value().end(); - for (; di != di_end; ++di) { - Day *day = (*di); - - if (day->channelHasData(code)) { - found = true; - break; - } + if (day->channelHasData(code)) { + found = true; + break; } } - if (found) { - break; - } - d = d.addDays(-1); } while (d >= f); diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h index f5937d8a..8b03e6d8 100644 --- a/sleepyhead/SleepLib/profiles.h +++ b/sleepyhead/SleepLib/profiles.h @@ -82,7 +82,7 @@ class Profile : public Preferences // bool trashMachine(Machine * mach); //! \brief Add Day record to Profile Day list - void AddDay(QDate date, Day *day, MachineType mt); + Day *addDay(QDate date); //! \brief Get Day record if data available for date and machine type, else return nullptr Day *GetDay(QDate date, MachineType type = MT_UNKNOWN); @@ -186,8 +186,8 @@ class Profile : public Preferences //! \brief Return if this profile has been opened or not bool isOpen() { return m_opened; } - //! \brief Red-Black tree of Days (iterates in order). - QMap > daylist; + //! \brief QMap of day records (iterates in order). + QMap daylist; //! \brief List of machines, indexed by MachineID. QHash machlist; diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index 790c7be4..320e79e6 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -168,7 +168,9 @@ bool Session::Store(QString path) bool Session::StoreSummary(QString filename) { - + if (filename.isEmpty()) { + filename = machine()->getDataPath() + QString().sprintf("%08lx.000", s_session); + } QFile file(filename); file.open(QIODevice::WriteOnly); @@ -476,6 +478,10 @@ const quint16 compress_method = 1; bool Session::StoreEvents(QString filename) { + if (filename.isEmpty()) { + filename = machine()->getDataPath() + QString().sprintf("%08lx.001", s_session); + } + QFile file(filename); file.open(QIODevice::WriteOnly); diff --git a/sleepyhead/SleepLib/session.h b/sleepyhead/SleepLib/session.h index b3c81acf..69350ea2 100644 --- a/sleepyhead/SleepLib/session.h +++ b/sleepyhead/SleepLib/session.h @@ -40,10 +40,10 @@ class Session bool Store(QString path); //! \brief Writes the Sessions Summary Indexes to filename, in SleepLibs custom data format. - bool StoreSummary(QString filename); + bool StoreSummary(QString filename = QString()); //! \brief Writes the Sessions EventLists to filename, in SleepLibs custom data format. - bool StoreEvents(QString filename); + bool StoreEvents(QString filename = QString()); //bool Load(QString path); diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index ed62f254..e7ebd20d 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -126,7 +126,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) GraphView=new gGraphView(ui->graphFrame,shared); GraphView->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); - snapGV=new gGraphView(GraphView); //ui->graphMainArea); + snapGV=new gGraphView(GraphView); snapGV->setMinimumSize(172,172); snapGV->hideSplitter(); snapGV->hide(); @@ -520,15 +520,10 @@ void Daily::closeEvent(QCloseEvent *event) void Daily::doToggleSession(Session * sess) { - Q_UNUSED(sess) sess->setEnabled(!sess->enabled()); + sess->StoreSummary(); - // sess->StoreSummary(); - Day *day=p_profile->GetDay(previous_date,MT_CPAP); - if (day) { - day->machine->Save(); - this->LoadDate(previous_date); - } + LoadDate(previous_date); } void Daily::Link_clicked(const QUrl &url) @@ -537,21 +532,20 @@ void Daily::Link_clicked(const QUrl &url) QString data=url.toString().section("=",1); int sid=data.toInt(); Day *day=nullptr; + if (code=="togglecpapsession") { // Enable/Disable CPAP session day=p_profile->GetDay(previous_date,MT_CPAP); + if (!day) return; Session *sess=day->find(sid); if (!sess) return; int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); sess->setEnabled(!sess->enabled()); - - // Messy, this rewrites both summary & events.. TODO: Write just the session summary file - day->machine->Save(); + sess->StoreSummary(); // Reload day - this->LoadDate(previous_date); + LoadDate(previous_date); webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); - return; } else if (code=="toggleoxisession") { // Enable/Disable Oximetry session day=p_profile->GetDay(previous_date,MT_OXIMETER); Session *sess=day->find(sid); @@ -559,19 +553,29 @@ void Daily::Link_clicked(const QUrl &url) return; int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); sess->setEnabled(!sess->enabled()); - // Messy, this rewrites both summary & events.. TODO: Write just the session summary file - day->machine->Save(); + + sess->StoreSummary(); // Reload day - this->LoadDate(previous_date); + LoadDate(previous_date); webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); - return; } else if (code=="cpap") { day=p_profile->GetDay(previous_date,MT_CPAP); + if (day) { + Session *sess=day->machine(MT_CPAP)->sessionlist[sid]; + if (sess && sess->enabled()) { + GraphView->SetXBounds(sess->first(),sess->last()); + } + } } else if (code=="oxi") { - //day=p_profile->GetDay(previous_date,MT_OXIMETER); - //Session *sess=day->machine->sessionlist[sid]; - return; + day=p_profile->GetDay(previous_date,MT_OXIMETER); + if (day) { + Session *sess=day->machine(MT_OXIMETER)->sessionlist[sid]; + if (sess && sess->enabled()) { + GraphView->SetXBounds(sess->first(),sess->last()); + } + } + } else if (code=="event") { QList list=ui->treeWidget->findItems(schema::channel[sid].fullname(),Qt::MatchContains); if (list.size()>0) { @@ -588,13 +592,6 @@ void Daily::Link_clicked(const QUrl &url) } else { qDebug() << "Clicked on" << code << data; } - if (day) { - - Session *sess=day->machine->sessionlist[sid]; - if (sess && sess->enabled()) { - GraphView->SetXBounds(sess->first(),sess->last()); - } - } } void Daily::ReloadGraphs() @@ -916,24 +913,19 @@ MyWebView::MyWebView(QWidget *parent): } -QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * posit) +QString Daily::getSessionInformation(Day * day) { QString html; - QList list; - if (cpap) list.push_back(cpap); - if (oxi) list.push_back(oxi); - if (stage) list.push_back(stage); - if (posit) list.push_back(posit); - - - if (list.isEmpty()) - return html; + if (!day) return html; html=""; html+=QString(""); html+=""; QFontMetrics FM(*defaultfont); QRect r=FM.boundingRect('@'); + + Machine * cpap = day->machine(MT_CPAP); + if (cpap) { html+=QString("\n"; html+=QString("" @@ -981,10 +975,12 @@ QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * p "" "" ""); - for (QList::iterator s=day->begin();s!=day->end();++s) { - if ((day->machine_type()==MT_CPAP) && - ((*s)->settings.find(CPAP_BrokenWaveform)!=(*s)->settings.end())) + QList sesslist = day->getSessions(mi.key()); + + for (QList::iterator s=sesslist.begin(); s != sesslist.end(); ++s) { + if (((*s)->machine()->type() == MT_CPAP) && + ((*s)->settings.find(CPAP_BrokenWaveform) != (*s)->settings.end())) corrupted_waveform=true; fd=QDateTime::fromTime_t((*s)->first()/1000L); @@ -993,13 +989,6 @@ QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * p int h=len/3600; int m=(len/60) % 60; int s1=len % 60; - //tooltip=day->machine->loaderName()+QString(":#%1").arg((*s)->session(),8,10,QChar('0')); - -//#define DEBUG_SESSIONS -//#ifdef DEBUG_SESSIONS -// tooltip += " "+QString::number(len)+"s"; -//#endif - // tooltip needs to lookup language.. :-/ Session *sess=*s; if (!sess->settings.contains(SESSION_ENABLED)) { @@ -1034,23 +1023,32 @@ QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * p return html; } -QString Daily::getMachineSettings(Day * cpap) { +QString Daily::getMachineSettings(Day * day) { QString html; - if (cpap && cpap->hasEnabledSessions()) { + + Machine * cpap = day->machine(MT_CPAP); + if (cpap && day->hasEnabledSessions(MT_CPAP)) { html="
"+tr("Session Information")+"
 
" "" @@ -949,30 +941,32 @@ QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * p bool corrupted_waveform=false; QString tooltip; - QList::iterator di; QString type; - for (di=list.begin();di!=list.end();di++) { - Day * day=*di; - html+="
"; - switch (day->machine_type()) { - case MT_CPAP: type="cpap"; - html+=tr("CPAP Sessions"); - break; - case MT_OXIMETER: type="oxi"; - html+=tr("Oximetery Sessions"); - break; - case MT_SLEEPSTAGE: type="stage"; - html+=tr("Sleep Stage Sessions"); - break; - case MT_POSITION: type="stage"; - html+=tr("Position Sensor Sessions"); - break; + QHash::iterator mach_end = day->machines.end(); + QHash::iterator mi; - default: - type="unknown"; - html+=tr("Unknown Session"); - break; + for (mi = day->machines.begin(); mi != mach_end; ++mi) { + if (mi.key() == MT_JOURNAL) continue; + html += "
"; + switch (mi.key()) { + case MT_CPAP: type="cpap"; + html+=tr("CPAP Sessions"); + break; + case MT_OXIMETER: type="oxi"; + html+=tr("Oximetery Sessions"); + break; + case MT_SLEEPSTAGE: type="stage"; + html+=tr("Sleep Stage Sessions"); + break; + case MT_POSITION: type="stage"; + html+=tr("Position Sensor Sessions"); + break; + + default: + type="unknown"; + html+=tr("Unknown Session"); + break; } html+="
"+STR_TR_Start+""+STR_TR_End+""+tr("Duration")+"
"; html+=QString("").arg(tr("Machine Settings")); html+=""; - if ((cpap && cpap->settingExists(CPAP_BrokenSummary))) { + if ((day->settingExists(CPAP_BrokenSummary))) { html+="
%1
 
"+tr("Machine Settings Unavailable")+"
\n"; return html; } QMap other; - QHash::iterator it = cpap->sessions.at(0)->settings.begin(); - QHash::iterator it_end = cpap->sessions.at(0)->settings.end(); + Session * sess = day->firstSession(MT_CPAP); + + QHash::iterator it; + QHash::iterator it_end; + if (sess) { + it_end = sess->settings.end(); + it = sess->settings.begin(); + } QMap first; - for (; it != it_end; ++it) { + + if (sess) for (; it != it_end; ++it) { ChannelID code = it.key(); if ((code <= 1) || (code == RMS9_MaskOnTime)) continue; @@ -1137,31 +1135,36 @@ QString Daily::getMachineSettings(Day * cpap) { return html; } -QString Daily::getOximeterInformation(Day * oxi) +QString Daily::getOximeterInformation(Day * day) { QString html; - if (oxi && oxi->hasEnabledSessions()) { + Machine * oxi = day->machine(MT_OXIMETER); + if (oxi && day->hasEnabledSessions(MT_OXIMETER)) { html=""; html+=QString("\n").arg(tr("Oximeter Information")); html+=""; - html+="\n"; + html+="\n"; html+=""; - html+=QString("").arg(tr("SpO2 Desaturations")).arg(oxi->count(OXI_SPO2Drop)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_SPO2Drop)/3600.0),0,'f',2); - html+=QString("").arg(tr("Pulse Change events")).arg(oxi->count(OXI_PulseChange)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_PulseChange)/3600.0),0,'f',2); - html+=QString("").arg(tr("SpO2 Baseline Used")).arg(oxi->settings_wavg(OXI_SPO2Drop),0,'f',2); // CHECKME: Should this value be wavg OXI_SPO2 isntead? + html+=QString("").arg(tr("SpO2 Desaturations")).arg(day->count(OXI_SPO2Drop)).arg((100.0/day->hours(MT_OXIMETER)) * (day->sum(OXI_SPO2Drop)/3600.0),0,'f',2); + html+=QString("").arg(tr("Pulse Change events")).arg(day->count(OXI_PulseChange)).arg((100.0/day->hours(MT_OXIMETER)) * (day->sum(OXI_PulseChange)/3600.0),0,'f',2); + html+=QString("").arg(tr("SpO2 Baseline Used")).arg(day->settings_wavg(OXI_SPO2Drop),0,'f',2); // CHECKME: Should this value be wavg OXI_SPO2 isntead? html+="
%1
 
"+oxi->machine->brand()+" "+oxi->machine->series()+"
"+oxi->brand()+" "+oxi->series()+"
 
%1: %2 (%3%)
%1: %2 (%3%)
%1: %2%
%1: %2 (%3%)
%1: %2 (%3%)
%1: %2%
\n"; html+="
\n"; } return html; } -QString Daily::getCPAPInformation(Day * cpap) +QString Daily::getCPAPInformation(Day * day) { QString html; - if (!cpap) + if (!day) return html; - MachineInfo info = cpap->machine->getInfo(); + Machine * cpap = day->machine(MT_CPAP); + if (!cpap) return html; + + + MachineInfo info = cpap->getInfo(); html="\n"; @@ -1174,10 +1177,10 @@ QString Daily::getCPAPInformation(Day * cpap) //CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); html+="\n"; - if ((cpap && cpap->settingExists(CPAP_BrokenSummary))) { + if ((day->settingExists(CPAP_BrokenSummary))) { html+="\n"; html+=QString("").arg(""+STR_MessageBox_PleaseNote+": "+ tr("This day has missing pressure, mode and settings data.")); } @@ -1188,14 +1191,13 @@ QString Daily::getCPAPInformation(Day * cpap) } -QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos) +QString Daily::getStatisticsInfo(Day * day) { + if (!day) return QString(); - QList list; - - list.push_back(cpap); - list.push_back(oxi); - list.push_back(pos); + Machine *cpap = day->machine(MT_CPAP), + *oxi = day->machine(MT_OXIMETER), + *pos = day->machine(MT_POSITION); int mididx=p_profile->general->prefCalcMiddle(); @@ -1235,73 +1237,65 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos) int ccnt=0; EventDataType tmp,med,perc,mx,mn; - QList::iterator di; + for (int i=0;ichannelHasData(code)) continue; - for (int i=0;ichannelHasData(code)) - continue; - - QString tooltip=schema::channel[code].description(); - - if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")"; - - if (ST_max == ST_MAX) { - mx=day->Max(code); - } else { - mx=day->percentile(code,maxperc); - } - - mn=day->Min(code); - perc=day->percentile(code,percentile); - - if (ST_mid == ST_PERC) { - med=day->percentile(code,0.5); - tmp=day->wavg(code); - if (tmp>0 || mx==0) { - tooltip+=QString("
"+STR_TR_WAvg+": %1").arg(tmp,0,'f',2); - } - } else if (ST_mid == ST_WAVG) { - med=day->wavg(code); - tmp=day->percentile(code,0.5); - if (tmp>0 || mx==0) { - tooltip+=QString("
"+STR_TR_Median+": %1").arg(tmp,0,'f',2); - } - } else if (ST_mid == ST_AVG) { - med=day->avg(code); - tmp=day->percentile(code,0.5); - if (tmp>0 || mx==0) { - tooltip+=QString("
"+STR_TR_Median+": %1").arg(tmp,0,'f',2); - } - } - - html+=QString("") - .arg(schema::channel[code].label()) - .arg(mn,0,'f',2) - .arg(med,0,'f',2) - .arg(perc,0,'f',2) - .arg(mx,0,'f',2) - .arg(tooltip); - ccnt++; + if (ST_max == ST_MAX) { + mx=day->Max(code); + } else { + mx=day->percentile(code,maxperc); } + + mn=day->Min(code); + perc=day->percentile(code,percentile); + + if (ST_mid == ST_PERC) { + med=day->percentile(code,0.5); + tmp=day->wavg(code); + if (tmp>0 || mx==0) { + tooltip+=QString("
"+STR_TR_WAvg+": %1").arg(tmp,0,'f',2); + } + } else if (ST_mid == ST_WAVG) { + med=day->wavg(code); + tmp=day->percentile(code,0.5); + if (tmp>0 || mx==0) { + tooltip+=QString("
"+STR_TR_Median+": %1").arg(tmp,0,'f',2); + } + } else if (ST_mid == ST_AVG) { + med=day->avg(code); + tmp=day->percentile(code,0.5); + if (tmp>0 || mx==0) { + tooltip+=QString("
"+STR_TR_Median+": %1").arg(tmp,0,'f',2); + } + } + + html+=QString("") + .arg(schema::channel[code].label()) + .arg(mn,0,'f',2) + .arg(med,0,'f',2) + .arg(perc,0,'f',2) + .arg(mx,0,'f',2) + .arg(tooltip); + ccnt++; + } - if (GraphView->isEmpty() && ((ccnt>0) || (cpap && cpap->summaryOnly()))) { + if (GraphView->isEmpty() && ((ccnt>0) || (cpap && day->summaryOnly()))) { html+="\n"; html+=QString("").arg(""+STR_MessageBox_PleaseNote+" "+ tr("This day just contains summary data, only limited information is available .")); } else if (cpap) { html+=""; - if ((cpap->machine->loaderName() == STR_MACH_ResMed) || ((cpap->machine->loaderName() == STR_MACH_PRS1) && (p_profile->cpap->resyncFromUserFlagging()))) { - int ttia = cpap->sum(CPAP_Obstructive) + cpap->sum(CPAP_ClearAirway) + cpap->sum(CPAP_Apnea) + cpap->sum(CPAP_Hypopnea); + if ((cpap->loaderName() == STR_MACH_ResMed) || ((cpap->loaderName() == STR_MACH_PRS1) && (p_profile->cpap->resyncFromUserFlagging()))) { + int ttia = day->sum(CPAP_Obstructive) + day->sum(CPAP_ClearAirway) + day->sum(CPAP_Apnea) + day->sum(CPAP_Hypopnea); int h = ttia / 3600; int m = ttia / 60 % 60; int s = ttia % 60; @@ -1311,28 +1305,31 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos) } } + float hours = day->hours(MT_CPAP); if (p_profile->cpap->showLeakRedline()) { - float rlt = cpap->timeAboveThreshold(CPAP_Leak, p_profile->cpap->leakRedline()) / 60.0; - float pc = 100.0 / cpap->hours() * rlt; + float rlt = day->timeAboveThreshold(CPAP_Leak, p_profile->cpap->leakRedline()) / 60.0; + float pc = 100.0 / hours * rlt; html+="").arg(pc, 0, 'f', 3); } - int l = cpap->sum(CPAP_Ramp); + int l = day->sum(CPAP_Ramp); if (l > 0) { html+="").arg(l / 3600, 2, 10, QChar('0')).arg((l / 60) % 60, 2, 10, QChar('0')).arg(l % 60, 2, 10, QChar('0')); - float v = (cpap->hours() - (float(l) / 3600.0)); + float v = (hours - (float(l) / 3600.0)); int q = v * 3600.0; html+="").arg(q / 3600, 2, 10, QChar('0')).arg((q / 60) % 60, 2, 10, QChar('0')).arg(q % 60, 2, 10, QChar('0')); - EventDataType hc = cpap->count(CPAP_Hypopnea) - cpap->countInsideSpan(CPAP_Ramp, CPAP_Hypopnea); - EventDataType oc = cpap->count(CPAP_Obstructive) - cpap->countInsideSpan(CPAP_Ramp, CPAP_Obstructive); + EventDataType hc = day->count(CPAP_Hypopnea) - day->countInsideSpan(CPAP_Ramp, CPAP_Hypopnea); + EventDataType oc = day->count(CPAP_Obstructive) - day->countInsideSpan(CPAP_Ramp, CPAP_Obstructive); - EventDataType tc = cpap->count(CPAP_Hypopnea) + cpap->count(CPAP_Obstructive); + EventDataType tc = day->count(CPAP_Hypopnea) + day->count(CPAP_Obstructive); EventDataType ahi = (hc+oc) / v; + // Not sure if i was trying to be funny, and left on my replication of Devilbiss's bug here... :P + html+="").arg(ahi, 0, 'f', 2); } @@ -1355,17 +1352,14 @@ QString Daily::getEventBreakdown(Day * cpap) return html; } -QString Daily::getSleepTime(Day * cpap, Day * oxi) +QString Daily::getSleepTime(Day * day) { + //cpap, Day * oxi QString html; - Day * day=nullptr; - if (cpap && cpap->hours()>0) - day=cpap; - else if (oxi && oxi->hours()>0) - day=oxi; - else + if (!day || (day->hours() < 0.0000001)) return html; + html+="
"; - html+=tr("PAP Mode: %1
").arg(cpap->getCPAPMode()); - html+= cpap->getPressureSettings(); + html+=tr("PAP Mode: %1
").arg(day->getCPAPMode()); + html+= day->getPressureSettings(); html+="
 
%1
%1%6%2%3%4%5
%1%6%2%3%4%5
 
%1
 
"+tr("Time over leak redline")+ QString("%1%
"+tr("Total ramp time")+ QString("%1:%2:%3
"+tr("Time outside of ramp")+ QString("%1:%2:%3
"+tr("AHI excluding ramp")+ QString("%1
\n"; html+=""; int tt=qint64(day->total_time())/1000L; @@ -1392,38 +1386,46 @@ void Daily::Load(QDate date) { dateDisplay->setText(""+date.toString(Qt::SystemLocaleLongDate)+""); previous_date=date; - Day *cpap=p_profile->GetDay(date,MT_CPAP); - Day *oxi=p_profile->GetDay(date,MT_OXIMETER); - Day *stage=p_profile->GetDay(date,MT_SLEEPSTAGE); - Day *posit=p_profile->GetDay(date,MT_POSITION); + + Day * day = p_profile->GetDay(date); + Machine *cpap = nullptr, + *oxi = nullptr, + *stage = nullptr, + *posit = nullptr; + + if (day) { + cpap = day->machine(MT_CPAP); + oxi = day->machine(MT_OXIMETER); + stage = day->machine(MT_SLEEPSTAGE); + posit = day->machine(MT_POSITION); + } if (!p_profile->session->cacheSessions()) { // Getting trashed on purge last day... // lastcpapday can get purged and be invalid - - - if (lastcpapday && (lastcpapday!=cpap)) { + if (lastcpapday && (lastcpapday!=day)) { for (QList::iterator s=lastcpapday->begin();s!=lastcpapday->end();++s) { (*s)->TrashEvents(); } } } - if ((cpap && oxi) && oxi->hasEnabledSessions()) { - int gr; + // Don't really see a point in unlinked oximetery sessions anymore... All I can say is BLEH... +// if ((cpap && oxi) && day->hasEnabledSessions(MT_OXIMETER)) { +// int gr; - if (qAbs(cpap->first() - oxi->first())>30000) { - mainwin->Notify(tr("Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked."),"",3000); - gr=1; - } else - gr=0; +// if (qAbs(day->first(MT_CPAP) - day->first(MT_OXIMETER)) > 30000) { +// mainwin->Notify(tr("Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked."),"",3000); +// gr=1; +// } else +// gr=0; - (*GraphView)[schema::channel[OXI_Pulse].code()]->setGroup(gr); - (*GraphView)[schema::channel[OXI_SPO2].code()]->setGroup(gr); - (*GraphView)[schema::channel[OXI_Plethy].code()]->setGroup(gr); - } - lastcpapday=cpap; +// (*GraphView)[schema::channel[OXI_Pulse].code()]->setGroup(gr); +// (*GraphView)[schema::channel[OXI_SPO2].code()]->setGroup(gr); +// (*GraphView)[schema::channel[OXI_Plethy].code()]->setGroup(gr); +// } + lastcpapday=day; QString html="
"+STR_TR_Date+""+tr("Sleep")+""+tr("Wake")+""+STR_UNIT_Hours+"