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

Move gPressureChart value calculation into addSlice.

Browse Source
This commit is contained in:
sawinglogz 2020-04-27 16:55:56 -04:00
parent 33eacab53f
commit 670693dd5f
2 changed files with 35 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
oscar/Graphs/gPressureChart.cpp
View File

@ -98,21 +98,26 @@ QString gPressureChart::channelRange(ChannelID code, const QString & label)
} }
void gPressureChart::addSlice(float value, ChannelID code, SummaryType type) void gPressureChart::addSlice(ChannelID code, SummaryType type)
{ {
SummaryCalcItem* calc = getCalc(code, type); float value = 0;
float height = value - m_height;
QString label; QString label;
switch (type) { switch (type) {
case ST_SETMIN: case ST_SETMIN:
value = m_day->settings_min(code);
label = schema::channel[code].label();
break;
case ST_SETMAX: case ST_SETMAX:
value = m_day->settings_max(code);
label = schema::channel[code].label(); label = schema::channel[code].label();
break; break;
case ST_MID: case ST_MID:
value = m_day->calcMiddle(code);
label = m_day->calcMiddleLabel(code); label = m_day->calcMiddleLabel(code);
break; break;
case ST_90P: case ST_90P:
value = m_day->calcPercentile(code);
label = m_day->calcPercentileLabel(code); label = m_day->calcPercentileLabel(code);
break; break;
default: default:
@ -120,6 +125,9 @@ void gPressureChart::addSlice(float value, ChannelID code, SummaryType type)
break; break;
} }
SummaryCalcItem* calc = getCalc(code, type);
float height = value - m_height;
m_slices->append(SummaryChartSlice(calc, value, height, label, calc->color)); m_slices->append(SummaryChartSlice(calc, value, height, label, calc->color));
m_height += height; m_height += height;
} }
@ -133,80 +141,43 @@ void gPressureChart::populate(Day * day, int idx)
m_height = 0; m_height = 0;
if (mode == MODE_CPAP) { if (mode == MODE_CPAP) {
float pr = day->settings_max(CPAP_Pressure); addSlice(CPAP_Pressure);
addSlice(pr, CPAP_Pressure);
} else if (mode == MODE_APAP) { } else if (mode == MODE_APAP) {
float min = day->settings_min(CPAP_PressureMin); addSlice(CPAP_PressureMin, ST_SETMIN);
float max = day->settings_max(CPAP_PressureMax);
addSlice(min, CPAP_PressureMin, ST_SETMIN);
if (!day->summaryOnly()) { if (!day->summaryOnly()) {
float med = day->calcMiddle(CPAP_Pressure); addSlice(CPAP_Pressure, ST_MID);
addSlice(med, CPAP_Pressure, ST_MID); addSlice(CPAP_Pressure, ST_90P);
float p90 = day->calcPercentile(CPAP_Pressure);
addSlice(p90, CPAP_Pressure, ST_90P);
} }
addSlice(max, CPAP_PressureMax, ST_SETMAX); addSlice(CPAP_PressureMax, ST_SETMAX);
} else if (mode == MODE_BILEVEL_FIXED) { } else if (mode == MODE_BILEVEL_FIXED) {
float epap = day->settings_max(CPAP_EPAP); addSlice(CPAP_EPAP);
float ipap = day->settings_max(CPAP_IPAP); addSlice(CPAP_IPAP);
addSlice(epap, CPAP_EPAP);
addSlice(ipap, CPAP_IPAP);
} else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) { } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
float epap = day->settings_max(CPAP_EPAPLo); addSlice(CPAP_EPAPLo);
float ipap = day->settings_max(CPAP_IPAPHi);
addSlice(epap, CPAP_EPAPLo);
if (!day->summaryOnly()) { if (!day->summaryOnly()) {
addSlice(CPAP_EPAP, ST_MID);
float e50 = day->calcMiddle(CPAP_EPAP); addSlice(CPAP_EPAP, ST_90P);
addSlice(e50, CPAP_EPAP, ST_MID); addSlice(CPAP_IPAP, ST_MID);
addSlice(CPAP_IPAP, ST_90P);
float e90 = day->calcPercentile(CPAP_EPAP);
addSlice(e90, CPAP_EPAP, ST_90P);
float i50 = day->calcMiddle(CPAP_IPAP);
addSlice(i50, CPAP_IPAP, ST_MID);
float i90 = day->calcPercentile(CPAP_IPAP);
addSlice(i90, CPAP_IPAP, ST_90P);
} }
addSlice(ipap, CPAP_IPAPHi); addSlice(CPAP_IPAPHi);
} else if ((mode == MODE_BILEVEL_AUTO_VARIABLE_PS) || (mode == MODE_ASV_VARIABLE_EPAP)) { } else if ((mode == MODE_BILEVEL_AUTO_VARIABLE_PS) || (mode == MODE_ASV_VARIABLE_EPAP)) {
float epap = day->settings_max(CPAP_EPAPLo); addSlice(CPAP_EPAPLo);
addSlice(epap, CPAP_EPAPLo);
if (!day->summaryOnly()) { if (!day->summaryOnly()) {
float e50 = day->calcMiddle(CPAP_EPAP); addSlice(CPAP_EPAP, ST_MID);
addSlice(e50, CPAP_EPAP, ST_MID); addSlice(CPAP_EPAP, ST_90P);
addSlice(CPAP_IPAP, ST_MID);
float e90 = day->calcPercentile(CPAP_EPAP); addSlice(CPAP_IPAP, ST_90P);
addSlice(e90, CPAP_EPAP, ST_90P);
float i50 = day->calcMiddle(CPAP_IPAP);
addSlice(i50, CPAP_IPAP, ST_MID);
float i90 = day->calcPercentile(CPAP_IPAP);
addSlice(i90, CPAP_IPAP, ST_90P);
} }
float ipap = day->settings_max(CPAP_IPAPHi); addSlice(CPAP_IPAPHi);
addSlice(ipap, CPAP_IPAPHi);
} else if (mode == MODE_ASV) { } else if (mode == MODE_ASV) {
float epap = day->settings_max(CPAP_EPAP); addSlice(CPAP_EPAP);
addSlice(epap, CPAP_EPAP);
if (!day->summaryOnly()) { if (!day->summaryOnly()) {
float i50 = day->calcMiddle(CPAP_IPAP); addSlice(CPAP_IPAP, ST_MID);
addSlice(i50, CPAP_IPAP, ST_MID); addSlice(CPAP_IPAP, ST_90P);
float i90 = day->calcPercentile(CPAP_IPAP);
addSlice(i90, CPAP_IPAP, ST_90P);
} }
float ipap = day->settings_max(CPAP_IPAPHi); addSlice(CPAP_IPAPHi);
addSlice(ipap, CPAP_IPAPHi);
} }
} }

2
oscar/Graphs/gPressureChart.h
View File

@ -48,7 +48,7 @@ public:
protected: protected:
SummaryCalcItem* getCalc(ChannelID code, SummaryType type = ST_SETMAX); SummaryCalcItem* getCalc(ChannelID code, SummaryType type = ST_SETMAX);
QString channelRange(ChannelID code, const QString & label); QString channelRange(ChannelID code, const QString & label);
void addSlice(float value, ChannelID code, SummaryType type = ST_SETMAX); void addSlice(ChannelID code, SummaryType type = ST_SETMAX);
QHash<ChannelID,QHash<SummaryType,int>> m_calcs; QHash<ChannelID,QHash<SummaryType,int>> m_calcs;