diff --git a/daily.ui b/daily.ui index 8016e52c..f7e985e8 100644 --- a/daily.ui +++ b/daily.ui @@ -492,6 +492,9 @@ + + QFormLayout::AllNonFixedFieldsGrow + 4 @@ -510,7 +513,7 @@ 2 - + @@ -531,7 +534,7 @@ - + @@ -567,7 +570,7 @@ - + 50 @@ -590,7 +593,7 @@ - + @@ -612,23 +615,7 @@ - - - - - 0 - 0 - - - - B.M.I. - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -650,18 +637,21 @@ - - - - Qt::Horizontal + + + + + 0 + 0 + - - - 40 - 20 - + + B.M.I. - + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + diff --git a/docs/index.html b/docs/index.html index cd3ba6ac..17958ca3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -3,6 +3,8 @@ @@ -11,7 +13,7 @@ p,a,td,body { font-size: 14px }

This software is currently being designed to assist you in reviewing data for your CPAP Machine, Oximeter, and Sleep Stage monitors, as well as help you track general issues related to sleep health.

-

This is a developer preview, features are missing and bugs will be plentyful.

+

This is STILL a developer preview, features are missing and bugs will be plentyful.

Currenly supports the following machines:

CPAP
  • Philips Respironics System One
    • @@ -23,11 +25,10 @@ p,a,td,body { font-size: 14px } (It doesn't support SSL encryption.)

    -Here is a link to the SleepyHead Wiki
    -Here are the release notes for this version, in case you missed them.
    +Here is the SleepyHead Wiki
    +Here are the release notes for this version.
    Plus a few usage notes, and some important information for Mac users.
    SleepyHead's Project Website on SourceForge

    -

    The authors' boring and neglected Personal Blog

    About Sleep Apnea on Wikipedia

    Friendly forums to talk and learn about Sleep Apnea:
    CPAPTalk Forum, diff --git a/docs/release_notes.html b/docs/release_notes.html index 9578b8bf..2cb83892 100644 --- a/docs/release_notes.html +++ b/docs/release_notes.html @@ -2,30 +2,47 @@

    SleepyHead v0.8.8

    -

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

    +

    Please Note: This is STILL pre-Beta software. Expect bugs. but less than before :)

    Release Notes

    -

    Getting closer..

    +

    Getting a lot more substantial...

    -

    What's New?
    -

  • Intellipap Support
    • -
  • Print Support in Daily View, Overview and Oximetry
    • -
  • New Graph tab in Preferences for changing individual graph settings, visibility, etc.
    • -
  • New Respiratory Rate, Tidal Volume and Minute Ventilation graphs for PRS1 users.
    • -
  • Complete rewrite of Oximetery Tab, it's now (hopefully) working much better
    • -
  • Oximetry PulseChange & SPO2Drop event flagging.. (Options in Preferences)
    • +

    Oximetry Special
    +

  • Complete rewrite of Oximetery Tab, it's now (hopefully) working much better.
    • +
  • If you start the oximeters record mode and switch on CPAP at exactly the same time, you can now get reasonable sync without needing the USB cable, provided you import your CPAP data before oximetry.
    • +
  • Oximetry PulseChange & SPO2Drop event flagging.. (Options in Preferences) +
  • A re-indexing feature to re-apply different flagging rules without messing up imported oximetry data.
  • Clock problems with Live serial CMS50 recording fixed.
    • -
  • Import now remembers your locations.. There is a preferences tab to edit common locations
    • -
  • Can now change how much data is shown around events selected in the Event List.
    • + +

    Note: Nothing has been done to the SpO2Review importer module.

    + +

    What else's New?
    +

  • DeVilbiss Intellipap Support.. not perfect yet, but needs testing..
    • +
  • New Graph tab in Preferences for changing individual graph settings, visibility, etc.
    • +
  • Graph settings are now persistant.. It will remember sizes and graph orders for you.
    • +
  • Rewritten Print Support. Can now print reports in Daily View, Overview and Oximetry. You can hide graphs you don't want to print.
    • +
  • New Respiratory Rate, Tidal Volume and Minute Ventilation graphs for PRS1 users, extracted from the flow waveform.
    • +
  • Bookmark feature for daily view, each day has it's own set of bookmarks.
    • +
  • Weight, BMI calcs, and Zombie-Meter added to Daily View's Notes tab.. Plus related Overview Graphs.
    • +
  • Daily View's Details panel has a few useful tooltips (showing description & units) and some clickable links.
    • +
  • Import now offers to remember your locations.. There is a preferences area to edit this list.
    • +
  • Can now change how much data is shown around events selected in the Event List, by dragging the slider underneath.
  • Preference option to Skip Login Window
    • +
  • Change User (logout) option in the File menu
  • Quite a few other little bugfixes I've forgotten about.
    • + +NOTE: For best results, start fresh this time by deleting your SleepApp folder (which is in your Documents directory) otherwise unpredictable things can happen.. + +There has simply been too many changes this time to keep up with the old data format.. +
    What's still missing/broken?
    -
  • Plenty of bugs, I'm sure of it..
    • +
  • The printed reports still need some details and fine tuning.
    • +
  • The mask tab in preferences is just a placeholder for future calculations
    • +
  • Plenty of bugs. there's a lot of new code this time..

    • Problems & Stuff?
    -

    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 this new version, you may need to manually remove the old "SleepApp" folder, which resides under your documents directory.

    Thanks
    diff --git a/newprofile.ui b/newprofile.ui index e30f98e8..9da50078 100644 --- a/newprofile.ui +++ b/newprofile.ui @@ -24,7 +24,7 @@ - 0 + 2 @@ -56,11 +56,6 @@ English - - - Klingon - - diff --git a/overview.cpp b/overview.cpp index 39abb6f1..b108477b 100644 --- a/overview.cpp +++ b/overview.cpp @@ -110,6 +110,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : PULSE=createGraph("Pulse Rate"); SPO2=createGraph("SpO2"); WEIGHT=createGraph("Weight"); + BMI=createGraph("BMI"); ZOMBIE=createGraph("Zombie"); weight=new SummaryChart("Weight",GT_LINE); @@ -117,6 +118,11 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : weight->addSlice("Weight",QColor("black"),ST_SETAVG); WEIGHT->AddLayer(weight); + bmi=new SummaryChart("B.M.I.",GT_LINE); + bmi->setMachineType(MT_JOURNAL); + bmi->addSlice("BMI",QColor("dark blue"),ST_SETAVG); + BMI->AddLayer(bmi); + zombie=new SummaryChart("Zombie Meter",GT_LINE); zombie->setMachineType(MT_JOURNAL); zombie->addSlice("ZombieMeter",QColor("dark red"),ST_SETAVG); diff --git a/overview.h b/overview.h index d374344f..1b4baf6b 100644 --- a/overview.h +++ b/overview.h @@ -37,8 +37,8 @@ public: void PrintReport(); - gGraph *AHI,*UC, *US, *PR,*LK,*NPB,*SET,*SES,*RR,*MV,*TV,*PTB,*PULSE,*SPO2,*WEIGHT,*ZOMBIE; - SummaryChart *bc,*uc, *us, *pr,*lk,*npb,*set,*ses,*rr,*mv,*tv,*ptb,*pulse,*spo2,*weight,*zombie; + gGraph *AHI,*UC, *US, *PR,*LK,*NPB,*SET,*SES,*RR,*MV,*TV,*PTB,*PULSE,*SPO2,*WEIGHT,*ZOMBIE, *BMI; + SummaryChart *bc,*uc, *us, *pr,*lk,*npb,*set,*ses,*rr,*mv,*tv,*ptb,*pulse,*spo2,*weight,*zombie, *bmi; QVector OverviewCharts; public slots: diff --git a/oximetry.cpp b/oximetry.cpp index a19190cc..b6b9d9db 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -493,11 +493,13 @@ void CMS50Serial::ReadyRead() if (!import_mode) { QString data="Read: "; +#ifdef SERIAL_DEBUG for (int i=0;iisActive()) { @@ -753,10 +755,8 @@ Oximetry::Oximetry(QWidget *parent,gGraphView * shared) : spo2=new gLineChart(OXI_SPO2,Qt::blue,true); //spo2->SetDay(day); - PLETHY->AddLayer(plethy); - PULSE->AddLayer(lo1=new gLineOverlayBar(OXI_PulseChange,QColor("light gray"),"PD",FT_Span)); SPO2->AddLayer(lo2=new gLineOverlayBar(OXI_SPO2Drop,QColor("light blue"),"O2",FT_Span)); PULSE->AddLayer(pulse); diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 89e68fd0..7218016b 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -38,7 +38,7 @@ - 4 + 0 @@ -600,7 +600,7 @@ Mask Leak Profiles - This doesn't work yet.. + This doesn't save yet...