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

Remove SPRStatus channel

Browse Source
This commit is contained in:
axt 2023-05-06 11:58:29 +02:00
parent 908912e898
commit e2cd1603bd
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar/SleepLib/loader_plugins/prisma_loader.cpp
View File

@ -48,7 +48,7 @@
ChannelID Prisma_Mode = 0, Prisma_SoftPAP = 0, Prisma_BiSoft = 0, Prisma_PSoft = 0, Prisma_PSoft_Min = 0, Prisma_AutoStart = 0, Prisma_Softstart_Time = 0, Prisma_Softstart_TimeMax = 0, Prisma_Softstart_Pressure = 0, Prisma_TubeType = 0, Prisma_PMaxOA = 0, Prisma_HumidifierLevel = 0; ChannelID Prisma_Mode = 0, Prisma_SoftPAP = 0, Prisma_BiSoft = 0, Prisma_PSoft = 0, Prisma_PSoft_Min = 0, Prisma_AutoStart = 0, Prisma_Softstart_Time = 0, Prisma_Softstart_TimeMax = 0, Prisma_Softstart_Pressure = 0, Prisma_TubeType = 0, Prisma_PMaxOA = 0, Prisma_HumidifierLevel = 0;
// waveforms // waveforms
ChannelID Prisma_ObstructLevel = 0, Prisma_rMVFluctuation = 0, Prisma_rRMV= 0, Prisma_PressureMeasured = 0, Prisma_FlowFull = 0, Prisma_SPRStatus = 0, Prisma_EEPAP = 0; ChannelID Prisma_ObstructLevel = 0, Prisma_rMVFluctuation = 0, Prisma_rRMV= 0, Prisma_PressureMeasured = 0, Prisma_FlowFull = 0, Prisma_EEPAP = 0;
// events // events
ChannelID Prisma_Artifact = 0, Prisma_CriticalLeak = 0, Prisma_DeepSleep = 0, Prisma_TimedBreath = 0; ChannelID Prisma_Artifact = 0, Prisma_CriticalLeak = 0, Prisma_DeepSleep = 0, Prisma_TimedBreath = 0;
@ -327,9 +327,6 @@ void PrismaImport::run()
AddWaveform(CPAP_FlowRate, QString("RespFlow")); AddWaveform(CPAP_FlowRate, QString("RespFlow"));
AddWaveform(CPAP_Leak, QString("LeakFlowBreath")); AddWaveform(CPAP_Leak, QString("LeakFlowBreath"));
AddWaveform(Prisma_ObstructLevel, QString("ObstructLevel")); AddWaveform(Prisma_ObstructLevel, QString("ObstructLevel"));
// NOTE: this is a bitfield indicating the device current stauts breaht in, breath out, leakage
// only can be used for debugging, consider removing it, or adding better support for displaying it
AddWaveform(Prisma_SPRStatus, QString("SPRStatus"));
// prisma smart // prisma smart
// waweforms specific for prisma smart / soft devices // waweforms specific for prisma smart / soft devices
@ -941,12 +938,13 @@ void PrismaLoader::initChannels()
QObject::tr("Full flow"), QObject::tr("Full flow"),
STR_UNIT_Unknown, DEFAULT, QColor("black"))); STR_UNIT_Unknown, DEFAULT, QColor("black")));
channel.add(GRP_CPAP, new Channel(Prisma_SPRStatus=0xe445, WAVEFORM, MT_CPAP, SESSION, //Note: removed the channel, but keeping this code here, because of the channel id allocation, maybe we will bring it back in the future
"Prisma_SPRStatus", //channel.add(GRP_CPAP, new Channel(Prisma_SPRStatus=0xe445, WAVEFORM, MT_CPAP, SESSION,
QObject::tr("SPRStatus"), // "Prisma_SPRStatus",
QObject::tr("SPRStatus"), // QObject::tr("SPRStatus"),
QObject::tr("SPRStatus"), // QObject::tr("SPRStatus"),
STR_UNIT_Unknown, DEFAULT, QColor("black"))); // QObject::tr("SPRStatus"),
// STR_UNIT_Unknown, DEFAULT, QColor("black")));
channel.add(GRP_CPAP, new Channel(Prisma_Artifact=0xe446, SPAN, MT_CPAP, SESSION, channel.add(GRP_CPAP, new Channel(Prisma_Artifact=0xe446, SPAN, MT_CPAP, SESSION,

1
oscar/common_gui.h
View File

@ -55,7 +55,6 @@ const QString STR_GRAPH_PressureMeasured = "PressureMeasured";
const QString STR_GRAPH_rRMV = "rRMV"; const QString STR_GRAPH_rRMV = "rRMV";
const QString STR_GRAPH_rMVFluctuation = "rMVFluctuation"; const QString STR_GRAPH_rMVFluctuation = "rMVFluctuation";
const QString STR_GRAPH_FlowFull = "FlowFull"; const QString STR_GRAPH_FlowFull = "FlowFull";
const QString STR_GRAPH_SPRStatus = "SPRStatus";
//OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_Plethy //OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_Plethy

9
oscar/daily.cpp
View File

@ -62,7 +62,7 @@ QString htmlLeftSessionInfo;
QString htmlLeftFooter; QString htmlLeftFooter;
extern ChannelID PRS1_PeakFlow; extern ChannelID PRS1_PeakFlow;
extern ChannelID Prisma_ObstructLevel, Prisma_rMVFluctuation, Prisma_rRMV, Prisma_PressureMeasured, Prisma_FlowFull, Prisma_SPRStatus; extern ChannelID Prisma_ObstructLevel, Prisma_rMVFluctuation, Prisma_rRMV, Prisma_PressureMeasured, Prisma_FlowFull;
// This was Sean Stangl's idea.. but I couldn't apply that patch. // This was Sean Stangl's idea.. but I couldn't apply that patch.
inline QString channelInfo(ChannelID code) { inline QString channelInfo(ChannelID code) {
@ -89,7 +89,7 @@ const QList<QString> standardGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowR
STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_Motion, STR_GRAPH_TestChan1, 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_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, STR_GRAPH_AHI, STR_GRAPH_TAP, STR_GRAPH_ObstructLevel, STR_GRAPH_PressureMeasured, STR_GRAPH_rRMV, STR_GRAPH_rMVFluctuation,
STR_GRAPH_FlowFull, STR_GRAPH_SPRStatus STR_GRAPH_FlowFull
}; };
// Advanced graph order // Advanced graph order
@ -99,7 +99,7 @@ const QList<QString> advancedGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowR
STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_Motion, STR_GRAPH_TestChan1, 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_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, STR_GRAPH_AHI, STR_GRAPH_TAP, STR_GRAPH_ObstructLevel, STR_GRAPH_PressureMeasured, STR_GRAPH_rRMV, STR_GRAPH_rMVFluctuation,
STR_GRAPH_FlowFull, STR_GRAPH_SPRStatus STR_GRAPH_FlowFull
}; };
// CPAP modes that should have Advanced graphs // CPAP modes that should have Advanced graphs
@ -250,7 +250,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
CPAP_FlowRate, CPAP_Pressure, CPAP_Leak, CPAP_FLG, CPAP_Snore, CPAP_TidalVolume, 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_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 Prisma_ObstructLevel, Prisma_rRMV, Prisma_rMVFluctuation, Prisma_PressureMeasured, Prisma_FlowFull
}; };
// Create graphs from the cpap code list // Create graphs from the cpap code list
@ -405,7 +405,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
graphlist[schema::channel[Prisma_rRMV].code()]->AddLayer(new gLineChart(Prisma_rRMV, 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_rMVFluctuation].code()]->AddLayer(new gLineChart(Prisma_rMVFluctuation, square));
graphlist[schema::channel[Prisma_FlowFull].code()]->AddLayer(new gLineChart(Prisma_FlowFull, 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_Test1].code()]->AddLayer(new gLineChart(CPAP_Test1, square));
//graphlist[schema::channel[CPAP_Test2].code()]->AddLayer(new gLineChart(CPAP_Test2, square)); //graphlist[schema::channel[CPAP_Test2].code()]->AddLayer(new gLineChart(CPAP_Test2, square));