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

always display red-line for FlowRate graph.

Browse Source
This commit is contained in:
LoudSnorer 2023-05-16 21:21:59 -04:00
parent 6d9d7d0c50
commit 74c85eb8c6
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/Graphs/gGraphView.cpp
View File

@ -2309,6 +2309,12 @@ void gGraphView::populateMenu(gGraph * graph)
if (!lc->m_enabled[dot.code]) continue; if (!lc->m_enabled[dot.code]) continue;
#if defined(ENABLE_ALWAYS_ON_ZERO_RED_LINE_FLOW_RATE)
// if red line is always on then there is no need for the button to turn it on /off
// skip creating UI to change value. or turn enabled off.
if (lc->code() == CPAP_FlowRate && dot.type == Calc_Zero) continue;
#endif
schema::Channel &chan = schema::channel[dot.code]; schema::Channel &chan = schema::channel[dot.code];
if (dot.available) { if (dot.available) {

15
oscar/Graphs/gLineChart.cpp
View File

@ -58,10 +58,13 @@ QColor darken(QColor color, float p)
} }
void gLineChart::resetGraphViewSettings() { void gLineChart::resetGraphViewSettings() {
#if !defined(ENABLE_ALWAYS_ON_ZERO_RED_LINE_FLOW_RATE)
// always turn zero red line on as default value.
if (m_code==CPAP_FlowRate) { if (m_code==CPAP_FlowRate) {
m_dot_enabled[m_code][Calc_Zero] = true; m_dot_enabled[m_code][Calc_Zero] = true;
} } else
else if (m_code==CPAP_Leak) { #endif
if (m_code==CPAP_Leak) {
m_dot_enabled[m_code][Calc_UpperThresh] = true; m_dot_enabled[m_code][Calc_UpperThresh] = true;
} }
} }
@ -259,7 +262,12 @@ skipcheck:
if (m_codes[0] == CPAP_Leak) { if (m_codes[0] == CPAP_Leak) {
addDotLine(DottedLine(CPAP_Leak, Calc_UpperThresh, schema::channel[CPAP_Leak].calc[Calc_UpperThresh].enabled)); addDotLine(DottedLine(CPAP_Leak, Calc_UpperThresh, schema::channel[CPAP_Leak].calc[Calc_UpperThresh].enabled));
} else if (m_codes[0] == CPAP_FlowRate) { } else if (m_codes[0] == CPAP_FlowRate) {
addDotLine(DottedLine(CPAP_FlowRate, Calc_Zero, schema::channel[CPAP_FlowRate].calc[Calc_Zero].enabled)); //addDotLine(DottedLine(CPAP_FlowRate, Calc_Zero, schema::channel[CPAP_FlowRate].calc[Calc_Zero].enabled));
addDotLine(DottedLine(CPAP_FlowRate, Calc_Zero, false ));
#if defined(ENABLE_ALWAYS_ON_ZERO_RED_LINE_FLOW_RATE)
//on set day force red line on.
m_dot_enabled[m_code][Calc_Zero] = true;
#endif
} else if (m_codes[0] == OXI_Pulse) { } else if (m_codes[0] == OXI_Pulse) {
addDotLine(DottedLine(OXI_Pulse, Calc_UpperThresh, schema::channel[OXI_Pulse].calc[Calc_UpperThresh].enabled)); addDotLine(DottedLine(OXI_Pulse, Calc_UpperThresh, schema::channel[OXI_Pulse].calc[Calc_UpperThresh].enabled));
addDotLine(DottedLine(OXI_Pulse, Calc_LowerThresh, schema::channel[OXI_Pulse].calc[Calc_LowerThresh].enabled)); addDotLine(DottedLine(OXI_Pulse, Calc_LowerThresh, schema::channel[OXI_Pulse].calc[Calc_LowerThresh].enabled));
@ -268,6 +276,7 @@ skipcheck:
} }
if (m_day) { if (m_day) {
for (auto & dot : m_dotlines) { for (auto & dot : m_dotlines) {
dot.calc(m_day); dot.calc(m_day);

1
oscar/Graphs/gLineChart.h
View File

@ -18,6 +18,7 @@
#include "SleepLib/day.h" #include "SleepLib/day.h"
#include "Graphs/gLineOverlay.h" #include "Graphs/gLineOverlay.h"
#define ENABLE_ALWAYS_ON_ZERO_RED_LINE_FLOW_RATE
enum DottedLineCalc { enum DottedLineCalc {
DLC_Zero, DLC_Min, DLC_Mid, DLC_Perc, DLC_Max, DLC_UpperThresh, DLC_LowerThresh DLC_Zero, DLC_Min, DLC_Mid, DLC_Perc, DLC_Max, DLC_UpperThresh, DLC_LowerThresh
}; };