From c3e3b7a9f188b71c8b42d6147ce786496b55b232 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sun, 4 Dec 2011 18:24:52 +1000
Subject: [PATCH] Fix empty days not counting in overview SummaryCharts, Add
 EPR mode to Settings chart, moved summarychart legend above graph line

---
 Graphs/gSummaryChart.cpp | 28 +++++++++++++++++++++-------
 Graphs/gSummaryChart.h   |  2 +-
 daily.ui                 |  4 ++--
 overview.cpp             |  3 ++-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp
index ff6f3972..1634c87f 100644
--- a/Graphs/gSummaryChart.cpp
+++ b/Graphs/gSummaryChart.cpp
@@ -106,9 +106,11 @@ void SummaryChart::SetDay(Day * nullday)
                 code=m_codes[j];
                 if (code==CPAP_Leak) suboffset=PROFILE["IntentionalLeak"].toDouble(); else suboffset=0;
                 type=m_type[j];
-                for (int i=0;i<d.value().size();i++) { // for each day
+                for (int i=0;i<d.value().size();i++) { // for each machine object for this day
                     day=d.value()[i];
                     if (day->machine_type()!=m_machinetype) continue;
+                    m_values[dn][j+1]=0;
+
                     bool hascode=day->channelHasData(code) || day->settingExists(code);
                     if (type==ST_HOURS || type==ST_SESSIONS || hascode) { // too many lookups happening here.. stop the crap..
                         m_days[dn]=day;
@@ -140,7 +142,7 @@ void SummaryChart::SetDay(Day * nullday)
                         m_values[dn][j+1]=tmp;
                         if (tmp<m_miny) m_miny=tmp;
                         if (tmp>m_maxy) m_maxy=tmp;
-                        m_goodcodes[code]=1;
+                        m_goodcodes[code]=true;
                         break;
                     }
                 }
@@ -157,6 +159,18 @@ void SummaryChart::SetDay(Day * nullday)
            } else m_hours[dn]=0;
         }
     }
+    for (int j=0;j<m_codes.size();j++) { // for each code slice
+        ChannelID code=m_codes[j];
+        if (!m_goodcodes.contains(code)) {
+            m_goodcodes[code]=false;
+        }
+        /*if (m_goodcodes[code]) {
+            for (QHash<int,QHash<short,EventDataType> >::iterator i=m_values.begin();i!=m_values.end();i++) {
+                if (!m_values[i.key()].contains(j+1))
+                    m_values[i.key()][j+1]=30;
+            }
+        } */
+    }
     if (m_graphtype==GT_BAR) {
         m_miny=0;
     }
@@ -427,7 +441,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
 
     // Draw Ledgend
     px=left+width-3;
-    py=top+10;
+    py=top-5;
     QString a;
     int x,y;
 
@@ -467,8 +481,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
         a+="="+val;
         GetTextExtent(a,x,y);
         px-=20+x;
-        w.renderText(a,px+20,py+5);
-        quads->add(px+5,py-3,px+18,py-3,px+18,py+4,px+5,py+4,m_colors[j]);
+        w.renderText(a,px+20,py+2);
+        quads->add(px+5,py-7,px+18,py-7,px+18,py+1,px+5,py+1,m_colors[j]);
         //lines->add(px,py,px+20,py,m_colors[j]);
         //lines->add(px,py+1,px+20,py+1,m_colors[j]);
     }
@@ -478,7 +492,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
             a=m_label+"="+QString::number(val,'f',2)+" ";
             GetTextExtent(a,x,y);
             px-=20+x;
-            w.renderText(a,px+24,py+5);
+            w.renderText(a,px+24,py+2);
             //
         }
     }
@@ -496,7 +510,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
     px-=30+x;
     //w.renderText(a,px+24,py+5);
 
-    w.renderText(a,left,top-3);
+    w.renderText(a,left,py+2);
 }
 
 QString formatTime(EventDataType v, bool show_seconds=false, bool duration=false,bool show_12hr=false)
diff --git a/Graphs/gSummaryChart.h b/Graphs/gSummaryChart.h
index 5141bdf9..86146b36 100644
--- a/Graphs/gSummaryChart.h
+++ b/Graphs/gSummaryChart.h
@@ -33,7 +33,7 @@ class SummaryChart:public Layer
 
         QVector<QColor> m_colors;
         QVector<ChannelID> m_codes;
-        QHash<ChannelID,char> m_goodcodes;
+        QHash<ChannelID,bool> m_goodcodes;
         QVector<SummaryType> m_type;
         QHash<int,QHash<short,EventDataType> > m_values;
         QHash<int,QHash<short,EventDataType> > m_times;
diff --git a/daily.ui b/daily.ui
index f7e985e8..d70e25af 100644
--- a/daily.ui
+++ b/daily.ui
@@ -248,7 +248,7 @@
         </size>
        </property>
        <property name="currentIndex">
-        <number>2</number>
+        <number>3</number>
        </property>
        <property name="movable">
         <bool>true</bool>
@@ -668,7 +668,7 @@
          <item>
           <widget class="QPushButton" name="addBookmarkButton">
            <property name="text">
-            <string>Bookmark Selection</string>
+            <string>Add Bookmark</string>
            </property>
           </widget>
          </item>
diff --git a/overview.cpp b/overview.cpp
index b108477b..a0056e59 100644
--- a/overview.cpp
+++ b/overview.cpp
@@ -166,7 +166,8 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     //set->addSlice("SysOneResistSet",QColor("grey"),ST_SETAVG);
     set->addSlice("HumidSet",QColor("blue"),ST_SETWAVG);
     set->addSlice("FlexSet",QColor("red"),ST_SETWAVG);
-    //set->addSlice("PAPMode",QColor("red"),ST_SETAVG);
+    set->addSlice("EPR",QColor("red"),ST_SETWAVG);
+    set->addSlice("SmartFlex",QColor("red"),ST_SETWAVG);
     SET->setRecMinY(0);
     SET->setRecMaxY(5);
     SET->AddLayer(set);