diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index a4e80160..373d35eb 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -861,12 +861,14 @@ bool gGraphView::renderGraphs(QPainter &painter) if ((m_graphs.size() > 1) && m_showsplitter) { // draw the splitter handle - painter.setPen(QColor(158,158,158,255)); - painter.drawLine(0, py + h, w, py + h); + painter.setPen(QColor(220, 220, 220, 255)); + painter.drawLine(0, py + h, w, py + h); + painter.setPen(QColor(158,158,158,255)); painter.drawLine(0, py + h + 1, w, py + h + 1); - painter.setPen(QColor(140, 140, 140, 255)); + painter.setPen(QColor(240, 240, 240, 255)); painter.drawLine(0, py + h + 2, w, py + h + 2); + } } diff --git a/sleepyhead/Graphs/gXAxis.cpp b/sleepyhead/Graphs/gXAxis.cpp index 1958b91d..583b74ec 100644 --- a/sleepyhead/Graphs/gXAxis.cpp +++ b/sleepyhead/Graphs/gXAxis.cpp @@ -337,7 +337,7 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion ®ion) } if (usepixmap && !m_image.isNull()) { - painter.drawImage(QPoint(left - 20, top + height - m_image.height() + 4), m_image); + painter.drawImage(QPoint(left - 20, top + height - m_image.height() + 5), m_image); } } diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp index 37b882f3..865468f2 100644 --- a/sleepyhead/SleepLib/common.cpp +++ b/sleepyhead/SleepLib/common.cpp @@ -276,6 +276,7 @@ QString STR_TR_Mode; QString STR_TR_Model; QString STR_TR_Brand; QString STR_TR_Serial; +QString STR_TR_Series; QString STR_TR_Machine; QString STR_TR_Channel; QString STR_TR_Settings; @@ -455,6 +456,7 @@ void initializeStrings() STR_TR_Model = QObject::tr("Model"); STR_TR_Brand = QObject::tr("Brand"); STR_TR_Serial = QObject::tr("Serial"); + STR_TR_Series = QObject::tr("Series"); STR_TR_Machine = QObject::tr("Machine"); STR_TR_Channel = QObject::tr("Channel"); STR_TR_Settings = QObject::tr("Settings"); diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h index 63ca5bde..a5129a3b 100644 --- a/sleepyhead/SleepLib/common.h +++ b/sleepyhead/SleepLib/common.h @@ -256,6 +256,7 @@ extern QString STR_TR_SleepyHead; extern QString STR_TR_Mode; extern QString STR_TR_Model; extern QString STR_TR_Brand; +extern QString STR_TR_Series; extern QString STR_TR_Serial; extern QString STR_TR_Machine; extern QString STR_TR_Channel; diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp index e4350176..f85ca3a9 100644 --- a/sleepyhead/SleepLib/day.cpp +++ b/sleepyhead/SleepLib/day.cpp @@ -55,6 +55,21 @@ void Day::AddSession(Session *s) sessions.push_back(s); } + +EventDataType Day::countInsideSpan(ChannelID span, ChannelID code) +{ + QList::iterator end = sessions.end(); + int count = 0; + for (QList::iterator it = sessions.begin(); it != end; ++it) { + Session &sess = *(*it); + + if (sess.enabled()) { + count += sess.countInsideSpan(span, code); + } + } + return count; +} + EventDataType Day::lookupValue(ChannelID code, qint64 time) { QList::iterator end = sessions.end(); diff --git a/sleepyhead/SleepLib/day.h b/sleepyhead/SleepLib/day.h index 9cf302dd..9ee34123 100644 --- a/sleepyhead/SleepLib/day.h +++ b/sleepyhead/SleepLib/day.h @@ -106,6 +106,10 @@ class Day //! \brief Returns the value for Channel code at a given time EventDataType lookupValue(ChannelID code, qint64 time); + //! \brief Returns the count of code events inside span flag event durations + EventDataType countInsideSpan(ChannelID span, ChannelID code); + + //! \brief Returns the first session time of this day qint64 first(); diff --git a/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp index aeafe27b..fab29605 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp @@ -548,6 +548,7 @@ bool CMS50Loader::readSpoRFile(QString path) QByteArray data; + qint64 filesize = file.size(); data = file.readAll(); QDataStream in(data); in.setByteOrder(QDataStream::LittleEndian); @@ -557,6 +558,7 @@ bool CMS50Loader::readSpoRFile(QString path) in.skipRawData(pos - 2); //long size = data.size(); + int bytes_per_record = 2; if (!spo2header) { // next is 0x0002 @@ -589,7 +591,7 @@ bool CMS50Loader::readSpoRFile(QString path) qWarning() << ".spo2 file" << path << "might be a different"; } - // Unknown cruft... + // Unknown cruft header... in.skipRawData(200); in >> year >> month >> day; @@ -601,18 +603,40 @@ bool CMS50Loader::readSpoRFile(QString path) pos += 0x1c + 200; in >> samples; + + int remainder = filesize - pos; + + bytes_per_record = remainder / samples; + qDebug() << samples << "samples of" << bytes_per_record << "bytes each"; + + // CMS50I .spo2 data have 4 digits, a 16bit, followed by spo2 then pulse + } oxirec = new QVector; oxisessions[m_startTime] = oxirec; unsigned char o2, pr; + quint16 un; // Read all Pulse and SPO2 data do { + if (bytes_per_record > 2) { + in >> un; + } in >> o2; in >> pr; - oxirec->append(OxiRecord(pr, o2)); + + if ((o2 == 0x7f) && (pr == 0xff)) { + o2 = pr = 0; + un = 0; + } + + if (spo2header) { + oxirec->append(OxiRecord(pr, o2)); + } else { + oxirec->append(OxiRecord(o2, pr)); + } } while (!in.atEnd()); diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp index 6ff876dd..4697c00e 100644 --- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp @@ -511,12 +511,16 @@ int IntellipapLoader::Open(QString path) if (sid) { sess = Sessions[sid]; + if (!sess) continue; - quint64 first = qint64(sid) * 1000L; +// quint64 first = qint64(sid) * 1000L; quint64 last = qint64(SessionEnd[i]) * 1000L; if (sess->last() > 0) { + sess->really_set_last(last); + + sess->settings[CPAP_PresReliefType] = (PRTypes)PR_SMARTFLEX; sess->settings[CPAP_PresReliefSet] = smartflex; diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index 002fb296..c10a7495 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -1308,6 +1308,61 @@ bool Session::channelExists(ChannelID id) return true; } +EventDataType Session::countInsideSpan(ChannelID span, ChannelID code) +{ + // TODO: Cache me! + + QHash >::iterator j = eventlist.find(span); + + if (j == eventlist.end()) { + return 0; + } + QVector &evec = j.value(); + + qint64 t1,t2; + + int evec_size=evec.size(); + + QList start; + QList end; + + // Simplify the span flags to start and end times list + for (int el = 0; el < evec_size; ++el) { + EventList &ev = *evec[el]; + + for (quint32 i=0; i < ev.count(); ++i) { + end.push_back(t2=ev.time(i)); + start.push_back(t2 - (qint64(ev.data(i)) * 1000L)); + } + } + + j = eventlist.find(code); + + if (j == eventlist.end()) { + return 0; + } + QVector &evec2 = j.value(); + evec_size=evec2.size(); + int count = 0; + + int spans = start.size(); + + for (int el = 0; el < evec_size; ++el) { + EventList &ev = *evec2[el]; + + for (quint32 i=0; i < ev.count(); ++i) { + t1 = ev.time(i); + for (int z=0; z < spans; ++z) { + if ((t1 >= start.at(z)) && (t1 <= end.at(z))) { + count++; + break; + } + } + } + } + return count; +} + EventDataType Session::rangeCount(ChannelID id, qint64 first, qint64 last) { QHash >::iterator j = eventlist.find(id); diff --git a/sleepyhead/SleepLib/session.h b/sleepyhead/SleepLib/session.h index 68ff75dc..9dee3084 100644 --- a/sleepyhead/SleepLib/session.h +++ b/sleepyhead/SleepLib/session.h @@ -224,6 +224,9 @@ class Session //! \brief Returns the maximum of events of type id between time range EventDataType rangeMax(ChannelID id, qint64 first, qint64 last); + //! \brief Returns the count of code events inside span flag event durations + EventDataType countInsideSpan(ChannelID span, ChannelID code); + //! \brief Returns (and caches) the Sum of all events of type id double sum(ChannelID id); diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 7e62f59d..dd612ca9 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -1166,14 +1166,23 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos) } if (cpap) { - int l = cpap->sum(CPAP_Ramp); + int l = cpap->sum(CPAP_Ramp) - (15*60); - if (l>0) { - int h = l / 3600; - int m = (l / 60) % 60; - int s = l % 60; - html+=""+tr("Time spent in ramp")+ - QString("%1:%2:%3").arg(h, 2, 10, QChar('0')).arg(m, 2, 10, QChar('0')).arg(s, 2, 10, QChar('0')); + if (l > 0) { + html+=""+tr("Total ramp time")+ + QString("%1:%2:%3").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)); + int q = v * 3600.0; + html+=""+tr("Time outside of ramp")+ + QString("%1:%2:%3").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 tc = cpap->count(CPAP_Hypopnea) + cpap->count(CPAP_Obstructive); + EventDataType ahi = (hc+oc) / (float(l)/3600.0); + html+=""+tr("AHI excluding ramp")+ + QString("%1").arg(ahi, 0, 'f', 2); } } diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index f96f4ec8..e47eafa6 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -1215,14 +1215,16 @@ QString Statistics::GenerateHTML() html += QString(""); html += ""; - html += ""; + html += ""; - html += QString("") + html += QString("") .arg(STR_TR_Brand) + .arg(STR_TR_Series) .arg(STR_TR_Model) .arg(STR_TR_Serial) .arg(tr("First Use")) - .arg(tr("Last Use")); + .arg(tr("Last Use")) + .arg(STR_TR_AHI); html += ""; @@ -1233,14 +1235,24 @@ QString Statistics::GenerateHTML() if (m->type() == MT_JOURNAL) { continue; } + QDate d1 = m->FirstDay(); + QDate d2 = m->LastDay(); + QString ahi; + if (m->type() == MT_CPAP) { + float a = calcAHI(d1,d2); + ahi = QString::number(a,'f',2); + } QString mn = m->modelnumber(); - html += QString("") + html += QString("") .arg(m->brand()) + .arg(m->series()) .arg(m->model() + (mn.isEmpty() ? "" : QString(" (") + mn + QString(")"))) .arg(m->serial()) - .arg(m->FirstDay().toString(Qt::SystemLocaleShortDate)) - .arg(m->LastDay().toString(Qt::SystemLocaleShortDate)); + .arg(d1.toString(Qt::SystemLocaleShortDate)) + .arg(d2.toString(Qt::SystemLocaleShortDate)) + .arg(ahi); + } html += "
" + tr("Machine Information") + "
" + tr("Machine Information") + "
%1%2%3%4%5
%1%2%3%4%5%6%7
%1%2%3%4%5
%1%2%3%4%5%6%7
";