From 3d7ced425057caf202c21bb7daff7fd5acf25713 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Thu, 1 Dec 2011 19:09:33 +1000
Subject: [PATCH] More Oximetry fixes

---
 Graphs/gGraphView.cpp | 21 +++++++++++----------
 daily.cpp             |  1 +
 oximetry.cpp          | 20 ++++++++++++++------
 oximetry.ui           | 17 ++++++++++++++++-
 4 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index 2c8b571e..89d0e669 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -1599,48 +1599,49 @@ void gGraph::ToolTip(QString text, int x, int y, int timeout)
 void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
 {
     int m,t;
+    bool ymin_good=false,ymax_good=false;
     if (rec_miny!=rec_maxy) {
         if (miny>rec_miny) miny=rec_miny;
         if (maxy<rec_maxy) maxy=rec_maxy;
 
-        if (miny==rec_miny) return;
-        if (maxy==rec_maxy) return;
+        if (miny==rec_miny) ymin_good=true;
+        if (maxy==rec_maxy) ymax_good=true;
     }
     if (maxy==miny) {
         m=ceil(maxy/2.0);
         t=m*2;
         if (maxy==t) t+=2;
-        maxy=t;
+        if (!ymax_good) maxy=t;
 
         m=floor(miny/2.0);
         t=m*2;
         if (miny==t) t-=2;
         if (miny>=0 && t<0) t=0;
-        miny=t;
+        if (!ymin_good) miny=t;
         return;
     }
 
     if (maxy>=5) {
         m=ceil(maxy/5.0);
         t=m*5;
-        maxy=t;
+        if (!ymax_good) maxy=t;
         m=floor(miny/5.0);
-        miny=m*5;
+        if (!ymin_good) miny=m*5;
     } else {
         if (maxy==miny && maxy==0) {
             maxy=0.5;
         } else {
             //maxy*=4.0;
             //miny*=4.0;
-            maxy=ceil(maxy);
-            miny=floor(miny);
+            if (!ymax_good) maxy=ceil(maxy);
+            if (!ymin_good) miny=floor(miny);
             //maxy/=4.0;
             //miny/=4.0;
         }
     }
 
-    if (m_enforceMinY) { miny=f_miny; }
-    if (m_enforceMaxY) { maxy=f_maxy; }
+    //if (m_enforceMinY) { miny=f_miny; }
+    //if (m_enforceMaxY) { maxy=f_maxy; }
 }
 
 gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
diff --git a/daily.cpp b/daily.cpp
index fa09b15b..45f62860 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -269,6 +269,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
         QPushButton *btn=new QPushButton(title,this);
         btn->setCheckable(true);
         btn->setChecked((*GraphView)[i]->visible());
+        btn->setToolTip("Show/Hide "+title);
         GraphToggles[title]=btn;
         btn->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);
         ui->graphToggleArea->addWidget(btn);
diff --git a/oximetry.cpp b/oximetry.cpp
index 7f2f316b..a025f199 100644
--- a/oximetry.cpp
+++ b/oximetry.cpp
@@ -182,8 +182,8 @@ void SerialOximeter::addPulse(qint64 time, EventDataType pr)
         pulse->setMax(max);
         session->setMax(OXI_Pulse,max);
     }
+    //pulse->setLast(time);
     session->setLast(OXI_Pulse,time);
-    pulse->setLast(time);
     session->set_last(lasttime);
     emit(updatePulse(pr));
 }
@@ -209,7 +209,7 @@ void SerialOximeter::addSpO2(qint64 time, EventDataType o2)
     }
     session->setLast(OXI_SPO2,time);
     session->set_last(lasttime);
-    spo2->setLast(time);
+    //spo2->setLast(time);
     emit(updateSpO2(o2));
 }
 
@@ -846,8 +846,6 @@ void Oximetry::onDataChanged()
     spo2->setMinX(first);
     spo2->setMaxX(last);
 
-
-
     plethy->setMinY((oximeter->Plethy())->min());
     plethy->setMaxY((oximeter->Plethy())->max());
     pulse->setMinY((oximeter->Pulse())->min());
@@ -855,12 +853,19 @@ void Oximetry::onDataChanged()
     spo2->setMinY((oximeter->Spo2())->min());
     spo2->setMaxY((oximeter->Spo2())->max());
 
-    PLETHY->MinY();
+    PLETHY->SetMinY((oximeter->Plethy())->min());
+    PLETHY->SetMaxY((oximeter->Plethy())->max());
+    PULSE->SetMinY((oximeter->Pulse())->min());
+    PULSE->SetMaxY((oximeter->Pulse())->max());
+    SPO2->SetMinY((oximeter->Spo2())->min());
+    SPO2->SetMaxY((oximeter->Spo2())->max());
+
+    /*PLETHY->MinY();
     PLETHY->MaxY();
     PULSE->MinY();
     PULSE->MaxY();
     SPO2->MinY();
-    SPO2->MaxY();
+    SPO2->MaxY(); */
 
     PLETHY->SetMaxX(last);
     PULSE->SetMaxX(last);
@@ -879,6 +884,7 @@ void Oximetry::onDataChanged()
         if (qstatus2) qstatus2->setText(QString().sprintf("Rec %02i:%02i:%02i",h,m,s));
     }
 
+    GraphView->updateScale();
     GraphView->updateGL();
 }
 
@@ -1043,6 +1049,7 @@ void Oximetry::on_import_complete(Session * session)
 void Oximetry::onPulseChanged(float p)
 {
     ui->pulseLCD->display(p);
+    return;
     if (firstPulseUpdate) {
         if (secondPulseUpdate) {
             secondPulseUpdate=false;
@@ -1057,6 +1064,7 @@ void Oximetry::onPulseChanged(float p)
 void Oximetry::onSpO2Changed(float o2)
 {
     ui->spo2LCD->display(o2);
+    return;
     if (firstSPO2Update) {
         if (secondSPO2Update) {
             secondSPO2Update=false;
diff --git a/oximetry.ui b/oximetry.ui
index d2afb8dc..0455e0fc 100644
--- a/oximetry.ui
+++ b/oximetry.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>554</width>
+    <width>662</width>
     <height>361</height>
    </rect>
   </property>
@@ -51,6 +51,12 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>4</number>
+      </property>
+      <property name="margin">
+       <number>4</number>
+      </property>
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
@@ -152,6 +158,12 @@
           </disabled>
          </palette>
         </property>
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
         <property name="numDigits">
          <number>3</number>
         </property>
@@ -212,6 +224,9 @@
           </disabled>
          </palette>
         </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
         <property name="numDigits">
          <number>3</number>
         </property>