From 4926e2fcfcb7d101825918fd49309125d1f92f27 Mon Sep 17 00:00:00 2001 From: axt Date: Tue, 7 Dec 2021 21:01:01 +0100 Subject: [PATCH] Add Prisma extra graphs to GUI --- oscar/common_gui.h | 7 +++++++ oscar/daily.cpp | 19 ++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/oscar/common_gui.h b/oscar/common_gui.h index cd0515d8..2cb3b48f 100644 --- a/oscar/common_gui.h +++ b/oscar/common_gui.h @@ -50,6 +50,13 @@ const QString STR_GRAPH_Oxi_Plethy = "Plethy"; const QString STR_GRAPH_Oxi_Perf = "Perf. Index"; const QString STR_GRAPH_Oxi_PulseChange = "PulseChange"; const QString STR_GRAPH_Oxi_SPO2Drop = "SPO2Drop"; +const QString STR_GRAPH_ObstructLevel = "ObstructLevel"; +const QString STR_GRAPH_PressureMeasured = "PressureMeasured"; +const QString STR_GRAPH_rRMV = "rRMV"; +const QString STR_GRAPH_rMVFluctuation = "rMVFluctuation"; +const QString STR_GRAPH_FlowFull = "FlowFull"; +const QString STR_GRAPH_SPRStatus = "SPRStatus"; + //OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_Plethy diff --git a/oscar/daily.cpp b/oscar/daily.cpp index f76c245e..e1a34f2f 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -60,6 +60,7 @@ QString htmlLeftSessionInfo; QString htmlLeftFooter; extern ChannelID PRS1_PeakFlow; +extern ChannelID Prisma_ObstructLevel, Prisma_rMVFluctuation, Prisma_rRMV, Prisma_PressureMeasured, Prisma_FlowFull, Prisma_SPRStatus; // This was Sean Stangl's idea.. but I couldn't apply that patch. inline QString channelInfo(ChannelID code) { @@ -85,7 +86,8 @@ const QList standardGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowR STR_GRAPH_PTB, STR_GRAPH_RespEvent, STR_GRAPH_Ti, STR_GRAPH_Te, 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_AHI, STR_GRAPH_TAP, STR_GRAPH_ObstructLevel, STR_GRAPH_PressureMeasured, STR_GRAPH_rRMV, STR_GRAPH_rMVFluctuation, + STR_GRAPH_FlowFull, STR_GRAPH_SPRStatus }; // Advanced graph order @@ -94,7 +96,8 @@ const QList advancedGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowR 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, - STR_GRAPH_AHI, STR_GRAPH_TAP + STR_GRAPH_AHI, STR_GRAPH_TAP, STR_GRAPH_ObstructLevel, STR_GRAPH_PressureMeasured, STR_GRAPH_rRMV, STR_GRAPH_rMVFluctuation, + STR_GRAPH_FlowFull, STR_GRAPH_SPRStatus }; // CPAP modes that should have Advanced graphs @@ -243,7 +246,8 @@ 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 }; // Create graphs from the cpap code list @@ -396,6 +400,14 @@ Daily::Daily(QWidget *parent,gGraphView * shared) graphlist[schema::channel[CPAP_PTB].code()]->AddLayer(new gLineChart(CPAP_PTB, square)); graphlist[schema::channel[PRS1_PeakFlow].code()]->AddLayer(new gLineChart(PRS1_PeakFlow, square)); + + graphlist[schema::channel[Prisma_ObstructLevel].code()]->AddLayer(new gLineChart(Prisma_ObstructLevel, square)); + graphlist[schema::channel[Prisma_PressureMeasured].code()]->AddLayer(new gLineChart(Prisma_PressureMeasured, square)); + graphlist[schema::channel[Prisma_rRMV].code()]->AddLayer(new gLineChart(Prisma_rRMV, square)); + graphlist[schema::channel[Prisma_rMVFluctuation].code()]->AddLayer(new gLineChart(Prisma_rMVFluctuation, square)); + graphlist[schema::channel[Prisma_FlowFull].code()]->AddLayer(new gLineChart(Prisma_FlowFull, square)); + graphlist[schema::channel[Prisma_SPRStatus].code()]->AddLayer(new gLineChart(Prisma_SPRStatus, square)); + graphlist[schema::channel[CPAP_Test1].code()]->AddLayer(new gLineChart(CPAP_Test1, square)); //graphlist[schema::channel[CPAP_Test2].code()]->AddLayer(new gLineChart(CPAP_Test2, square)); @@ -1328,6 +1340,7 @@ QString Daily::getStatisticsInfo(Day * day) ChannelID chans[]={ CPAP_Pressure,CPAP_PressureSet,CPAP_EPAP,CPAP_EPAPSet,CPAP_IPAP,CPAP_IPAPSet,CPAP_PS,CPAP_PTB, 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_TidalVolume, OXI_Pulse, OXI_SPO2, POS_Inclination, POS_Orientation, POS_Movement