From 0e4fff46628158c1f5ead71d32c44404ecd4f1e0 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 25 Nov 2011 07:19:45 +1000 Subject: [PATCH] Pack oximetry waveforms --- SleepLib/event.h | 1 + docs/release_notes.html | 23 ++++++------ mainwindow.h | 2 +- oximetry.cpp | 80 ++++++++++++++++++++++++++++++++--------- oximetry.h | 4 ++- 5 files changed, 79 insertions(+), 31 deletions(-) diff --git a/SleepLib/event.h b/SleepLib/event.h index 4ce238c5..3d50b265 100644 --- a/SleepLib/event.h +++ b/SleepLib/event.h @@ -37,6 +37,7 @@ public: inline qint64 duration() { return m_last-m_first; } void setFirst(qint64 val) { m_first=val; } void setLast(qint64 val) { m_last=val; } + void setType(EventListType type) { m_type=type; } void setGain(EventDataType v) { m_gain=v; } void setOffset(EventDataType v) { m_offset=v; } diff --git a/docs/release_notes.html b/docs/release_notes.html index 8863c0a5..7ab29579 100644 --- a/docs/release_notes.html +++ b/docs/release_notes.html @@ -1,33 +1,30 @@ -

SleepyHead v0.8.7

+

SleepyHead v0.8.8

Please Note: This is still pre-Beta software. Expect bugs.

Release Notes

-

I've been a little less functional that usual since last time (fog, headaches, appendicitus, etc.. bleh), -however, I have still managed to cook up a few nice improvements...

+

Getting closer..

