From 0ebf4e70a36a374cebab591101cb2176303f4c56 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 27 Apr 2020 14:46:49 -0400
Subject: [PATCH] Clean up gPressureChart constructor, with minor refactoring.

---
 oscar/Graphs/gPressureChart.cpp     | 35 ++++++++++++++++++-----------
 oscar/Graphs/gPressureChart.h       |  1 +
 oscar/Graphs/gSessionTimesChart.cpp | 11 +++++++++
 oscar/Graphs/gSessionTimesChart.h   |  9 ++------
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/oscar/Graphs/gPressureChart.cpp b/oscar/Graphs/gPressureChart.cpp
index b494a2af..cac04bfa 100644
--- a/oscar/Graphs/gPressureChart.cpp
+++ b/oscar/Graphs/gPressureChart.cpp
@@ -14,21 +14,30 @@ gPressureChart::gPressureChart()
 {
 
     // Do not reorder these!!! :P
-    addCalc(CPAP_Pressure, ST_SETMAX, schema::channel[CPAP_Pressure].defaultColor());    // 00
-    addCalc(CPAP_Pressure, ST_MID, schema::channel[CPAP_Pressure].defaultColor());       // 01
-    addCalc(CPAP_Pressure, ST_90P, brighten(schema::channel[CPAP_Pressure].defaultColor(), 1.33f)); // 02
-    addCalc(CPAP_PressureMin, ST_SETMIN, schema::channel[CPAP_PressureMin].defaultColor());  // 03
-    addCalc(CPAP_PressureMax, ST_SETMAX, schema::channel[CPAP_PressureMax].defaultColor());  // 04
+    addCalc(CPAP_Pressure, ST_SETMAX);     // 00
+    addCalc(CPAP_Pressure, ST_MID);        // 01
+    addCalc(CPAP_Pressure, ST_90P);        // 02
+    addCalc(CPAP_PressureMin, ST_SETMIN);  // 03
+    addCalc(CPAP_PressureMax, ST_SETMAX);  // 04
 
-    addCalc(CPAP_EPAP, ST_SETMAX, schema::channel[CPAP_EPAP].defaultColor());      // 05
-    addCalc(CPAP_IPAP, ST_SETMAX, schema::channel[CPAP_IPAP].defaultColor());      // 06
-    addCalc(CPAP_EPAPLo, ST_SETMAX, schema::channel[CPAP_EPAPLo].defaultColor());    // 07
-    addCalc(CPAP_IPAPHi, ST_SETMAX, schema::channel[CPAP_IPAPHi].defaultColor());    // 08
+    addCalc(CPAP_EPAP, ST_SETMAX);      // 05
+    addCalc(CPAP_IPAP, ST_SETMAX);      // 06
+    addCalc(CPAP_EPAPLo, ST_SETMAX);    // 07
+    addCalc(CPAP_IPAPHi, ST_SETMAX);    // 08
 
-    addCalc(CPAP_EPAP, ST_MID, schema::channel[CPAP_EPAP].defaultColor());         // 09
-    addCalc(CPAP_EPAP, ST_90P, brighten(schema::channel[CPAP_EPAP].defaultColor(),1.33f));         // 10
-    addCalc(CPAP_IPAP, ST_MID, schema::channel[CPAP_IPAP].defaultColor());         // 11
-    addCalc(CPAP_IPAP, ST_90P, brighten(schema::channel[CPAP_IPAP].defaultColor(),1.33f));         // 12
+    addCalc(CPAP_EPAP, ST_MID);         // 09
+    addCalc(CPAP_EPAP, ST_90P);         // 10
+    addCalc(CPAP_IPAP, ST_MID);         // 11
+    addCalc(CPAP_IPAP, ST_90P);         // 12
+}
+
+int gPressureChart::addCalc(ChannelID code, SummaryType type) {
+    QColor color = schema::channel[code].defaultColor();
+    if (type == ST_90P) {
+        color = brighten(color, 1.33f);
+    }
+    int index = gSummaryChart::addCalc(code, type, color);
+    return index;
 }
 
 void gPressureChart::afterDraw(QPainter &, gGraph &graph, QRectF rect)
diff --git a/oscar/Graphs/gPressureChart.h b/oscar/Graphs/gPressureChart.h
index fbfb9822..5ecf5364 100644
--- a/oscar/Graphs/gPressureChart.h
+++ b/oscar/Graphs/gPressureChart.h
@@ -43,6 +43,7 @@ public:
         return day->getCPAPModeStr() + "\n" + day->getPressureSettings() + gSummaryChart::tooltipData(day, idx);
     }
 
+    virtual int addCalc(ChannelID code, SummaryType type);
 };
 
 #endif // GPRESSURECHART_H
diff --git a/oscar/Graphs/gSessionTimesChart.cpp b/oscar/Graphs/gSessionTimesChart.cpp
index 7e380852..29aafb29 100644
--- a/oscar/Graphs/gSessionTimesChart.cpp
+++ b/oscar/Graphs/gSessionTimesChart.cpp
@@ -102,6 +102,17 @@ void gSummaryChart::SetDay(Day *unused_day)
 //QMap<QDate, int> gSummaryChart::dayindex;
 //QList<Day *> gSummaryChart::daylist;
 
+int gSummaryChart::addCalc(ChannelID code, SummaryType type, QColor color)
+{
+    calcitems.append(SummaryCalcItem(code, type, color));
+    return calcitems.size() - 1;  // return the index of the newly appended calc
+}
+
+int gSummaryChart::addCalc(ChannelID code, SummaryType type)
+{
+    return addCalc(code, type, schema::channel[code].defaultColor());
+}
+
 
 bool gSummaryChart::keyPressEvent(QKeyEvent *event, gGraph *graph)
 {
diff --git a/oscar/Graphs/gSessionTimesChart.h b/oscar/Graphs/gSessionTimesChart.h
index 87988313..bdd8bcc8 100644
--- a/oscar/Graphs/gSessionTimesChart.h
+++ b/oscar/Graphs/gSessionTimesChart.h
@@ -189,13 +189,8 @@ public:
         cache.clear();
     }
 
-
-    void addCalc(ChannelID code, SummaryType type, QColor color) {
-        calcitems.append(SummaryCalcItem(code, type, color));
-    }
-    void addCalc(ChannelID code, SummaryType type) {
-        calcitems.append(SummaryCalcItem(code, type, schema::channel[code].defaultColor()));
-    }
+    virtual int addCalc(ChannelID code, SummaryType type, QColor color);
+    virtual int addCalc(ChannelID code, SummaryType type);
 
     virtual Layer * Clone() {
         gSummaryChart * sc = new gSummaryChart(m_label, m_machtype);