From ab09192cebe1e9cd0cddd756fa46d9c6d3bdc995 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 3 Jan 2012 14:36:47 +1000
Subject: [PATCH] Made Overview AHI SummaryChart show weighted average to match
 Statistics

---
 Graphs/gSummaryChart.cpp |  8 +++++---
 SleepLib/day.cpp         |  6 +++---
 SleepLib/profiles.cpp    | 25 +++++++++++++------------
 mainwindow.cpp           |  1 -
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp
index f78be8b2..ec3f4d49 100644
--- a/Graphs/gSummaryChart.cpp
+++ b/Graphs/gSummaryChart.cpp
@@ -359,6 +359,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
     //QHash<short, EventDataType> lastvalues;
     int total_days=0;
     double total_val=0;
+    double total_hours=0;
     //qint64 lastQ=0;
     bool lastdaygood=false;
     QVector<double> totalcounts;
@@ -481,7 +482,9 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
                 total=d.value()[0];
                 //if (total>0) {
                 if (day) {
-                    total_val+=total;
+                    EventDataType hours=m_hours[zd];
+                    total_val+=total*hours;
+                    total_hours+=hours;
                     total_days++;
                 }
                 py=top+height;
@@ -640,12 +643,11 @@ jumpnext:
     }
     if (m_graphtype==GT_BAR) {
         if (m_type.size()>1) {
-            float val=total_val/float(total_days);
+            float val=total_val/float(total_hours);
             a=m_label+"="+QString::number(val,'f',2)+" ";
             GetTextExtent(a,x,y);
             px-=20+x;
             w.renderText(a,px+24,py+1);
-            //
         }
     }
 
diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp
index 045538c6..1cb83b4d 100644
--- a/SleepLib/day.cpp
+++ b/SleepLib/day.cpp
@@ -442,12 +442,12 @@ EventDataType Day::Max(ChannelID code)
 }
 EventDataType Day::cph(ChannelID code)
 {
-    EventDataType sum=0;
+    double sum=0;
     //EventDataType h=0;
     for (int i=0;i<sessions.size();i++) {
         if (!sessions[i]->enabled()) continue;
-        if (!sessions[i]->m_cph.contains(code)) continue;
-        sum+=sessions[i]->cph(code)*sessions[i]->hours();
+        if (!sessions[i]->m_cnt.contains(code)) continue;
+        sum+=sessions[i]->count(code);
         //h+=sessions[i]->hours();
     }
     sum/=hours();
diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp
index bf83f0fa..5b5ecf77 100644
--- a/SleepLib/profiles.cpp
+++ b/SleepLib/profiles.cpp
@@ -253,7 +253,6 @@ void Profile::AddDay(QDate date,Day *day,MachineType mt) {
 Day * Profile::GetGoodDay(QDate date,MachineType type)
 {
     Day *day=NULL;
-    // profile->     why did I d that??
     if (daylist.find(date)!=daylist.end()) {
         for (QList<Day *>::iterator di=daylist[date].begin();di!=daylist[date].end();di++) {
 
@@ -613,7 +612,7 @@ EventDataType Profile::calcCount(ChannelID code, MachineType mt, QDate start, QD
             val+=day->count(code);
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     return val;
 }
 double Profile::calcSum(ChannelID code, MachineType mt, QDate start, QDate end)
@@ -629,13 +628,15 @@ double Profile::calcSum(ChannelID code, MachineType mt, QDate start, QDate end)
             val+=day->sum(code);
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     return val;
 }
 EventDataType Profile::calcHours(MachineType mt, QDate start, QDate end)
 {
-    if (!start.isValid()) start=LastGoodDay(mt);
-    if (!end.isValid()) end=LastGoodDay(mt);
+    if (!start.isValid())
+        start=LastGoodDay(mt);
+    if (!end.isValid())
+        end=LastGoodDay(mt);
     QDate date=start;
 
     double val=0;
@@ -645,7 +646,7 @@ EventDataType Profile::calcHours(MachineType mt, QDate start, QDate end)
             val+=day->hours();
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     return val;
 }
 EventDataType Profile::calcAvg(ChannelID code, MachineType mt, QDate start, QDate end)
@@ -663,7 +664,7 @@ EventDataType Profile::calcAvg(ChannelID code, MachineType mt, QDate start, QDat
             cnt++;
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     if (!cnt) return 0;
     return val/float(cnt);
 }
@@ -685,7 +686,7 @@ EventDataType Profile::calcWavg(ChannelID code, MachineType mt, QDate start, QDa
             hours+=tmph;
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     if (!hours) return 0;
     val=val/hours;
     return val;
@@ -704,7 +705,7 @@ EventDataType Profile::calcMin(ChannelID code, MachineType mt, QDate start, QDat
             if (min>tmp) min=tmp;
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     if (min>=99999999) min=0;
     return min;
 }
@@ -722,7 +723,7 @@ EventDataType Profile::calcMax(ChannelID code, MachineType mt, QDate start, QDat
             if (max<tmp) max=tmp;
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     if (max<=-99999999) max=0;
     return max;
 }
@@ -740,7 +741,7 @@ EventDataType Profile::calcSettingsMin(ChannelID code, MachineType mt, QDate sta
             if (min>tmp) min=tmp;
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     if (min>=99999999) min=0;
     return min;
 }
@@ -758,7 +759,7 @@ EventDataType Profile::calcSettingsMax(ChannelID code, MachineType mt, QDate sta
             if (max<tmp) max=tmp;
         }
         date=date.addDays(1);
-    } while (date<end);
+    } while (date<=end);
     if (max<=-99999999) max=0;
     return max;
 }
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b5ac9e29..5d35f581 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -714,7 +714,6 @@ void MainWindow::on_summaryButton_clicked()
             .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpapmonth,lastcpap),0,'f',3)
             .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpap6month,lastcpap),0,'f',3)
             .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpapyear,lastcpap),0,'f',3);
-            html+="<tr><td colspan=6>Note, AHI calcs here are different to overview calcs.. Overview shows a average of the dialy AHI's, this shows combined counts divide by combined hours</td></tr>";
         }
     }
     int oxisize=oximeters.size();