Preferences updates, Added primative Intentional Leak support for PRS1

Graphs/gLineChart.cpp

@@ -26,6 +26,29 @@ gLineChart::~gLineChart()
     //delete outlines;
 }
 
+void gLineChart::SetDay(Day *d)
+{
+    Layer::SetDay(d);
+
+    if (m_code==CPAP_Leak) {
+        subtract_offset=pref["IntentionalLeak"].toDouble();
+    } else subtract_offset=0;
+
+
+}
+EventDataType gLineChart::Miny()
+{
+    int m=Layer::Miny();
+    if (subtract_offset>0) {
+        m-=subtract_offset;
+        if (m<0) m=0;
+    }
+    return m;
+}
+EventDataType gLineChart::Maxy()
+{
+    return Layer::Maxy()-subtract_offset;
+}
 
 // Time Domain Line Chart
 void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
@@ -52,6 +75,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
         maxx=w.max_x, minx=w.min_x;
     }
 
+    // hmmm.. subtract_offset..
 
     if (miny<0) {
         miny=-MAX(fabs(miny),fabs(maxy));
@@ -363,6 +387,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                         time=start+tim[i];
                     }
                     data=dat[i]*gain; //
+                    data-=subtract_offset;
                     //data=el.data(i); // raw access is faster
 
                     px=xst+((time - minx) * xmult);   // Scale the time scale X to pixel scale X

Graphs/gLineChart.h

@@ -27,6 +27,10 @@ class gLineChart:public Layer
         bool GetReportEmpty() { return m_report_empty; }
         void setDisableAccel(bool b) { m_disable_accel=b; }
         bool disableAccel() { return m_disable_accel; }
+        virtual void SetDay(Day *d);
+        virtual EventDataType Miny();
+        virtual EventDataType Maxy();
+
 protected:
         bool m_report_empty;
         bool m_square_plot;
@@ -36,7 +40,7 @@ protected:
         GLBuffer * outlines;
         static const int max_drawlist_size=4096;
         QPoint m_drawlist[max_drawlist_size];
-
+        int subtract_offset;
 };
 
 #endif // GLINECHART_H

Graphs/gLineOverlay.cpp