What's New?
-

  • You can now Shift+Left Click on a day in an overview graph, and it will jump to that day in Daily tab.
    • -
  • New calendar navigation bar allows easy hiding the calendar to get more room.
    • -
  • Event count, duration and (relative) AHI is displayed above the flow rate waveform for selected area.
    • -
  • Improved support for ResMed S9 ASV/VPAP Machines.
    • -
  • Added some basic CSV export capabilities (File Menu->Export).
    • -
  • A new preference option to switch some daily graphs between square plots and normal line plots.
    • -
  • Some graphing optimizations to improve performance.
    • +
  • Intellipap Support
    • +
  • Complete rewrite of Oximetery Tab, it's now (hopefully) working much better
    • +
  • Sync problems with Live serial CMS50 recording fixed.
    • +
  • Preference option to Skip Login Window
    • +
  • Can change how much data is shown around events selected in the Event List.
    • +
  • Import now remembers your locations.. There is a preferences tab to edit common locations
  • Quite a few other little bugfixes I've forgotten about.

    • What's still missing/broken?
    -
  • Oximetry.. still mostly broken. I will eventually get around to it...
  • Daily report printing still needs doing.
  • Plenty more I'm sure of it..

    • Problems & Stuff?
    -If I've still missed your bug, my appologies, I'm not deliberately ignoring you, I'm just rather darn forgetful and need reminding.

    +

    SourceForge is still the best place to report bugs, especially to do with these binary builds. If your following GIT source, they mailing list is (usually) much quicker in getting my attention.

    -

    Note: If you experience a crash right after starting, you may need to manually remove the "SleepApp" folder, which resides under your documents directory.

    +

    Note: If you experience a crash right after starting this new version, you may need to manually remove the old "SleepApp" folder, which resides under your documents directory.

    Thanks
    Thanks to all the wonderful people who have given their support to this project, be it via donations, sharing CPAP data, following GIT source tree, testing binary builds, submitting bug reports, giving ideas for improvement, and general feedback on the CPAP forums.

    diff --git a/mainwindow.h b/mainwindow.h index b2237a00..0a2e8981 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -21,7 +21,7 @@ const int major_version=0; const int minor_version=8; -const int revision_number=7; +const int revision_number=8; extern Profile * profile; diff --git a/oximetry.cpp b/oximetry.cpp index 587275e1..456553c2 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -158,10 +158,24 @@ void SerialOximeter::onReadyRead() void SerialOximeter::addPulse(qint64 time, EventDataType pr) { + EventDataType min=0,max=0; + if (pr>0) { + if (prmin()) + min=pr; + if (pr>pulse->max()) + max=pr; + } + pulse->AddEvent(time,pr); session->setCount(OXI_Pulse,pulse->count()); // update the cache - session->setMin(OXI_Pulse,pulse->min()); - session->setMax(OXI_Pulse,pulse->max()); + if (min>0) { + pulse->setMin(min); + session->setMin(OXI_Pulse,min); + } + if (max>0) { + pulse->setMax(max); + session->setMax(OXI_Pulse,max); + } session->setLast(OXI_Pulse,time); pulse->setLast(time); session->set_last(lasttime); @@ -170,10 +184,23 @@ void SerialOximeter::addPulse(qint64 time, EventDataType pr) void SerialOximeter::addSpO2(qint64 time, EventDataType o2) { + EventDataType min=0,max=0; + if (o2>0) { + if (o2min()) + min=o2; + if (o2>spo2->max()) + max=o2; + } spo2->AddEvent(time,o2); session->setCount(OXI_SPO2,spo2->count()); // update the cache - session->setMin(OXI_SPO2,spo2->min()); - session->setMax(OXI_SPO2,spo2->max()); + if (min>0) { + spo2->setMin(min); + session->setMin(OXI_SPO2,min); + } + if (max>0) { + spo2->setMax(max); + session->setMax(OXI_SPO2,max); + } session->setLast(OXI_SPO2,time); session->set_last(lasttime); spo2->setLast(time); @@ -190,6 +217,24 @@ void SerialOximeter::addPlethy(qint64 time, EventDataType pleth) session->set_last(lasttime); plethy->setLast(time); } +void SerialOximeter::compactEventList(EventList *el) +{ + double rate=double(el->duration())/double(el->count()); + el->setType(EVL_Waveform); + el->setRate(rate); + el->getTime().clear(); +} + +void SerialOximeter::compactAll() +{ + QHash >::iterator i; + + for (i=session->eventlist.begin();i!=session->eventlist.end();i++) { + for (int j=0;jmin()min(); if (pulse->max()>plmax) plmax=pulse->max(); plcnt+=pulse->count(); + compactEventList(pulse); // converts to waveform.. + pulse=new EventList(EVL_Event); session->eventlist[OXI_Pulse].push_back(pulse); } - } else pulse->AddEvent(lasttime,pl); + } else { + pulse->AddEvent(lasttime,pl); + } if (o2==0) { if (lasto2!=o2) { spo2->setLast(lasttime); if (spo2->min()min(); if (spo2->max()>o2max) o2max=spo2->max(); o2cnt+=spo2->count(); + compactEventList(spo2); // convert to waveform spo2=new EventList(EVL_Event); session->eventlist[OXI_SPO2].push_back(spo2); } - } else spo2->AddEvent(lasttime,o2); - + } else { + spo2->AddEvent(lasttime,o2); + } lasttime+=1000; emit(updateProgress(float(i)/float(size))); @@ -345,6 +397,7 @@ void CMS50Serial::onReadyRead() int size=bytes.size(); // Process all incoming serial data packets unsigned char c; + unsigned char pl,o2; while (i=datasize) { - - } */ } else { if (bytes[i]&0x80) { // 0x80 == sync bit EventDataType d=bytes[i+1] & 0x7f; @@ -436,8 +483,10 @@ void CMS50Serial::onReadyRead() lasttime+=20; i+=3; } else { - addPulse(lasttime,bytes[i]); - addSpO2(lasttime,bytes[i+1]); + pl=bytes[i]; + o2=bytes[i+1]; + addPulse(lasttime,pl); + addSpO2(lasttime,o2); i+=2; } } @@ -873,7 +922,6 @@ void Oximetry::on_saveButton_clicked() if (QMessageBox::question(this,"Keep This Recording?","A save dialog will go here allowing you to edit parameters for this oximetry session..\nFor now, would you like to save this as is?",QMessageBox::Yes|QMessageBox::No)==QMessageBox::Yes) { Session *session=oximeter->getSession(); // Process??? - session->UpdateSummaries(); oximeter->getMachine()->AddSession(session,p_profile); oximeter->getMachine()->Save(); diff --git a/oximetry.h b/oximetry.h index f71c0c05..bf51774a 100644 --- a/oximetry.h +++ b/oximetry.h @@ -41,7 +41,9 @@ public: Session *createSession(); Session * getSession() { return session; } - Session * takeSession() { Session * s=session; session=NULL; return s; } + + void compactEventList(EventList *e); + void compactAll(); void setPortName(QString portname); void setBaudRate(BaudRateType baud);