From 899b38737af689019d74252f16d66778f51d3b81 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sat, 24 Sep 2011 01:34:54 +1000
Subject: [PATCH] Spelling fixes, SummaryChart day counts, misc crud

---
 Graphs/gSummaryChart.cpp | 8 +++++---
 docs/channels.xml        | 5 +++--
 mainwindow.cpp           | 2 +-
 preferencesdialog.cpp    | 2 +-
 preferencesdialog.ui     | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp
index 7b698ed0..15249cf8 100644
--- a/Graphs/gSummaryChart.cpp
+++ b/Graphs/gSummaryChart.cpp
@@ -281,13 +281,15 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
                 //if (!tmp) continue;
                 if (m_type[j]==ST_MAX) {
                     if (tmp>totalvalues[j]) totalvalues[j]=tmp;
+                    totalcounts[j]=1;
                 } else if (m_type[j]==ST_MIN) {
                     if (tmp<totalvalues[j]) totalvalues[j]=tmp;
+                    totalcounts[j]=1;
                 } else {
                     totalvalues[j]+=tmp;
-                }
-                if (tmp)
                     totalcounts[j]++;
+                }
+                //if (tmp)
                 tmp-=miny;
                 h=tmp*ymult; // height in pixels
 
@@ -395,7 +397,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
             //
         }
     }*/
-    a+="Days="+QString::number(totalcounts[0],'f',0);
+    a+="Days="+QString::number(total_days,'f',0);
     GetTextExtent(a,x,y);
     px-=30+x;
     //w.renderText(a,px+24,py+5);
diff --git a/docs/channels.xml b/docs/channels.xml
index 83dc0b10..56efc8d8 100644
--- a/docs/channels.xml
+++ b/docs/channels.xml
@@ -13,7 +13,7 @@ One id code per item
   <channel id="0x1002" class="data" name="Obstructive" details="Obstructive Apnea" label="O" color="#40c0ff"/>
   <channel id="0x1003" class="data" name="Hypopnea" details="Hypopnea" label="H" color="blue"/>
   <channel id="0x1004" class="data" name="Apnea" details="Unspecified Apnea" label="A" color="dark green"/>
-  <channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" color="dark grey"/>
+  <channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" color="#202020"/>
   <channel id="0x1006" class="data" name="RERA" details="Respiratory Effort Related Arousal" label="RERA" color="gold"/>
   <channel id="0x1007" class="data" name="VSnore" details="Vibratory Snore" label="VS" unit="" color="red"/>
   <channel id="0x1008" class="data" name="VSnore2" details="Vibratory Snore 2" label="VS2" unit="" color="orange"/>
@@ -53,7 +53,7 @@ One id code per item
   <channel id="0x1156" class="data" name="PRS1_0C" details="Unknown 0C" label="U0C" unit="" color="black"/>
   <channel id="0x1157" class="data" name="PRS1_0E" details="Unknown 0E" label="U0E" unit="" color="dark green"/>
   <channel id="0x1158" class="data" name="PRS1_10" details="Unknown 10" label="U10" unit="" color="black"/>
-  <channel id="0x1159" class="data" name="PRS1_12" details="PRS1 Unknown 12" label="U12" unit="" color="black"/>
+  <channel id="0x1159" class="data" name="PRS1_12" details="Unknown 12" label="U12" unit="" color="black"/>
   <channel id="0x1160" class="data" name="RMS9_E01" details="RMS9 Empty 1" label="E01" unit="" color="black"/>
   <channel id="0x1161" class="data" name="RMS9_E02" details="RMS9 Empty 2" label="U02" unit="" color="black"/>
 
@@ -76,6 +76,7 @@ One id code per item
   <channel id="0x2001" class="data" name="ZEOBW" details="Zeo Brainwave" label="ZeoWave" color="black"/>
  </group>
  <group name="GENERAL">
+  <!-- Channel List -->
   <channel id="0x0800" class="data" name="BPSys" details="Blood Pressure Systolic" label="BPS" unit="mmHg" color="red"/>
   <channel id="0x0801" class="data" name="BPDia" details="Blood Pressure Diastolic" label="BPD" unit="mmHg" color="blue"/>
   <channel id="0x0802" class="data" name="Glucose" details="Blood Glucose" label="BGL" unit="mmol/L" color="black"/>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8f1fdca2..bf9787d5 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -410,7 +410,7 @@ void MainWindow::replyFinished(QNetworkReply * reply)
                     QMessageBox::information(this,"Laziness Warning","I'd love to do it for you automatically, but it's not implemented yet.. :)",QMessageBox::Ok);
                 }
             } else {
-                QMessageBox::information(this,"SleepyHead v"+a,"Your already up to date!",QMessageBox::Ok);
+                QMessageBox::information(this,"SleepyHead v"+a,"You're already up to date!",QMessageBox::Ok);
             }
        }
     } else {
diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp
index ad34d7eb..e04e1b8a 100644
--- a/preferencesdialog.cpp
+++ b/preferencesdialog.cpp
@@ -87,7 +87,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
             ui->eventTable->setCellWidget(row,0,c);
             ui->eventTable->setCellWidget(row,1,pb);
 
-
             QColor a=ci.value()->defaultColor();//(rand() % 255, rand() % 255, rand() % 255, 255);
             QPalette p(a,a,a,a,a,a,a);
 
@@ -97,6 +96,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
             row++;
         }
     }
+    ui->eventTable->sortByColumn(2,Qt::AscendingOrder);
     QLocale locale=QLocale::system();
     QString shortformat=locale.dateFormat(QLocale::ShortFormat);
     if (!shortformat.toLower().contains("yyyy")) {
diff --git a/preferencesdialog.ui b/preferencesdialog.ui
index 7f959c72..ed4da57d 100644
--- a/preferencesdialog.ui
+++ b/preferencesdialog.ui
@@ -29,7 +29,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="profileTab">
       <attribute name="title">
@@ -348,7 +348,7 @@
          <item>
           <widget class="QCheckBox" name="memoryHogCheckbox">
            <property name="toolTip">
-            <string>Turn this off if your worried about SleepyHead consuming too much memory. 
+            <string>Turn this off if you are worried about SleepyHead consuming too much memory. 
 It will be faster changing to days you've already been to if you leave it on. </string>
            </property>
            <property name="text">