From 4f83c9b184921070b3fb3297d930f3b4167daa73 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Sun, 2 Aug 2020 20:24:56 -0700
Subject: [PATCH] Re-order popup labels on Overview graph to match order of
 slices     Also change heading on AHI Overview to show same order     Improve
 some variable names for ease of understanding code

---
 oscar/Graphs/gLineOverlay.cpp       |  6 ++---
 oscar/Graphs/gSessionTimesChart.cpp | 35 ++++++++++++++++-------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/oscar/Graphs/gLineOverlay.cpp b/oscar/Graphs/gLineOverlay.cpp
index b2d731cf..b6e1484f 100644
--- a/oscar/Graphs/gLineOverlay.cpp
+++ b/oscar/Graphs/gLineOverlay.cpp
@@ -223,11 +223,11 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
                             painter.drawRect(rect);
 
                             // Queue tooltip
-                            QString lab2 = QString("%1").arg(schema::channel[m_code].fullname());
+                            QString strEventTooltip = QString("%1").arg(schema::channel[m_code].fullname());
                             if (raw != 0)  // Hide duration when it is zero
-                                lab2 += QString(" (%1)").arg(raw);
+                                strEventTooltip += QString(" (%1)").arg(raw);
 
-                            w.ToolTip(lab2, x1 - 10, start_py + 24 + (3 * w.printScaleY()), TT_AlignRight, AppSetting->tooltipTimeout());
+                            w.ToolTip(strEventTooltip, x1 - 10, start_py + 24 + (3 * w.printScaleY()), TT_AlignRight, AppSetting->tooltipTimeout());
 
                             painter.setPen(QPen(col,3));
                         } else {
diff --git a/oscar/Graphs/gSessionTimesChart.cpp b/oscar/Graphs/gSessionTimesChart.cpp
index 29aafb29..766340d2 100644
--- a/oscar/Graphs/gSessionTimesChart.cpp
+++ b/oscar/Graphs/gSessionTimesChart.cpp
@@ -317,9 +317,10 @@ QString gSummaryChart::tooltipData(Day *, int idx)
 {
     QString txt;
     const auto & slices = cache[idx];
-    for (const auto & slice : slices) {
-        txt += QString("\n%1: %2").arg(slice.name).arg(float(slice.value), 0, 'f', 2);
-
+    int i = slices.size();
+    while (i > 0) {
+        i--;
+        txt += QString("\n%1: %2").arg(slices[i].name).arg(float(slices[i].value), 0, 'f', 2);
     }
     return txt;
 }
@@ -1240,33 +1241,35 @@ void gAHIChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRectF rect)
     QStringList txtlist;
     if (!skip) txtlist.append(QObject::tr("%1 %2 / %3 / %4").arg(STR_TR_AHI).arg(min_ahi, 0, 'f', 2).arg(med, 0, 'f', 2).arg(max_ahi, 0, 'f', 2));
 
-    for (auto & calc : calcitems) {
-        ChannelID code = calc.code;
+    int i = calcitems.size();
+    while (i > 0) {
+        i--;
+        ChannelID code = calcitems[i].code;
         schema::Channel & chan = schema::channel[code];
         float mid = 0;
         skip = true;
         switch (midcalc) {
         case 0:
-            if (calc.median_data.size() > 0) {
-                mid = median(calc.median_data.begin(), calc.median_data.end());
+            if (calcitems[i].median_data.size() > 0) {
+                mid = median(calcitems[i].median_data.begin(), calcitems[i].median_data.end());
                 skip = false;
             }
             break;
         case 1:
-            if (calc.divisor > 0) {
-                mid = calc.wavg_sum / calc.divisor;
+            if (calcitems[i].divisor > 0) {
+                mid = calcitems[i].wavg_sum / calcitems[i].divisor;
                 skip = false;
             }
             break;
         case 2:
-            if (calc.cnt > 0) {
-                mid = calc.avg_sum / calc.cnt;
+            if (calcitems[i].cnt > 0) {
+                mid = calcitems[i].avg_sum / calcitems[i].cnt;
                 skip = false;
             }
             break;
         }
 
-        if (!skip) txtlist.append(QString("%1 %2 / %3 / %4").arg(chan.label()).arg(calc.min, 0, 'f', 2).arg(mid, 0, 'f', 2).arg(calc.max, 0, 'f', 2));
+        if (!skip) txtlist.append(QString("%1 %2 / %3 / %4").arg(chan.label()).arg(calcitems[i].min, 0, 'f', 2).arg(mid, 0, 'f', 2).arg(calcitems[i].max, 0, 'f', 2));
     }
     QString txt = txtlist.join(", ");
     graph.renderText(txt, rect.left(), rect.top()-5*graph.printScaleY(), 0);
@@ -1294,9 +1297,11 @@ QString gAHIChart::tooltipData(Day *day, int idx)
     float total = 0;
     float hour = day->hours(m_machtype);
     QString txt;
-    for (const auto & slice : slices) {
-        total += slice.value;
-        txt += QString("\n%1: %2").arg(slice.name).arg(float(slice.value) / hour, 0, 'f', 2);
+    int i = slices.size();
+    while (i > 0) {
+        i--;
+        total += slices[i].value;
+        txt += QString("\n%1: %2").arg(slices[i].name).arg(float(slices[i].value) / hour, 0, 'f', 2);
     }
     return QString("\n%1: %2").arg(STR_TR_AHI).arg(float(total) / hour,0,'f',2)+txt;
 }