@@ -81,7 +81,7 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh
                 quads->add(x2,start_py+height,x1,start_py+height);
                 if (quads->full()) { verts_exceeded=true; break; }
             } else if (m_flt==FT_Dot) {
-                if (pref["AlwaysShowOverlayBars"].toBool() || (xx<3600000)) {
+                if ((pref["AlwaysShowOverlayBars"].toInt()==0) || (xx<3600000)) {
                     // show the fat dots in the middle
                     points->add(x1,double(height)/double(yy)*double(-20-w.min_y)+topp);
                     if (points->full()) { verts_exceeded=true; break; }
@@ -93,7 +93,7 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh
                 }
             } else if (m_flt==FT_Bar) {
                 int z=start_py+height;
-                if (pref["AlwaysShowOverlayBars"].toBool() || (xx<3600000)) {
+                if ((pref["AlwaysShowOverlayBars"].toInt()==0) || (xx<3600000)) {
                     z=top;
 
                     points->add(x1,top);

Graphs/gSegmentChart.cpp

@@ -13,9 +13,9 @@ gSegmentChart::gSegmentChart(GraphSegmentType type,QColor gradient_color,QColor
 {
    // m_gradient_color=QColor(200,200,200);
     m_empty=true;
-    addGLBuf(poly=new GLBuffer(gradient_color,2000,GL_POLYGON));
+    addGLBuf(poly=new GLBuffer(gradient_color,4000,GL_POLYGON));
-    addGLBuf(lines=new GLBuffer(outline_color,2000,GL_LINE_LOOP));
+    addGLBuf(lines=new GLBuffer(outline_color,4000,GL_LINE_LOOP));
-    lines->setSize(1);
+    lines->setSize(1.5);
     poly->forceAntiAlias(false);
     lines->forceAntiAlias(true);
     lines->setAntiAlias(true);
@@ -72,7 +72,7 @@ void gSegmentChart::paint(gGraph & w,int left, int top, int width, int height)
 
     float j=0.0;
     float sum=0.0;
-    float step=1.0/360.0;
+    float step=1.0/720.0;
     float px,py;
     float q;
 

Graphs/gSummaryChart.cpp

@@ -50,7 +50,7 @@ void SummaryChart::SetDay(Day * nullday)
     m_fday=0;
     qint64 tt;
     m_empty=true;
-
+    int suboffset;
     SummaryType type;
     for (QMap<QDate,QVector<Day *> >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) {
         tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t();
@@ -65,6 +65,7 @@ void SummaryChart::SetDay(Day * nullday)
         bool fnd=false;
         for (int j=0;j<m_codes.size();j++) {
             code=m_codes[j];
+            if (code==CPAP_Leak) suboffset=pref["IntentionalLeak"].toDouble(); else suboffset=0;
             type=m_type[j];
             for (int i=0;i<d.value().size();i++) {
                 day=d.value()[i];
@@ -88,6 +89,10 @@ void SummaryChart::SetDay(Day * nullday)
                         case ST_SETSUM: tmp=day->settings_sum(code); break;
                     default:    break;
                     }
+                    if (suboffset>0) {
+                        tmp-=suboffset;
+                        if (tmp<0) tmp=0;
+                    }
                     //if (tmp>0) {
                         fnd=true;
                         total+=tmp;

Graphs/gYAxis.cpp

@@ -7,6 +7,7 @@
 #include <math.h>
 #include <QDebug>
 #include "gYAxis.h"
+#include "SleepLib/profiles.h"
 
 gYSpacer::gYSpacer(int spacer)
     :Layer("")
@@ -36,6 +37,7 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
     }
 
     w.roundY(miny,maxy);
+
     EventDataType dy=maxy-miny;
 
     if (height<0) return;
@@ -123,6 +125,7 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
     }
 
     w.roundY(miny,maxy);
+
     EventDataType dy=maxy-miny;
 
     //if ((w.max_x-w.min_x)==0)

SleepLib/loader_plugins/prs1_loader.cpp

@@ -865,18 +865,18 @@ bool PRS1Loader::Parse002ASV(Session *session,unsigned char *buffer,int size,qin
             break;
         case 0x0d: // All the other ASV graph stuff.
             if (!Code[12]) {
-                if (!(Code[12]=session->AddEventList("IPAP",EVL_Event))) return false;
+                if (!(Code[12]=session->AddEventList(CPAP_IPAP,EVL_Event))) return false;
-                if (!(Code[13]=session->AddEventList("IPAPLo",EVL_Event))) return false;
+                if (!(Code[13]=session->AddEventList(CPAP_IPAPLo,EVL_Event))) return false;
-                if (!(Code[14]=session->AddEventList("IPAPHi",EVL_Event))) return false;
+                if (!(Code[14]=session->AddEventList(CPAP_IPAPHi,EVL_Event))) return false;
-                if (!(Code[15]=session->AddEventList("Leak",EVL_Event))) return false;
+                if (!(Code[15]=session->AddEventList(CPAP_Leak,EVL_Event))) return false;
-                if (!(Code[16]=session->AddEventList("RespRate",EVL_Event))) return false;
+                if (!(Code[16]=session->AddEventList(CPAP_RespRate,EVL_Event))) return false;
-                if (!(Code[17]=session->AddEventList("PTB",EVL_Event))) return false;
+                if (!(Code[17]=session->AddEventList(CPAP_PTB,EVL_Event))) return false;
 
-                if (!(Code[18]=session->AddEventList("MinuteVent",EVL_Event))) return false;
+                if (!(Code[18]=session->AddEventList(CPAP_MinuteVent,EVL_Event))) return false;
-                if (!(Code[19]=session->AddEventList("TidalVolume",EVL_Event))) return false;
+                if (!(Code[19]=session->AddEventList(CPAP_TidalVolume,EVL_Event))) return false;
-                if (!(Code[20]=session->AddEventList("Snore",EVL_Event))) return false;
+                if (!(Code[20]=session->AddEventList(CPAP_Snore,EVL_Event))) return false;
-                if (!(Code[22]=session->AddEventList("EPAP",EVL_Event))) return false;
+                if (!(Code[22]=session->AddEventList(CPAP_EPAP,EVL_Event))) return false;
-                if (!(Code[23]=session->AddEventList("PS",EVL_Event))) return false;
+                if (!(Code[23]=session->AddEventList(CPAP_PS,EVL_Event))) return false;
             }
             Code[12]->AddEvent(t,data[0]=buffer[pos++]); // IAP
             Code[13]->AddEvent(t,buffer[pos++]); // IAP Low

SleepLib/loader_plugins/resmed_loader.cpp

@@ -22,6 +22,7 @@ License: GPL
 
 extern QProgressBar *qprogress;
 QHash<int,QString> RMS9ModelMap;
+QHash<ChannelID, QVector<QString> > resmed_codes;
 
 EDFParser::EDFParser(QString name)
 {
@@ -778,7 +779,44 @@ void ResInitModelMap()
     RMS9ModelMap[33064]="ResMed S8 Escape II AutoSet";
     RMS9ModelMap[33064]="ResMed S8 Escape II AutoSet";
     RMS9ModelMap[33129]="ResMed S8 AutoSet II";
-};
+
+    resmed_codes[CPAP_FlowRate].push_back("Flow");
+    resmed_codes[CPAP_MaskPressureHi].push_back("Mask Pres");
+    resmed_codes[CPAP_MaskPressureHi].push_back("Mask Pressure"); // vpap
+    resmed_codes[CPAP_RespEvent].push_back("Resp Event");
+
+    resmed_codes[CPAP_MaskPressure].push_back("Mask Pres");
+    resmed_codes[CPAP_MaskPressure].push_back("Mask Pressure"); // vpap
+
+    resmed_codes[CPAP_Pressure].push_back("Therapy Pres"); // not on vpap
+    resmed_codes[CPAP_IPAP].push_back("Insp Pressure"); // on vpap
+
+    resmed_codes[CPAP_EPAP].push_back("Exp Press");
+    resmed_codes[CPAP_EPAP].push_back("Exp Pressure"); // vpap
+    resmed_codes[CPAP_Leak].push_back("Leak");
+    resmed_codes[CPAP_RespRate].push_back("RR");
+    resmed_codes[CPAP_TidalVolume].push_back("Vt");
+    resmed_codes[CPAP_MinuteVent].push_back("MV");
+    resmed_codes[CPAP_IE].push_back("I:E"); // vpap
+    resmed_codes[CPAP_Snore].push_back("Snore Index");
+    resmed_codes[CPAP_FLG].push_back("FFL Index");
+
+    resmed_codes[CPAP_RespEvent].push_back("RE");
+    resmed_codes[CPAP_Ti].push_back("Ti");
+    resmed_codes[CPAP_Te].push_back("Te");
+
+    // Sad (oximetry)
+    resmed_codes[OXI_Pulse].push_back("Pulse");
+    resmed_codes[OXI_SPO2].push_back("SpO2");
+
+    // Event annotations
+    resmed_codes[CPAP_Obstructive].push_back("Obstructive apnea");
+    resmed_codes[CPAP_Hypopnea].push_back("Hypopnea");
+    resmed_codes[CPAP_Apnea].push_back("Apnea");
+    resmed_codes[CPAP_ClearAirway].push_back("Central apnea");
+
+    // STR.edf
+}
 
 
 bool resmed_initialized=false;

SleepLib/machine_common.h

@@ -54,6 +54,8 @@ enum MCDataType
 { MC_bool=0, MC_int, MC_long, MC_float, MC_double, MC_string, MC_datetime };
 
 const QString CPAP_IPAP="IPAP";
+const QString CPAP_IPAPLo="IPAPLo";
+const QString CPAP_IPAPHi="IPAPHi";
 const QString CPAP_EPAP="EPAP";
 const QString CPAP_Pressure="Pressure";
 const QString CPAP_PS="PS";

daily.cpp

@@ -530,14 +530,17 @@ void Daily::Load(QDate date)
             OXI_Pulse,OXI_SPO2
         };
         int numchans=sizeof(chans)/sizeof(ChannelID);
+        int suboffset;
         for (int i=0;i<numchans;i++) {
+
             ChannelID code=chans[i];
             if (cpap && cpap->channelHasData(code)) {
+                if (code==CPAP_Leak) suboffset=pref["IntentionalLeak"].toDouble(); else suboffset=0;
                 html+="<tr><td align=left>"+schema::channel[code].label();
-                html+="</td><td>"+a.sprintf("%.2f",cpap->min(code));
+                html+="</td><td>"+a.sprintf("%.2f",cpap->min(code)-suboffset);
-                html+="</td><td>"+a.sprintf("%.2f",cpap->wavg(code));
+                html+="</td><td>"+a.sprintf("%.2f",cpap->wavg(code)-suboffset);
-                html+="</td><td>"+a.sprintf("%.2f",cpap->p90(code));
+                html+="</td><td>"+a.sprintf("%.2f",cpap->p90(code)-suboffset);
-                html+="</td><td>"+a.sprintf("%.2f",cpap->max(code));
+                html+="</td><td>"+a.sprintf("%.2f",cpap->max(code)-suboffset);
                 html+="</td><tr>";
             }
             if (oxi && oxi->channelHasData(code)) {
@@ -790,9 +793,6 @@ void Daily::UpdateOXIGraphs(Day *day)
 void Daily::RedrawGraphs()
 {
     GraphView->updateGL();
-    /*for (int i=0;i<Graphs.size();i++) {
-       Graphs[i]->updateGL();
-    } */
 }
 
 void Daily::on_treeWidget_itemSelectionChanged()

mainwindow.cpp

@@ -113,9 +113,6 @@ MainWindow::MainWindow(QWidget *parent) :
 
     if (!pref.Exists("Profile")) pref["Profile"]=getUserName();
 
-    if (!pref.Exists("LinkGraphMovement")) pref["LinkGraphMovement"]=true;
-    ui->action_Link_Graphs->setChecked(pref["LinkGraphMovement"].toBool());
-
     if (!pref.Exists("ShowDebug")) pref["ShowDebug"]=true;
     ui->actionDebug->setChecked(pref["ShowDebug"].toBool());
 
@@ -123,27 +120,24 @@ MainWindow::MainWindow(QWidget *parent) :
         ui->logText->hide();
     }
 
-    bool usethreading=QThread::idealThreadCount()>1;
-
     // This speeds up the second part of importing craploads.. later it will speed up the first part too.
-    if (!pref.Exists("EnableMultithreading")) pref["EnableMultithreading"]=usethreading;
+    if (!pref.Exists("EnableMultithreading")) pref["EnableMultithreading"]=QThread::idealThreadCount()>1;
-    ui->actionEnable_Multithreading->setChecked(pref["EnableMultithreading"].toBool());
+    if (!pref.Exists("MemoryHog")) pref["MemoryHog"]=false;
-
+    if (!pref.Exists("EnableGraphSnapshots")) pref["EnableGraphSnapshots"]=false;
-
+    if (!pref.Exists("AlwaysShowOverlayBars")) pref["AlwaysShowOverlayBars"]=0;
-    if (!pref.Exists("MemoryHog")) pref["MemoryHog"]=true;
-
-    if (!pref.Exists("fruitsalad")) pref["fruitsalad"]=true;
-
     if (!pref.Exists("UseAntiAliasing")) pref["UseAntiAliasing"]=false;
-    ui->actionUse_AntiAliasing->setChecked(pref["UseAntiAliasing"].toBool());
+    if (!pref.Exists("IntentionalLeak")) pref["IntentionalLeak"]=(double)0.0;
+    if (!pref.Exists("IgnoreShorterSessions")) pref["IgnoreShorterSessions"]=0;
+    if (!pref.Exists("CombineCloserSessions")) pref["CombineCloserSessions"]=0;
+    if (!pref.Exists("DaySplitTime")) pref["DaySplitTime"]=QTime(12,0,0,0);
+    //DateTime(QDate::currentDate(),QTime(12,0,0,0),Qt::UTC).time();
+
+
+    //ui->actionUse_AntiAliasing->setChecked(pref["UseAntiAliasing"].toBool());
 
 
     first_load=true;
 
-    if (!pref.Exists("AlwaysShowOverlayBars")) pref["AlwaysShowOverlayBars"]=true;
-    ui->actionOverlay_Bars->setChecked(pref["AlwaysShowOverlayBars"].toBool());
-
-
     ui->tabWidget->setCurrentWidget(ui->welcome);
 
     netmanager = new QNetworkAccessManager(this);
@@ -354,19 +348,6 @@ void MainWindow::on_action_About_triggered()
     msgbox.exec();
 }
 
-void MainWindow::on_action_Link_Graphs_triggered(bool checked)
-{
-    pref["LinkGraphMovement"]=checked;
-}
-
-void MainWindow::on_actionUse_AntiAliasing_triggered(bool checked)
-{
-    pref["UseAntiAliasing"]=checked;
-    if (daily)
-        daily->RedrawGraphs();
-
-}
-
 void MainWindow::on_actionDebug_toggled(bool checked)
 {
     pref["ShowDebug"]=checked;
@@ -377,13 +358,6 @@ void MainWindow::on_actionDebug_toggled(bool checked)
     }
 }
 
-void MainWindow::on_actionOverlay_Bars_toggled(bool checked)
-{
-    pref["AlwaysShowOverlayBars"]=checked;
-    if (daily)
-        daily->RedrawGraphs();
-}
-
 void MainWindow::on_action_Reset_Graph_Layout_triggered()
 {
     if (daily && (ui->tabWidget->currentWidget()==daily)) daily->ResetGraphLayout();
@@ -396,6 +370,14 @@ void MainWindow::on_action_Preferences_triggered()
     if (pd.exec()==PreferencesDialog::Accepted) {
         qDebug() << "Preferences Accepted";
         pd.Save();
+        if (daily) {
+            daily->ReloadGraphs();
+            daily->RedrawGraphs();
+        }
+        if (overview) {
+            overview->ReloadGraphs();
+            overview->RedrawGraphs();
+        }
     }
 }
 
@@ -408,14 +390,6 @@ void MainWindow::on_oximetryButton_clicked()
     }
 }
 
-void MainWindow::on_actionEnable_Multithreading_toggled(bool checked)
-{
-    pref["EnableMultithreading"]=checked;
-    if (checked) {
-        //qDebug() << "Multithreading feature is disabled due to it currently being useless.";
-    }
-}
-
 void MainWindow::on_actionCheck_for_Updates_triggered()
 {
     netmanager->get(QNetworkRequest(QUrl("http://sleepyhead.sourceforge.net/current_version.txt")));

mainwindow.h

@@ -70,22 +70,14 @@ private slots:
 
     void Startup();
 
-    void on_action_Link_Graphs_triggered(bool checked);
-
-    void on_actionUse_AntiAliasing_triggered(bool checked);
-
     void on_actionDebug_toggled(bool arg1);
 
-    void on_actionOverlay_Bars_toggled(bool arg1);
-
     void on_action_Reset_Graph_Layout_triggered();
 
     void on_action_Preferences_triggered();
 
     void on_oximetryButton_clicked();
 
-    void on_actionEnable_Multithreading_toggled(bool arg1);
-
     void on_actionCheck_for_Updates_triggered();
 
     void replyFinished(QNetworkReply*);

mainwindow.ui

@@ -595,11 +595,6 @@
     <addaction name="actionView_Overview"/>
     <addaction name="actionView_O_ximetry"/>
     <addaction name="separator"/>
-    <addaction name="actionUse_AntiAliasing"/>
-    <addaction name="actionOverlay_Bars"/>
-    <addaction name="actionEnable_Multithreading"/>
-    <addaction name="action_Link_Graphs"/>
-    <addaction name="separator"/>
     <addaction name="action_Fullscreen"/>
     <addaction name="action_Screenshot"/>
     <addaction name="separator"/>

overview.cpp

@@ -168,6 +168,12 @@ void Overview::ReloadGraphs()
     GraphView->setDay(NULL);
 
 }
+
+void Overview::RedrawGraphs()
+{
+    GraphView->updateGL();
+}
+
 void Overview::UpdateCalendarDay(QDateEdit * dateedit,QDate date)
 {
     QCalendarWidget *calendar=dateedit->calendarWidget();

overview.h

@@ -30,8 +30,9 @@ public:
     ~Overview();
 
     void ReloadGraphs();
-    //void UpdateGraphs();
     void ResetGraphLayout();
+    void RedrawGraphs();
+
 
     gGraph *AHI,*UC,*PR,*LK,*NPB,*SET;
     SummaryChart *bc,*uc,*pr,*lk,*npb,*set;

preferencesdialog.cpp

@@ -42,43 +42,30 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
     i=ui->timeZoneCombo->findText((*profile)["TimeZone"].toString());
     ui->timeZoneCombo->setCurrentIndex(i);
 
-    if (pref.Exists("DaySplitTime")) {
+    QTime t=pref["DaySplitTime"].toTime();
-        QTime t=pref["DaySplitTime"].toTime();
+    ui->timeEdit->setTime(t);
-        ui->timeEdit->setTime(t);
-    }
     int val;
 
-    if (pref.Exists("CombineCloserSessions")) {
+    val=pref["CombineCloserSessions"].toInt();
-        val=pref["CombineCloserSessions"].toInt();
+    ui->combineSlider->setValue(val);
-        ui->combineSlider->setValue(val);
-    } else {
-        ui->combineSlider->setValue(val=0);
-        pref["CombineCloserSessions"]=val;
-    }
     if (val>0) {
         ui->combineLCD->display(val);
     } else ui->combineLCD->display(tr("OFF"));
 
 
-    if (pref.Exists("IgnoreShorterSessions")) {
+    val=pref["IgnoreShorterSessions"].toInt();
-        val=pref["IgnoreShorterSessions"].toInt();
+    ui->IgnoreSlider->setValue(val);
-        ui->IgnoreSlider->setValue(val);
+
-    } else {
-        ui->IgnoreSlider->setValue(val=0);
-        pref["IgnoreShorterSessions"]=val;
-    }
     if (val>0) {
         ui->IgnoreLCD->display(val);
     } else ui->IgnoreLCD->display(tr("OFF"));
 
-
+    ui->overlayFlagsCombo->setCurrentIndex(pref["AlwaysShowOverlayBars"].toInt());
-    bool b;
+    ui->useAntiAliasing->setChecked(pref["UseAntiAliasing"].toBool());
-    if (pref.Exists("MemoryHog")) {
+    ui->memoryHogCheckbox->setChecked(pref["MemoryHog"].toBool());
-        b=pref["MemoryHog"].toBool();
+    ui->useGraphSnapshots->setChecked(pref["EnableGraphSnapshots"].toBool());
-    } else {
+    ui->intentionalLeakEdit->setValue(pref["IntentionalLeak"].toDouble());
-        pref["MemoryHog"]=b=false;
+    ui->useMultithreading->setChecked(pref["EnableMultithreading"].toBool());
-    }
-    ui->memoryHogCheckbox->setChecked(b);
 
     ui->eventTable->setColumnWidth(0,40);
     ui->eventTable->setColumnWidth(1,55);
@@ -169,19 +156,26 @@ void PreferencesDialog::Save()
     pref["MemoryHog"]=ui->memoryHogCheckbox->isChecked();
     pref["DaySplitTime"]=ui->timeEdit->time();
 
+    pref["AlwaysShowOverlayBars"]=ui->overlayFlagsCombo->currentIndex();
+    pref["UseAntiAliasing"]=ui->useAntiAliasing->isChecked();
+    pref["MemoryHog"]=ui->memoryHogCheckbox->isChecked();
+    pref["EnableGraphSnapshots"]=ui->useGraphSnapshots->isChecked();
+    pref["IntentionalLeak"]=ui->intentionalLeakEdit->value();
+    pref["EnableMultithreading"]=ui->useMultithreading->isChecked();
+
+
     profile->Save();
     pref.Save();
 }
 
-
+void PreferencesDialog::on_combineSlider_valueChanged(int position)
-void PreferencesDialog::on_combineSlider_sliderMoved(int position)
 {
     if (position>0) {
         ui->combineLCD->display(position);
     } else ui->combineLCD->display(tr("OFF"));
 }
 
-void PreferencesDialog::on_IgnoreSlider_sliderMoved(int position)
+void PreferencesDialog::on_IgnoreSlider_valueChanged(int position)
 {
     if (position>0) {
         ui->IgnoreLCD->display(position);

preferencesdialog.h

@@ -25,9 +25,9 @@ public:
     void Save();
 private slots:
     void on_eventTable_doubleClicked(const QModelIndex &index);
-    void on_combineSlider_sliderMoved(int position);
+    void on_combineSlider_valueChanged(int value);
 
-    void on_IgnoreSlider_sliderMoved(int position);
+    void on_IgnoreSlider_valueChanged(int value);
 
 private:
     Ui::PreferencesDialog *ui;

preferencesdialog.ui

@@ -29,7 +29,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="profileTab">
       <attribute name="title">
@@ -352,7 +352,7 @@
 It will be faster changing to days you've already been to if you leave it on. </string>
            </property>
            <property name="text">
-            <string>Retain event data in memory</string>
+            <string>Cache event data in memory</string>
            </property>
           </widget>
          </item>
@@ -514,6 +514,134 @@ p, li { white-space: pre-wrap; }
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>&amp;CPAP/Visual</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_10">
+         <item>
+          <widget class="QLabel" name="label_17">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Intentional Leak</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDoubleSpinBox" name="intentionalLeakEdit">
+           <property name="toolTip">
+            <string>Intentional Leak value for your Mask type in Litres/Minute.
+(ResMed machines only report unintentional leaks and don't need this)
+</string>
+           </property>
+           <property name="suffix">
+            <string/>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="0" column="1">
+        <widget class="QCheckBox" name="useGraphSnapshots">
+         <property name="toolTip">
+          <string>The Pie Chart in the Daily Views left panel. 
+This takes extra space, and has been known to cause problems on certain computer configurations, hence it's turned off by default.</string>
+         </property>
+         <property name="text">
+          <string>Graph Snapshots</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_11">
+         <item>
+          <widget class="QLabel" name="label_18">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Overlay Flags</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="overlayFlagsCombo">
+           <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>
+        </layout>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="useAntiAliasing">
+         <property name="toolTip">
+          <string>Reduces the jagged edges on lines a little.</string>
+         </property>
+         <property name="text">
+          <string>Use Anti-Aliasing</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>264</width>
+           <height>108</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="3" column="1">
+        <spacer name="verticalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>185</width>
+           <height>108</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="useMultithreading">
+         <property name="toolTip">
+          <string>You may need to disable this if your experiencing crashes.
+It has no effect on single cpu machines.</string>
+         </property>
+         <property name="text">
+          <string>Use Multi-Threading</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>&amp;Events</string>