From 669b2a3b2bda48f81de097561367f9540425bc54 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Wed, 30 Nov 2011 16:56:20 +1000
Subject: [PATCH] ui build warning fixes, AHI calc dropoff

---
 SleepLib/calcs.cpp    |  2 +-
 daily.cpp             |  5 +++--
 preferencesdialog.cpp |  4 ----
 preferencesdialog.h   |  1 -
 preferencesdialog.ui  | 16 +---------------
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp
index ac956503..95ee1b4b 100644
--- a/SleepLib/calcs.cpp
+++ b/SleepLib/calcs.cpp
@@ -274,7 +274,7 @@ int CalcAHIGraph::calculate(Session *session)
         AHI->AddEvent(ti,ahi);
         ti+=winsize;
     }
-    AHI->AddEvent(ti,ahi);
+    AHI->AddEvent(ti,0);
 
     return AHI->count();
 }
diff --git a/daily.cpp b/daily.cpp
index 46a346c3..099cc0a1 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -188,8 +188,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAP,Qt::yellow,square)));
     PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAPHi,Qt::red,square)));
 
-    //AHI->AddLayer(AddCPAP(new gLineChart(CPAP_AHI,QColor("light green"),square)));
-    AHI->AddLayer(AddCPAP(new AHIChart(QColor("#37a24b"))));
+    AHI->AddLayer(AddCPAP(new gLineChart(CPAP_AHI,QColor("light green"),square)));
+
+    //AHI->AddLayer(AddCPAP(new AHIChart(QColor("#37a24b"))));
     LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,Qt::darkYellow,square)));
     LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_MaxLeak,Qt::darkRed,square)));
     SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::darkGray,true)));
diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp
index 032ace44..88c09d59 100644
--- a/preferencesdialog.cpp
+++ b/preferencesdialog.cpp
@@ -28,10 +28,6 @@ MaskProfile masks[]={
 };
 const int num_masks=sizeof(masks)/sizeof(MaskProfile);
 
-void PreferencesDialog::resizeEvent(QResizeEvent *e)
-{
-}
-
 
 PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
     QDialog(parent),
diff --git a/preferencesdialog.h b/preferencesdialog.h
index f6ef08af..58d1a4d1 100644
--- a/preferencesdialog.h
+++ b/preferencesdialog.h
@@ -70,7 +70,6 @@ private slots:
     void on_maskTypeCombo_activated(int index);
 
 private:
-    virtual void resizeEvent(QResizeEvent *);
     void resetGraphModel();
     Ui::PreferencesDialog *ui;
     Profile * profile;
diff --git a/preferencesdialog.ui b/preferencesdialog.ui
index bf44a6bf..2eb3a71c 100644
--- a/preferencesdialog.ui
+++ b/preferencesdialog.ui
@@ -270,12 +270,6 @@ p, li { white-space: pre-wrap; }
            </layout>
           </item>
          </layout>
-         <zorder></zorder>
-         <zorder></zorder>
-         <zorder></zorder>
-         <zorder></zorder>
-         <zorder></zorder>
-         <zorder></zorder>
         </widget>
        </item>
        <item>
@@ -344,20 +338,12 @@ p, li { white-space: pre-wrap; }
               </spacer>
              </item>
             </layout>
-            <zorder>removeImportLocation</zorder>
-            <zorder>addImportLocation</zorder>
-            <zorder>verticalSpacer_5</zorder>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
-      <zorder>label</zorder>
-      <zorder>label_3</zorder>
-      <zorder>groupBox_6</zorder>
-      <zorder>groupBox_3</zorder>
-      <zorder>line</zorder>
      </widget>
      <widget class="QWidget" name="maskTab">
       <attribute name="title">
@@ -543,7 +529,7 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </widget>
-         <widget class="QWidget" name="layoutWidget">
+         <widget class="QWidget" name="layoutWidget2">
           <layout class="QGridLayout" name="gridLayout_8">
            <item row="2" column="0" colspan="2">
             <widget class="QLabel" name="label_28">