From a3b7ba52c380250ec2273ab0287aa61786402773 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Sat, 19 Nov 2022 04:02:02 -0500 Subject: [PATCH] Added the I:E graph back into Daily --- oscar/SleepLib/loader_plugins/resmed_loader.cpp | 9 +++++---- oscar/common_gui.h | 1 + oscar/daily.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index e498c644..51ed48d1 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -3359,9 +3359,9 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path) ToTimeDelta(sess, edf, es, code, samples, duration, 0, 0, square); } else if (matchSignal(CPAP_IE, es.label)) { //I:E ratio code = CPAP_IE; -// es.gain /= 100.0; -// es.physical_maximum /= 100.0; -// es.physical_minimum /= 100.0; + es.gain /= 100.0; + es.physical_maximum /= 100.0; + es.physical_minimum /= 100.0; // qDebug() << "IE Gain, Max, Min" << es.gain << es.physical_maximum << es.physical_minimum; // qDebug() << "IE count, data..." << es.sampleCnt << es.dataArray[0] << es.dataArray[1] << es.dataArray[2] << es.dataArray[3] << es.dataArray[4]; // a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate); @@ -3476,7 +3476,8 @@ void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es, tt += rate * startpos; } // Likewise for the values that the device computes for us, but 20 seconds - if ((code == CPAP_MinuteVent) || (code == CPAP_RespRate) || (code == CPAP_TidalVolume)) { + if ( (code == CPAP_MinuteVent) || (code == CPAP_RespRate) || (code == CPAP_TidalVolume) || + (code == CPAP_Ti) || (code == CPAP_Te) || (code == CPAP_IE) ) { startpos = 10; // Shave the first 20 seconds of computed data tt += rate * startpos; } diff --git a/oscar/common_gui.h b/oscar/common_gui.h index 2cb3b48f..40c51ea5 100644 --- a/oscar/common_gui.h +++ b/oscar/common_gui.h @@ -29,6 +29,7 @@ const QString STR_GRAPH_PTB = "PTB"; const QString STR_GRAPH_RespEvent = "RespEvent"; const QString STR_GRAPH_Ti = "Ti"; const QString STR_GRAPH_Te = "Te"; +const QString STR_GRAPH_IE = "I:E"; const QString STR_GRAPH_SleepStage = "SleepStage"; const QString STR_GRAPH_Inclination = "Inclination"; const QString STR_GRAPH_Orientation = "Orientation"; diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 488727fe..1ffac8d4 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -83,7 +83,7 @@ inline QString channelInfo(ChannelID code) { // Standard graph order const QList standardGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowRate, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_FlowLimitation, STR_GRAPH_Snore, STR_GRAPH_TidalVolume, STR_GRAPH_MaskPressure, STR_GRAPH_RespRate, STR_GRAPH_MinuteVent, - STR_GRAPH_PTB, STR_GRAPH_RespEvent, STR_GRAPH_Ti, STR_GRAPH_Te, + STR_GRAPH_PTB, STR_GRAPH_RespEvent, STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_IE, STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_Motion, STR_GRAPH_TestChan1, STR_GRAPH_Oxi_Pulse, STR_GRAPH_Oxi_SPO2, STR_GRAPH_Oxi_Perf, STR_GRAPH_Oxi_Plethy, STR_GRAPH_AHI, STR_GRAPH_TAP, STR_GRAPH_ObstructLevel, STR_GRAPH_PressureMeasured, STR_GRAPH_rRMV, STR_GRAPH_rMVFluctuation, @@ -92,7 +92,7 @@ const QList standardGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowR // Advanced graph order const QList advancedGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowRate, STR_GRAPH_MaskPressure, STR_GRAPH_TidalVolume, STR_GRAPH_MinuteVent, - STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_FlowLimitation, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_Snore, + STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_IE, STR_GRAPH_FlowLimitation, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_Snore, STR_GRAPH_RespRate, STR_GRAPH_PTB, STR_GRAPH_RespEvent, STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_Motion, STR_GRAPH_TestChan1, STR_GRAPH_Oxi_Pulse, STR_GRAPH_Oxi_SPO2, STR_GRAPH_Oxi_Perf, STR_GRAPH_Oxi_Plethy, @@ -245,7 +245,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) const ChannelID cpapcodes[] = { CPAP_FlowRate, CPAP_Pressure, CPAP_Leak, CPAP_FLG, CPAP_Snore, CPAP_TidalVolume, CPAP_MaskPressure, CPAP_RespRate, CPAP_MinuteVent, CPAP_PTB, PRS1_PeakFlow, CPAP_RespEvent, CPAP_Ti, CPAP_Te, - /* CPAP_IE, */ ZEO_SleepStage, POS_Inclination, POS_Orientation, POS_Movement, CPAP_Test1, + CPAP_IE, ZEO_SleepStage, POS_Inclination, POS_Orientation, POS_Movement, CPAP_Test1, Prisma_ObstructLevel, Prisma_rRMV, Prisma_rMVFluctuation, Prisma_PressureMeasured, Prisma_FlowFull, Prisma_SPRStatus }; @@ -429,7 +429,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) //graphlist[schema::channel[CPAP_TidalVolume].code()]->AddLayer(AddCPAP(new gLineChart("TidalVolume2", square))); graphlist[schema::channel[CPAP_FLG].code()]->AddLayer(new gLineChart(CPAP_FLG, true)); //graphlist[schema::channel[CPAP_RespiratoryEvent].code()]->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent, true))); -// graphlist[schema::channel[CPAP_IE].code()]->AddLayer(lc=new gLineChart(CPAP_IE, false)); // this should be inverse of supplied value + graphlist[schema::channel[CPAP_IE].code()]->AddLayer(lc=new gLineChart(CPAP_IE, false)); // this should be inverse of supplied value graphlist[schema::channel[CPAP_Te].code()]->AddLayer(lc=new gLineChart(CPAP_Te, false)); graphlist[schema::channel[CPAP_Ti].code()]->AddLayer(lc=new gLineChart(CPAP_Ti, false)); //lc->addPlot(CPAP_Test2,COLOR:DarkYellow,square); @@ -1358,7 +1358,7 @@ QString Daily::getStatisticsInfo(Day * day) PRS1_PeakFlow, Prisma_ObstructLevel, Prisma_PressureMeasured, Prisma_rRMV, Prisma_rMVFluctuation, CPAP_MinuteVent, CPAP_RespRate, CPAP_RespEvent,CPAP_FLG, - CPAP_Leak, CPAP_LeakTotal, CPAP_Snore, /* CPAP_IE, */ CPAP_Ti,CPAP_Te, CPAP_TgMV, + CPAP_Leak, CPAP_LeakTotal, CPAP_Snore, CPAP_IE, CPAP_Ti,CPAP_Te, CPAP_TgMV, CPAP_TidalVolume, OXI_Pulse, OXI_SPO2, POS_Inclination, POS_Orientation, POS_Movement }; int numchans=sizeof(chans)/sizeof(ChannelID);