Added ToolTip & yAxisScaling preferences

sleepyhead/Graphs/gFlagsLine.cpp

@@ -107,6 +107,8 @@ void gFlagsGroup::paint(gGraph &g, int left, int top, int width, int height)
 
 bool gFlagsGroup::mouseMoveEvent(QMouseEvent * event,gGraph * graph)
 {
+    if (!p_profile->appearance->graphTooltips())
+        return false;
 
     for (int i=0;i<lvisible.size();i++) {
         gFlagsLine *fl=lvisible[i];
@@ -117,8 +119,8 @@ bool gFlagsGroup::mouseMoveEvent(QMouseEvent * event,gGraph * graph)
             if ((event->y() > fl->m_rect.y()) && (event->y()) < (fl->m_rect.y()+fl->m_rect.height())) {
                 if (event->x() < lvisible[i]->m_rect.x()) {
                     // Display tooltip
-                    QString ttip=schema::channel[fl->code()].description();
+                    QString ttip=schema::channel[fl->code()].fullname()+"\n"+schema::channel[fl->code()].description();
-                    graph->graphView()->m_tooltip->display(ttip,event->x(),event->y()-15,p_profile->general->tooltipTimeout());
+                    graph->ToolTip(ttip,event->x(),event->y()-15);
                     graph->redraw();
                 }
             }

sleepyhead/Graphs/gGraphView.cpp

@@ -723,7 +723,7 @@ gToolTip::gToolTip(gGraphView * graphview)
     m_pos.setX(0);
     m_pos.setY(0);
     m_visible=false;
-    m_spacer=2; // pixels around text area
+    m_spacer=8; // pixels around text area
     timer=new QTimer(graphview);
     connect(timer,SIGNAL(timeout()),SLOT(timerDone()));
 }
@@ -742,6 +742,9 @@ gToolTip::~gToolTip()
 
 void gToolTip::display(QString text, int x, int y, int timeout)
 {
+    if (timeout<=0)
+        timeout=p_profile->general->tooltipTimeout();
+
     m_text=text;
     m_visible=true;
     // TODO: split multiline here
@@ -838,7 +841,7 @@ void gToolTip::paint()     //actually paints it.
         lines_drawn_this_frame+=4;
         quads_drawn_this_frame+=1;
 
-        QBrush brush(QColor(255,255,128,200));
+        QBrush brush(QColor(255,255,128,230));
         brush.setStyle(Qt::SolidPattern);
         painter.setBrush(brush);
         painter.setPen(QColor(0,0,0,255));

sleepyhead/Graphs/gGraphView.h

@@ -504,7 +504,7 @@ public:
     /*! \fn virtual void display(QString text, int x, int y, int timeout=2000);
         \brief Set the tooltips display message, position, and timeout value
         */
-    virtual void display(QString text, int x, int y, int timeout=2000);
+    virtual void display(QString text, int x, int y, int timeout=0);
 
     //! \brief Queue the actual OpenGL drawing instructions
     virtual void paint(); //actually paints it.

sleepyhead/Graphs/gLineChart.cpp

@@ -159,7 +159,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
         miny=-MAX(fabs(miny),fabs(maxy));
     }*/
 
-    if (w.zoomY()==0) {
+    if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
         miny=m_physminy, maxy=m_physmaxy;
     } else {
         miny=w.min_y, maxy=w.max_y;
@@ -702,7 +702,7 @@ void AHIChart::paint(gGraph & w,int left, int top, int width, int height)
 
     // hmmm.. subtract_offset..
 
-    if (w.zoomY()==0) {
+    if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
         miny=w.physMinY();
         maxy=w.physMaxY();
     } else {

sleepyhead/Graphs/gSummaryChart.cpp

@@ -304,7 +304,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
     EventDataType maxy;
     EventDataType miny;
 
-    if (w.zoomY()==0) {
+    if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
         maxy=m_physmaxy;
         miny=m_physminy;
         w.roundY(miny,maxy);

sleepyhead/Graphs/gYAxis.cpp

@@ -7,7 +7,7 @@
 #include <math.h>
 #include <QDebug>
 #include "gYAxis.h"
-//#include "SleepLib/profiles.h"
+#include "SleepLib/profiles.h"
 
 gXGrid::gXGrid(QColor col)
     :Layer(NoChannel)
@@ -31,7 +31,7 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
 
     EventDataType miny,maxy;
 
-    if (w.zoomY()==0) {
+    if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
         miny=w.physMinY();
         maxy=w.physMaxY();
     } else {
@@ -273,7 +273,7 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
         EventDataType miny;
         EventDataType maxy;
 
-        if (w.zoomY()==0) {
+        if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
             miny=w.physMinY();
             maxy=w.physMaxY();
         } else {
@@ -378,6 +378,9 @@ const QString gYAxis::Format(EventDataType v, int dp) {
 
 bool gYAxis::mouseMoveEvent(QMouseEvent * event, gGraph * graph)
 {
+    if (!p_profile->appearance->graphTooltips())
+        return false;
+
     int x=event->x();
     int y=event->y();
     if (!graph->units().isEmpty()) {

sleepyhead/SleepLib/profiles.h

@@ -227,6 +227,8 @@ const QString STR_AS_Animations="AnimationsAndTransitions";
 const QString STR_AS_SquareWave="SquareWavePlots";
 const QString STR_AS_OverlayType="OverlayType";
 const QString STR_AS_UsePixmapCaching="UsePixmapCaching";
+const QString STR_AS_AllowYAxisScaling="AllowYAxisScaling";
+const QString STR_AS_GraphTooltips="GraphTooltips";
 
 // UserSettings Strings
 const QString STR_US_UnitSystem="UnitSystem";
@@ -530,6 +532,8 @@ public:
         if (!m_profile->contains(STR_AS_GraphSnapshots)) (*m_profile)[STR_AS_GraphSnapshots]=true;
         if (!m_profile->contains(STR_AS_Animations)) (*m_profile)[STR_AS_Animations]=true;
         if (!m_profile->contains(STR_AS_SquareWave)) (*m_profile)[STR_AS_SquareWave]=false;
+        if (!m_profile->contains(STR_AS_AllowYAxisScaling)) (*m_profile)[STR_AS_AllowYAxisScaling]=true;
+        if (!m_profile->contains(STR_AS_GraphTooltips)) (*m_profile)[STR_AS_GraphTooltips]=true;
         if (!m_profile->contains(STR_AS_UsePixmapCaching)) (*m_profile)[STR_AS_UsePixmapCaching]=true;
         if (!m_profile->contains(STR_AS_OverlayType)) (*m_profile)[STR_AS_OverlayType]=ODT_Bars;
     }
@@ -549,6 +553,10 @@ public:
     bool usePixmapCaching() { return (*m_profile)[STR_AS_UsePixmapCaching].toBool(); }
     //! \brief Returns true if Square Wave plots are preferred (where possible)
     bool squareWavePlots() { return (*m_profile)[STR_AS_SquareWave].toBool(); }
+    //! \brief Whether to allow double clicking on Y-Axis labels to change vertical scaling mode
+    bool allowYAxisScaling() { return (*m_profile)[STR_AS_AllowYAxisScaling].toBool(); }
+    //! \brief Whether to show graph tooltips
+    bool graphTooltips() { return (*m_profile)[STR_AS_GraphTooltips].toBool(); }
     //! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform)
     OverlayDisplayType overlayType() { return (OverlayDisplayType )(*m_profile)[STR_AS_OverlayType].toInt(); }
 
@@ -566,6 +574,10 @@ public:
     void setSquareWavePlots(bool sw) { (*m_profile)[STR_AS_SquareWave]=sw; }
     //! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)
     void setOverlayType(OverlayDisplayType od) { (*m_profile)[STR_AS_OverlayType]=(int)od; }
+    //! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
+    void setAllowYAxisScaling(bool b) {  (*m_profile)[STR_AS_AllowYAxisScaling]=b; }
+    //! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
+    void setGraphTooltips(bool b) {  (*m_profile)[STR_AS_GraphTooltips]=b; }
 
     Profile *m_profile;
 };

sleepyhead/SleepLib/schema.cpp

@@ -304,8 +304,8 @@ Channel::Channel(int id, ChanType type, ScopeType scope, QString code, QString f
     m_scope(scope),
     m_code(code),
     m_fullname(fullname),
-    m_label(label),
     m_description(description),
+    m_label(label),
     m_unit(unit),
     m_datatype(datatype),
     m_defaultcolor(color),

sleepyhead/SleepLib/schema.h

@@ -59,7 +59,7 @@ public:
     const QString & description() { return m_description; }
     const QString & label() { return m_label; }
     const QString & units() { return m_unit; }
-    const int linkid() { return m_link; }
+    const int & linkid() { return m_link; }
 
     void setLabel(QString label) { m_label=label; }
     void setUnit(QString unit) { m_unit=unit; }

sleepyhead/daily.cpp

@@ -398,6 +398,7 @@ Daily::~Daily()
 
 void Daily::doToggleSession(Session * sess)
 {
+    Q_UNUSED(sess)
    // sess->StoreSummary();
     Day *day=PROFILE.GetDay(previous_date,MT_CPAP);
     if (day) {
@@ -720,6 +721,7 @@ QObject *MyWebPage::createPlugin(const QString &classid, const QUrl &url, const
 {
     Q_UNUSED(paramNames)
     Q_UNUSED(paramValues)
+    Q_UNUSED(url)
 
     if (classid=="SessionBar") {
         return mainwin->getDaily()->sessionBar();
@@ -1051,6 +1053,7 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi)
 
 QString Daily::getEventBreakdown(Day * cpap)
 {
+    Q_UNUSED(cpap)
     QString html;
     html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
 

sleepyhead/mainwindow.ui

@@ -46,7 +46,16 @@
     <property name="spacing">
      <number>4</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <item>
@@ -97,7 +106,16 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
@@ -125,7 +143,16 @@
           <property name="spacing">
            <number>3</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
@@ -439,7 +466,7 @@ QToolBox::tab:selected  {
         <number>1</number>
        </property>
        <property name="currentIndex">
-        <number>0</number>
+        <number>1</number>
        </property>
        <property name="tabSpacing">
         <number>0</number>
@@ -450,7 +477,7 @@ QToolBox::tab:selected  {
           <x>0</x>
           <y>0</y>
           <width>165</width>
-          <height>514</height>
+          <height>532</height>
          </rect>
         </property>
         <property name="palette">
@@ -958,7 +985,19 @@ border: 2px solid #56789a; border-radius: 30px;
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <property name="sizeConstraint">
+          <enum>QLayout::SetNoConstraint</enum>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -1496,7 +1535,16 @@ border: 2px solid #56789a; border-radius: 30px;
             <property name="spacing">
              <number>0</number>
             </property>
-            <property name="margin">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
              <number>0</number>
             </property>
             <item>
@@ -1887,7 +1935,7 @@ border-radius: 10px;
          <item>
           <widget class="QWebView" name="bookmarkView">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -2021,7 +2069,16 @@ border-radius: 10px;
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -2367,7 +2424,7 @@ border-radius: 10px;
   <customwidget>
    <class>QWebView</class>
    <extends>QWidget</extends>
-   <header>QtWebKit/QWebView</header>
+   <header>QtWebKitWidgets/QWebView</header>
   </customwidget>
  </customwidgets>
  <resources>

sleepyhead/preferencesdialog.cpp

@@ -159,6 +159,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
     ui->usePixmapCaching->setChecked(profile->appearance->usePixmapCaching());
     ui->useSquareWavePlots->setChecked(profile->appearance->squareWavePlots());
     ui->enableGraphSnapshots->setChecked(profile->appearance->graphSnapshots());
+    ui->graphTooltips->setChecked(profile->appearance->graphTooltips());
+    ui->allowYAxisScaling->setChecked(profile->appearance->allowYAxisScaling());
+
     ui->skipLoginScreen->setChecked(PREF[STR_GEN_SkipLogin].toBool());
     ui->allowEarlyUpdates->setChecked(PREF[STR_PREF_AllowEarlyUpdates].toBool());
 
@@ -344,6 +347,9 @@ bool PreferencesDialog::Save()
         }
     }
 
+    profile->appearance->setAllowYAxisScaling(ui->allowYAxisScaling->isChecked());
+    profile->appearance->setGraphTooltips(ui->graphTooltips->isChecked());
+
     profile->appearance->setAntiAliasing(ui->useAntiAliasing->isChecked());
     profile->appearance->setUsePixmapCaching(ui->usePixmapCaching->isChecked());
     profile->appearance->setSquareWavePlots(ui->useSquareWavePlots->isChecked());

sleepyhead/preferencesdialog.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>640</width>
-    <height>462</height>
+    <height>504</height>
    </rect>
   </property>
   <property name="maximumSize">
@@ -36,7 +36,16 @@
    <property name="spacing">
     <number>4</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>4</number>
+   </property>
+   <property name="topMargin">
+    <number>4</number>
+   </property>
+   <property name="rightMargin">
+    <number>4</number>
+   </property>
+   <property name="bottomMargin">
     <number>4</number>
    </property>
    <item>
@@ -52,7 +61,16 @@
        <property name="spacing">
         <number>4</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>4</number>
+       </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <property name="rightMargin">
+        <number>4</number>
+       </property>
+       <property name="bottomMargin">
         <number>4</number>
        </property>
        <item>
@@ -151,7 +169,7 @@
               <property name="frameShape">
                <enum>QFrame::Box</enum>
               </property>
-              <property name="numDigits">
+              <property name="digitCount">
                <number>5</number>
               </property>
               <property name="segmentStyle">
@@ -408,7 +426,16 @@ p, li { white-space: pre-wrap; }
        <property name="spacing">
         <number>4</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>4</number>
+       </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <property name="rightMargin">
+        <number>4</number>
+       </property>
+       <property name="bottomMargin">
         <number>4</number>
        </property>
        <item>
@@ -638,7 +665,16 @@ p, li { white-space: pre-wrap; }
             <bool>true</bool>
            </property>
            <layout class="QGridLayout" name="gridLayout_7">
-            <property name="margin">
+            <property name="leftMargin">
+             <number>4</number>
+            </property>
+            <property name="topMargin">
+             <number>4</number>
+            </property>
+            <property name="rightMargin">
+             <number>4</number>
+            </property>
+            <property name="bottomMargin">
              <number>4</number>
             </property>
             <property name="spacing">
@@ -840,10 +876,19 @@ p, li { white-space: pre-wrap; }
             <bool>false</bool>
            </property>
            <layout class="QGridLayout" name="gridLayout_8">
-            <property name="horizontalSpacing">
+            <property name="leftMargin">
              <number>4</number>
             </property>
-            <property name="margin">
+            <property name="topMargin">
+             <number>4</number>
+            </property>
+            <property name="rightMargin">
+             <number>4</number>
+            </property>
+            <property name="bottomMargin">
+             <number>4</number>
+            </property>
+            <property name="horizontalSpacing">
              <number>4</number>
             </property>
             <item row="0" column="0">
@@ -1021,7 +1066,16 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
        <property name="spacing">
         <number>0</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
@@ -1048,7 +1102,16 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
        <item>
         <widget class="QWidget" name="widget_3" native="true">
          <layout class="QHBoxLayout" name="horizontalLayout_11">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>3</number>
+          </property>
+          <property name="topMargin">
+           <number>3</number>
+          </property>
+          <property name="rightMargin">
+           <number>3</number>
+          </property>
+          <property name="bottomMargin">
            <number>3</number>
           </property>
           <item>
@@ -1084,7 +1147,16 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
        <property name="spacing">
         <number>4</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>2</number>
+       </property>
+       <property name="topMargin">
+        <number>2</number>
+       </property>
+       <property name="rightMargin">
+        <number>2</number>
+       </property>
+       <property name="bottomMargin">
         <number>2</number>
        </property>
        <item>
@@ -1137,11 +1209,6 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
               <string>Contec CMS50</string>
              </property>
             </item>
-            <item>
-             <property name="text">
-              <string>Overpriced ResMed S9 Oximeter</string>
-             </property>
-            </item>
            </widget>
           </item>
           <item row="1" column="0" colspan="2">
@@ -1311,15 +1378,15 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.Lucida Grande UI'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600;&quot;&gt;Syncing Oximetry and CPAP Data&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt; have the correct timestamp needed to sync.&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;Live view mode (using a serial cable) is one way to acheive an accurate sync on CMS50 oximeters, but does not counter for CPAP clock drift.&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;If you start your Oximeters recording mode at &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-style:italic;&quot;&gt;exactly &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;the same time you start your CPAP machine, you can now also achieve sync. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
@@ -1334,7 +1401,16 @@ p, li { white-space: pre-wrap; }
        <property name="spacing">
         <number>4</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>4</number>
+       </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <property name="rightMargin">
+        <number>4</number>
+       </property>
+       <property name="bottomMargin">
         <number>4</number>
        </property>
        <item>
@@ -1343,7 +1419,16 @@ p, li { white-space: pre-wrap; }
           <string>General Settings</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_10">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
            <number>4</number>
           </property>
           <property name="spacing">
@@ -1800,19 +1885,52 @@ p, li { white-space: pre-wrap; }
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_11">
        <property name="spacing">
-        <number>0</number>
+        <number>4</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>2</number>
+       </property>
+       <property name="topMargin">
+        <number>2</number>
+       </property>
+       <property name="rightMargin">
+        <number>2</number>
+       </property>
+       <property name="bottomMargin">
         <number>2</number>
        </property>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_13">
+         <property name="spacing">
+          <number>8</number>
+         </property>
          <item>
           <widget class="QGroupBox" name="groupBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="title">
-            <string>General Settings</string>
+            <string>Graph Settings</string>
            </property>
            <layout class="QGridLayout" name="gridLayout_5">
+            <property name="leftMargin">
+             <number>8</number>
+            </property>
+            <property name="topMargin">
+             <number>8</number>
+            </property>
+            <property name="rightMargin">
+             <number>8</number>
+            </property>
+            <property name="bottomMargin">
+             <number>8</number>
+            </property>
+            <property name="spacing">
+             <number>-1</number>
+            </property>
             <item row="0" column="0">
              <widget class="QLabel" name="label_18">
               <property name="sizePolicy">
@@ -1826,30 +1944,6 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="QComboBox" name="overlayFlagsCombo">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="toolTip">
-               <string>The visual method of displaying waveform overlay flags.
-</string>
-              </property>
-              <item>
-               <property name="text">
-                <string>Standard Bars</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Top &amp; Bottom Markers</string>
-               </property>
-              </item>
-             </widget>
-            </item>
             <item row="1" column="0">
              <widget class="QLabel" name="label_26">
               <property name="text">
@@ -1857,6 +1951,34 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
+            <item row="2" column="1" colspan="3">
+             <widget class="QSlider" name="tooltipTimeoutSlider">
+              <property name="toolTip">
+               <string>How long you want the tooltips to stay visible.</string>
+              </property>
+              <property name="minimum">
+               <number>250</number>
+              </property>
+              <property name="maximum">
+               <number>10000</number>
+              </property>
+              <property name="singleStep">
+               <number>250</number>
+              </property>
+              <property name="pageStep">
+               <number>1000</number>
+              </property>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="tickPosition">
+               <enum>QSlider::TicksBelow</enum>
+              </property>
+              <property name="tickInterval">
+               <number>250</number>
+              </property>
+             </widget>
+            </item>
             <item row="1" column="1">
              <widget class="QSpinBox" name="graphHeight">
               <property name="sizePolicy">
@@ -1882,7 +2004,17 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
-            <item row="3" column="0" colspan="2">
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_45">
+              <property name="text">
+               <string>Tooltip Timeout</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0" rowspan="2" colspan="4">
              <spacer name="verticalSpacer">
               <property name="orientation">
                <enum>Qt::Vertical</enum>
@@ -1895,38 +2027,34 @@ p, li { white-space: pre-wrap; }
               </property>
              </spacer>
             </item>
-            <item row="2" column="1">
+            <item row="0" column="1" colspan="3">
-             <widget class="QSlider" name="tooltipTimeoutSlider">
+             <widget class="QComboBox" name="overlayFlagsCombo">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="toolTip">
-               <string>How long you want the tooltips to stay visible.</string>
+               <string>The visual method of displaying waveform overlay flags.
-              </property>
+</string>
-              <property name="minimum">
-               <number>250</number>
-              </property>
-              <property name="maximum">
-               <number>10000</number>
-              </property>
-              <property name="singleStep">
-               <number>250</number>
-              </property>
-              <property name="pageStep">
-               <number>1000</number>
-              </property>
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="tickPosition">
-               <enum>QSlider::TicksBelow</enum>
-              </property>
-              <property name="tickInterval">
-               <number>250</number>
               </property>
+              <item>
+               <property name="text">
+                <string>Standard Bars</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Top &amp; Bottom Markers</string>
+               </property>
+              </item>
              </widget>
             </item>
-            <item row="2" column="0">
+            <item row="1" column="2" colspan="2">
-             <widget class="QLabel" name="label_45">
+             <widget class="QCheckBox" name="graphTooltips">
               <property name="text">
-               <string>Tooltip Timeout</string>
+               <string>Graph Tooltips</string>
               </property>
              </widget>
             </item>
@@ -1935,77 +2063,107 @@ p, li { white-space: pre-wrap; }
          </item>
          <item>
           <widget class="Line" name="line_2">
+           <property name="frameShadow">
+            <enum>QFrame::Sunken</enum>
+           </property>
+           <property name="lineWidth">
+            <number>1</number>
+           </property>
+           <property name="midLineWidth">
+            <number>0</number>
+           </property>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QVBoxLayout" name="verticalLayout_8">
+          <widget class="QGroupBox" name="groupBox_2">
-           <item>
+           <property name="sizePolicy">
-            <widget class="QCheckBox" name="useAntiAliasing">
+            <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-             <property name="toolTip">
+             <horstretch>0</horstretch>
-              <string>Anti-Aliasing applies smoothing to graph plots.. 
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="title">
+            <string>Other Visual Settings</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_7">
+            <item>
+             <widget class="QCheckBox" name="useAntiAliasing">
+              <property name="toolTip">
+               <string>Anti-Aliasing applies smoothing to graph plots.. 
 Certain plots look more attractive with this on. 
 This also affects printed reports.
 
 Try it and see if you like it.</string>
-             </property>
+              </property>
-             <property name="text">
+              <property name="text">
-              <string>Use Anti-Aliasing</string>
+               <string>Use Anti-Aliasing</string>
-             </property>
+              </property>
-            </widget>
+             </widget>
-           </item>
+            </item>
-           <item>
+            <item>
-            <widget class="QCheckBox" name="useSquareWavePlots">
+             <widget class="QCheckBox" name="useSquareWavePlots">
-             <property name="toolTip">
+              <property name="toolTip">
-              <string>Makes certain plots look more &quot;square waved&quot;.</string>
+               <string>Makes certain plots look more &quot;square waved&quot;.</string>
-             </property>
+              </property>
-             <property name="text">
+              <property name="text">
-              <string>Square Wave Plots</string>
+               <string>Square Wave Plots</string>
-             </property>
+              </property>
-            </widget>
+             </widget>
-           </item>
+            </item>
-           <item>
+            <item>
-            <widget class="QCheckBox" name="enableGraphSnapshots">
+             <widget class="QCheckBox" name="enableGraphSnapshots">
-             <property name="toolTip">
+              <property name="toolTip">
-              <string>Allows graphs to be &quot;screenshotted&quot; for display purposes.
+               <string>Allows graphs to be &quot;screenshotted&quot; for display purposes.
 The Event Breakdown PIE chart uses this method, as does
 the printing code.
 Unfortunately some older computers/versions of Qt can cause
 this application to be unstable with this feature enabled.</string>
-             </property>
+              </property>
-             <property name="text">
+              <property name="text">
-              <string>Show event breakdown pie chart</string>
+               <string>Show event breakdown pie chart</string>
-             </property>
+              </property>
-            </widget>
+             </widget>
-           </item>
+            </item>
-           <item>
+            <item>
-            <widget class="QCheckBox" name="usePixmapCaching">
+             <widget class="QCheckBox" name="usePixmapCaching">
-             <property name="toolTip">
+              <property name="toolTip">
-              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Pixmap caching is an graphics acceleration technique. May cause problems with font drawing in graph display area on your platform.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
+              </property>
-             <property name="text">
+              <property name="text">
-              <string>Use Pixmap Caching</string>
+               <string>Use Pixmap Caching</string>
-             </property>
+              </property>
-            </widget>
+             </widget>
-           </item>
+            </item>
-           <item>
+            <item>
-            <widget class="QCheckBox" name="animationsAndTransitionsCheckbox">
+             <widget class="QCheckBox" name="animationsAndTransitionsCheckbox">
-             <property name="toolTip">
+              <property name="toolTip">
-              <string>Turn on/off the spinning &quot;context&quot; cube.
+               <string>Turn on/off the spinning &quot;context&quot; cube.
 It really doesn't use that much resources.. :)</string>
-             </property>
+              </property>
-             <property name="text">
+              <property name="text">
-              <string>Animations &amp;&amp; Fancy Stuff</string>
+               <string>Animations &amp;&amp; Fancy Stuff</string>
-             </property>
+              </property>
-            </widget>
+             </widget>
-           </item>
+            </item>
-          </layout>
+            <item>
+             <widget class="QCheckBox" name="allowYAxisScaling">
+              <property name="toolTip">
+               <string>Whether to allow changing yAxis scales by double clicking on yAxis labels</string>
+              </property>
+              <property name="text">
+               <string>Allow YAxis Scaling</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
          </item>
         </layout>
        </item>
@@ -2380,22 +2538,22 @@ It really doesn't use that much resources.. :)</string>
             </item>
            </layout>
           </item>
-          <item>
-           <spacer name="verticalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
          </layout>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </widget>
@@ -2403,10 +2561,16 @@ It really doesn't use that much resources.. :)</string>
    <item>
     <widget class="QWidget" name="widget_2" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout_9">
-      <property name="spacing">
+      <property name="leftMargin">
-       <number>6</number>
+       <number>0</number>
       </property>
-      <property name="margin">
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>