chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added S9 ASV TgMV graph support

Browse Source
This commit is contained in:
Mark Watkins 2011-11-14 19:26:58 +10:00
parent a97ad48360
commit 9a2e48e0bb
6 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -726,20 +726,25 @@ bool ResmedLoader::LoadPLD(Session *sess,EDFParser &edf)
code=CPAP_MaskPressure;
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label.startsWith("Exp Press")) {
code=CPAP_EPAP;//ExpiratoryPressure;
code=CPAP_EPAP;//ExpiratoryPressure
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label.startsWith("I:E")) {
code=CPAP_IE;//I:E;
code=CPAP_IE;//I:E ratio?
a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate);
a->AddWaveform(edf.startdate,es.data,recs,duration);
//a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label.startsWith("Ti")) {
code=CPAP_Ti;//Ti;
code=CPAP_Ti;
a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate);
a->AddWaveform(edf.startdate,es.data,recs,duration);
//a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label.startsWith("Te")) {
code=CPAP_Te;//Te;
code=CPAP_Te;
a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate);
a->AddWaveform(edf.startdate,es.data,recs,duration);
//a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label.startsWith("TgMV")) {
code=CPAP_TgMV;
a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate);
a->AddWaveform(edf.startdate,es.data,recs,duration);
//a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0);

1
SleepLib/machine_common.h
View File

@ -91,6 +91,7 @@ const QString CPAP_FLG="FLG";
const QString CPAP_IE="IE";
const QString CPAP_Te="Te";
const QString CPAP_Ti="Ti";
const QString CPAP_TgMV="TgMV";
const QString RMS9_E01="RMS9_E01";
const QString RMS9_E02="RMS9_E02";
const QString PRS1_00="PRS1_00";

8
daily.cpp
View File

@ -86,6 +86,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
IE=new gGraph(GraphView,"I:E",default_height);
TE=new gGraph(GraphView,"Te",default_height);
TI=new gGraph(GraphView,"Ti",default_height);
TgMV=new gGraph(GraphView,"TgMV",default_height);
INTPULSE=new gGraph(GraphView,"Pulse",default_height,1);
INTSPO2=new gGraph(GraphView,"SPO2",default_height,1);
PULSE=new gGraph(GraphView,"Pulse",default_height,1);
@ -150,7 +151,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
FRW->AddLayer(AddCPAP(los));
gGraph *graphs[]={ PRD, LEAK, SNORE, PTB, MP, RR, MV, TV, FLG, IE, TI, TE, SPO2, PLETHY, PULSE,INTPULSE, INTSPO2 };
gGraph *graphs[]={ PRD, LEAK, SNORE, PTB, MP, RR, MV, TV, FLG, IE, TI, TE, TgMV, SPO2, PLETHY, PULSE,INTPULSE, INTSPO2 };
int ng=sizeof(graphs)/sizeof(gGraph*);
for (int i=0;i<ng;i++){
graphs[i]->AddLayer(new gXGrid());
@ -188,6 +189,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,square)));
TE->AddLayer(AddCPAP(new gLineChart(CPAP_Te,Qt::darkGreen,square)));
TI->AddLayer(AddCPAP(new gLineChart(CPAP_Ti,Qt::darkBlue,square)));
TgMV->AddLayer(AddCPAP(new gLineChart(CPAP_TgMV,Qt::darkCyan,square)));
INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,square)));
INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,square)));
PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,square)));
@ -546,8 +548,8 @@ void Daily::Load(QDate date)
ChannelID chans[]={
CPAP_Pressure,CPAP_EPAP,CPAP_IPAP,CPAP_PS,CPAP_PTB,
CPAP_MinuteVent,CPAP_RespRate,CPAP_RespEvent,CPAP_FLG,
CPAP_Leak,CPAP_Snore,CPAP_IE,CPAP_Ti,CPAP_Te,CPAP_TidalVolume,
OXI_Pulse,OXI_SPO2
CPAP_Leak,CPAP_Snore,CPAP_IE,CPAP_Ti,CPAP_Te, CPAP_TgMV,
CPAP_TidalVolume, OXI_Pulse,OXI_SPO2
};
int numchans=sizeof(chans)/sizeof(ChannelID);
int suboffset;

2
daily.h
View File

@ -76,7 +76,7 @@ private:
gGraph *PRD,*FRW,*GAHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2,
*SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB,*OF,*INTPULSE,*INTSPO2, *THPR,
*PLETHY,*TI,*TE, *RE, *IE;
*PLETHY,*TI,*TE, *RE, *IE, *TgMV;
QList<Layer *> OXIData;
QList<Layer *> CPAPData;

2
docs/channels.xml
View File

@ -44,6 +44,8 @@ One id code per item
<channel id="0x1111" class="data" name="IPAPHi" details="Inspiratory Pressure Hi" label="IPAP Hi" unit="cmH20" color="grey"/>
<channel id="0x1112" class="data" name="RespEvent" details="Respiratory Events" label="Resp Events" unit="" color="black"/>
<channel id="0x1113" class="data" name="FLG" details="Flow Limit Graph" label="Flow Limit" unit="" color="dark grey"/>
<channel id="0x1114" class="data" name="TgMV" details="TgMV" label="TgMV" unit="" color="dark cyan"/>
<channel id="0x1150" class="data" name="PRS1_00" details="Unknown 00" label="U00" unit="" color="black"/>
<channel id="0x1151" class="data" name="PRS1_01" details="Unknown 01" label="U01" unit="" color="black"/>
<channel id="0x1152" class="data" name="PRS1_08" details="Unknown 08" label="U08" unit="" color="black"/>

6
docs/release_notes.html
View File

@ -15,8 +15,10 @@ weeks functioning less than usual (fog, appendicitus, etc.. bleh).</p>
<li>You can now Shift+Left Click on a day in an overview graph, and it will jump to that day in Daily tab.</li>
<li>New calendar navigation bar allows easy hiding the calendar to get more room.</li>
<li>(Relative) AHI is displayed above the flow rate waveform for selected area.</li>
<li>Also includes some optimizations to improve performance.</li>
<li>Quite a few bugfixes I've forgotten about.</li>
<li>A new preference option to switch some daily graphs between square plots and normal line plots.</li>
<li>Improved support for ResMed S9 ASV/VPAP Machines.</li>
<li>Some graphing optimizations to improve performance.</li>
<li>Quite a few other little bugfixes I've forgotten about.</li>
<br/>
<b>What's still missing/broken?</b><br/>
<li>Oximetry.. still. I know it sucks..</li>