mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 18:50:44 +00:00
BMI Overview chart, release notes/welcome page updates
This commit is contained in:
Mark Watkins
parent
b6ba491feb
commit
0d484d78e7
52
daily.ui
52
daily.ui
@ -492,6 +492,9 @@
|
||||
<item>
|
||||
<widget class="QWidget" name="widget" native="true">
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<property name="fieldGrowthPolicy">
|
||||
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
||||
</property>
|
||||
<property name="horizontalSpacing">
|
||||
<number>4</number>
|
||||
</property>
|
||||
@ -510,7 +513,7 @@
|
||||
<property name="bottomMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<item row="2" column="0" colspan="2">
|
||||
<item row="0" column="0" colspan="2">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
@ -531,7 +534,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" colspan="7">
|
||||
<item row="0" column="1" colspan="6">
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="font">
|
||||
<font>
|
||||
@ -567,7 +570,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="9">
|
||||
<item row="1" column="0" colspan="8">
|
||||
<widget class="QSlider" name="ZombieMeter">
|
||||
<property name="value">
|
||||
<number>50</number>
|
||||
@ -590,7 +593,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="8">
|
||||
<item row="0" column="7">
|
||||
<widget class="QLabel" name="label_10">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
@ -612,23 +615,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="4">
|
||||
<widget class="QLabel" name="BMIlabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>B.M.I.</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="5" colspan="2">
|
||||
<item row="2" column="7">
|
||||
<widget class="QLCDNumber" name="BMI">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Minimum">
|
||||
@ -650,18 +637,21 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="7" colspan="2">
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
<item row="2" column="4" colspan="3">
|
||||
<widget class="QLabel" name="BMIlabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
<property name="text">
|
||||
<string>B.M.I.</string>
|
||||
</property>
|
||||
</spacer>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
<style type='text/css'>
|
||||
<!--h1,p,a,td,body { font-family: 'FreeSans', 'Sans Serif' } --/>
|
||||
p,a,td,body { font-size: 14px }
|
||||
a:link,a:visited { color: "#000020"; text-decoration: none; font-weight: bold;}
|
||||
a:hover { background-color: inherit; color: red; text-decoration:none; font-weight: bold; }
|
||||
</style>
|
||||
</head>
|
||||
<body leftmargin=0 topmargin=0 rightmargin=0>
|
||||
@ -11,7 +13,7 @@ p,a,td,body { font-size: 14px }
|
||||
<tr>
|
||||
<td valign="top" leftmargin=0 cellpadding=6>
|
||||
<p>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 <i>track</i> general issues related to sleep health.</p>
|
||||
<p><i><b>This is a developer preview, features are missing and bugs will be plentyful.</b></i></p>
|
||||
<p><i><b>This is STILL a developer preview, features are missing and bugs will be plentyful.</b></i></p>
|
||||
<p>Currenly supports the following machines:</p>
|
||||
<b>CPAP</b>
|
||||
<li>Philips Respironics System One</li>
|
||||
@ -23,11 +25,10 @@ p,a,td,body { font-size: 14px }
|
||||
(It doesn't support SSL encryption.)</p>
|
||||
|
||||
<p>
|
||||
Here is a link to the <a href="http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Main_Page">SleepyHead Wiki</a><br/>
|
||||
Here are the <a href='qrc:/docs/release_notes.html'>release notes</a> for this version, in case you missed them.<br/>
|
||||
Here is the <a href="http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Main_Page">SleepyHead Wiki</a><br/>
|
||||
Here are the <a href='qrc:/docs/release_notes.html'>release notes</a> for this version.<br/>
|
||||
Plus a few <a href='qrc:/docs/usage.html'>usage notes</a>, and some important information for Mac users.<br/>
|
||||
SleepyHead's <a href='http://www.sourceforge.net/projects/sleepyhead'>Project Website</a> on SourceForge</p>
|
||||
<p>The authors' boring and neglected <a href='http://jedimark64.blogspot.com'>Personal Blog</a></p>
|
||||
<p>About <a href='http://en.wikipedia.org/wiki/Sleep_apnea'>Sleep Apnea</a> on Wikipedia</p>
|
||||
<p>Friendly forums to talk and learn about Sleep Apnea:<br/>
|
||||
<a href='http://www.cpaptalk.com'>CPAPTalk Forum</a>,
|
||||
|
||||
@ -2,30 +2,47 @@
|
||||
<body>
|
||||
<h1><image src='qrc:/docs/sheep.png' width=64 height=64>SleepyHead v0.8.8</h1>
|
||||
|
||||
<p><b>Please Note:</b> <i>This is still pre-Beta software. Expect bugs.</i></p>
|
||||
<p><b>Please Note:</b> <i>This is STILL pre-Beta software. Expect bugs. but less than before :)</i></p>
|
||||
|
||||
<p><h2><b>Release Notes</b></h2></p>
|
||||
|
||||
<p>Getting closer..</p>
|
||||
<p>Getting a lot more substantial...</p>
|
||||
|
||||
<p><b>What's New?</b><br/>
|
||||
<li>Intellipap Support</li>
|
||||
<li>Print Support in Daily View, Overview and Oximetry</li>
|
||||
<li>New Graph tab in Preferences for changing individual graph settings, visibility, etc.</li>
|
||||
<li>New Respiratory Rate, Tidal Volume and Minute Ventilation graphs for PRS1 users.</li>
|
||||
<li>Complete rewrite of Oximetery Tab, it's now (hopefully) working much better</li>
|
||||
<li>Oximetry PulseChange & SPO2Drop event flagging.. (Options in Preferences)</li>
|
||||
<p><b>Oximetry Special</b></br>
|
||||
<li>Complete rewrite of Oximetery Tab, it's now (hopefully) working much better.</li>
|
||||
<li>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 <b>import your CPAP data before oximetry.</b></li>
|
||||
<li>Oximetry PulseChange & SPO2Drop event flagging.. (Options in Preferences)
|
||||
<li>A re-indexing feature to re-apply different flagging rules without messing up imported oximetry data.</li>
|
||||
<li>Clock problems with Live serial CMS50 recording fixed.</li>
|
||||
<li>Import now remembers your locations.. There is a preferences tab to edit common locations</li>
|
||||
<li>Can now change how much data is shown around events selected in the Event List.</li>
|
||||
|
||||
<p>Note: Nothing has been done to the SpO2Review importer module.</p>
|
||||
|
||||
<p><b>What else's New?</b><br/>
|
||||
<li>DeVilbiss Intellipap Support.. not perfect yet, but needs testing..</li>
|
||||
<li>New Graph tab in Preferences for changing individual graph settings, visibility, etc.</li>
|
||||
<li>Graph settings are now persistant.. It will remember sizes and graph orders for you.</li>
|
||||
<li>Rewritten Print Support. Can now print reports in Daily View, Overview and Oximetry. You can hide graphs you don't want to print.</li>
|
||||
<li>New Respiratory Rate, Tidal Volume and Minute Ventilation graphs for PRS1 users, extracted from the flow waveform.</li>
|
||||
<li>Bookmark feature for daily view, each day has it's own set of bookmarks.</li>
|
||||
<li>Weight, BMI calcs, and Zombie-Meter added to Daily View's Notes tab.. Plus related Overview Graphs.</li>
|
||||
<li>Daily View's Details panel has a few useful tooltips (showing description & units) and some clickable links.</li>
|
||||
<li>Import now offers to remember your locations.. There is a preferences area to edit this list.</li>
|
||||
<li>Can now change how much data is shown around events selected in the Event List, by dragging the slider underneath.</li>
|
||||
<li>Preference option to Skip Login Window</li>
|
||||
<li>Change User (logout) option in the File menu</li>
|
||||
<li>Quite a few other little bugfixes I've forgotten about.</li>
|
||||
|
||||
<b>NOTE:</b> For best results, <b>start fresh this time by deleting your SleepApp folder</b> (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..
|
||||
|
||||
<br/>
|
||||
<b>What's still missing/broken?</b><br/>
|
||||
<li>Plenty of bugs, I'm sure of it..</li>
|
||||
<li>The printed reports still need some details and fine tuning.</li>
|
||||
<li>The mask tab in preferences is just a placeholder for future calculations</li>
|
||||
<li>Plenty of bugs. there's a lot of new code this time..</li>
|
||||
</p>
|
||||
<p><b>Problems & Stuff?</b><br/>
|
||||
|
||||
<p>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.</p>
|
||||
<p><b>Note:</b> 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.</p>
|
||||
<p><b>Thanks</b><br/>
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
<item>
|
||||
<widget class="QStackedWidget" name="stackedWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>2</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="welcomePage">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_8">
|
||||
@ -56,11 +56,6 @@
|
||||
<string>English</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Klingon</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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<SummaryChart *> OverviewCharts;
|
||||
|
||||
public slots:
|
||||
|
||||
@ -493,11 +493,13 @@ void CMS50Serial::ReadyRead()
|
||||
|
||||
if (!import_mode) {
|
||||
QString data="Read: ";
|
||||
#ifdef SERIAL_DEBUG
|
||||
for (int i=0;i<bytes.size();i++) {
|
||||
c=bytes[i];
|
||||
data+=QString().sprintf("%02X,",c);
|
||||
}
|
||||
qDebug() << data;
|
||||
#endif
|
||||
if (bytes.size()==1) { // transmits a single 0 when switching off.
|
||||
if (lastbytesize!=1) {
|
||||
if (timer->isActive()) {
|
||||
@ -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);
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>4</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="importTab">
|
||||
<attribute name="title">
|
||||
@ -600,7 +600,7 @@ Mask Leak Profiles
|
||||
<item>
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>This doesn't work yet..</string>
|
||||
<string>This doesn't save yet...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user