From 97fb26e12b1e9400ce49523ca01730aa0a7bcb16 Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Fri, 19 May 2023 20:50:41 -0400 Subject: [PATCH] REMOVED ALL DOTTED lINES SELECTIONS FROM FlowRate --- oscar/Graphs/gGraphView.cpp | 3 ++- oscar/Graphs/gLineChart.cpp | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp index 8e7c7b6e..7c53b196 100644 --- a/oscar/Graphs/gGraphView.cpp +++ b/oscar/Graphs/gGraphView.cpp @@ -2312,7 +2312,8 @@ void gGraphView::populateMenu(gGraph * graph) #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; + //if (lc->code() == CPAP_FlowRate && dot.type == Calc_Zero) continue; + if (lc->code() == CPAP_FlowRate) continue; #endif schema::Channel &chan = schema::channel[dot.code]; diff --git a/oscar/Graphs/gLineChart.cpp b/oscar/Graphs/gLineChart.cpp index cb544384..caf4243e 100644 --- a/oscar/Graphs/gLineChart.cpp +++ b/oscar/Graphs/gLineChart.cpp @@ -223,7 +223,7 @@ skipcheck: if (!m_flags_enabled.contains(code)) { bool b = false; - if (((m_codes[0] == CPAP_FlowRate) || ((m_codes[0] == CPAP_MaskPressureHi))) && (schema::channel[code].machtype() == MT_CPAP)) b = true; + if (((m_codes[0] == CPAP_FlowRate) ||((m_codes[0] == CPAP_MaskPressureHi))) && (schema::channel[code].machtype() == MT_CPAP)) b = true; if ((m_codes[0] == CPAP_Leak) && (code == CPAP_LargeLeak)) b = true; m_flags_enabled[code] = b; } @@ -250,20 +250,21 @@ skipcheck: for (const auto & code : m_codes) { const schema::Channel & chan = schema::channel[code]; - addDotLine(DottedLine(code, Calc_Max,chan.calc[Calc_Max].enabled)); + if (code != CPAP_FlowRate) { + addDotLine(DottedLine(code, Calc_Max,chan.calc[Calc_Max].enabled)); + } if ((code != CPAP_FlowRate) && (code != CPAP_MaskPressure) && (code != CPAP_MaskPressureHi)) { addDotLine(DottedLine(code, Calc_Perc,chan.calc[Calc_Perc].enabled)); addDotLine(DottedLine(code, Calc_Middle, chan.calc[Calc_Middle].enabled)); } - if ((code != CPAP_Snore) && (code != CPAP_FlowLimit) && (code != CPAP_RDI) && (code != CPAP_AHI)) { + if ((code != CPAP_FlowRate) && (code != CPAP_Snore) && (code != CPAP_FlowLimit) && (code != CPAP_RDI) && (code != CPAP_AHI)) { addDotLine(DottedLine(code, Calc_Min, chan.calc[Calc_Min].enabled)); } } if (m_codes[0] == CPAP_Leak) { addDotLine(DottedLine(CPAP_Leak, Calc_UpperThresh, schema::channel[CPAP_Leak].calc[Calc_UpperThresh].enabled)); } 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, false )); + addDotLine(DottedLine(CPAP_FlowRate, Calc_Zero, schema::channel[CPAP_FlowRate].calc[Calc_Zero].enabled)); #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;