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

Fix problem with advanced graphs. Update release notes.

Browse Source
This commit is contained in:
Seeker4 2019-09-03 12:56:10 -07:00
parent 6158d83935
commit 1b67688b12
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
oscar/daily.cpp
View File

@ -64,7 +64,10 @@ inline QString channelInfo(ChannelID code) {
// + (schema::channel[code].units() != "0" ? "\n("+schema::channel[code].units()+")" : "");
}
//
// List here the graph codes in the order they are to be displayed.
// Do NOT list a code twice, or Oscar will crash when the profile is closed!
//
// Standard graph order
const QList<QString> 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,
@ -78,7 +81,7 @@ const QList<QString> standardGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowR
const QList<QString> 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_RespRate, STR_GRAPH_PTB, STR_GRAPH_RespEvent,
STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_TestChan1,
STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, 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
};
@ -215,16 +218,19 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
graphlist[STR_GRAPH_SleepFlags] = SF = new gGraph(STR_GRAPH_SleepFlags, GraphView, STR_TR_EventFlags, STR_TR_EventFlags, default_height);
SF->setPinned(true);
//============================================
// Create graphs from 'interesting' CPAP codes
//
// If this list of codes is changed, you must
// also adjust the standard and advanced graph
// order at the beginning of daily.cpp.
//============================================
const ChannelID cpapcodes[] = {
CPAP_FlowRate, CPAP_Pressure, CPAP_Leak, CPAP_FLG, CPAP_Snore, CPAP_TidalVolume,
CPAP_MaskPressure, CPAP_RespRate, CPAP_MinuteVent, CPAP_PTB, CPAP_RespEvent, CPAP_Ti, CPAP_Te,
/* CPAP_IE, */ ZEO_SleepStage, POS_Inclination, POS_Orientation, CPAP_Test1
};
const ChannelID oximetercodes[] = {
OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_Plethy
};
// Create graphs from the cpap code list
int cpapsize = sizeof(cpapcodes) / sizeof(ChannelID);
@ -234,6 +240,10 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
// qDebug() << "Creating graph for code" << code << schema::channel[code].code();
}
const ChannelID oximetercodes[] = {
OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_Plethy
};
// Add graphs from the Oximeter code list
int oxisize = sizeof(oximetercodes) / sizeof(ChannelID);

6
oscar/docs/release_notes.html
View File

@ -10,7 +10,11 @@ Which was written and copyright 2011-2018 &copy; Mark Watkins
<b>Changes and fixes in OSCAR <u>**AFTER**</u> v1.1.0-testing-4</b>
<ul>
<li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
<li>[fix] Show a progress bar when setting range to a large number of days</li>
<li>[new] Default graphs and View/reset graphs use a different order for advanced CPAP modes</li>
<li>[new] Add preference setting to include serial number on machine settings list</li>
<li>[fix] Correct formatting of event number in Daily Events tab</li>
<li>[fix] Correct timezone offset for somnopose imports</li>
<li>[fix] Show a progress bar when setting Overview range to a large number of days</li>
</ul>
</p>