From a8bf17c75b6c20cfd368b026349f636f0bb9fe01 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 23 Sep 2011 13:54:48 +1000 Subject: [PATCH] Preferences updates, Added primative Intentional Leak support for PRS1 --- Graphs/gLineChart.cpp | 25 ++++ Graphs/gLineChart.h | 6 +- Graphs/gLineOverlay.cpp | 4 +- Graphs/gSegmentChart.cpp | 8 +- Graphs/gSummaryChart.cpp | 7 +- Graphs/gYAxis.cpp | 3 + SleepLib/loader_plugins/prs1_loader.cpp | 22 ++-- SleepLib/loader_plugins/resmed_loader.cpp | 40 ++++++- SleepLib/machine_common.h | 2 + daily.cpp | 14 +-- mainwindow.cpp | 66 ++++------- mainwindow.h | 8 -- mainwindow.ui | 5 - overview.cpp | 6 + overview.h | 3 +- preferencesdialog.cpp | 52 ++++----- preferencesdialog.h | 4 +- preferencesdialog.ui | 132 +++++++++++++++++++++- 18 files changed, 287 insertions(+), 120 deletions(-) diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 424a9317..5c5317b2 100644 --- a/Graphs/gLineChart.cpp +++ b/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 diff --git a/Graphs/gLineChart.h b/Graphs/gLineChart.h index 4f7d40c2..8bbbbfa8 100644 --- a/Graphs/gLineChart.h +++ b/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 diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp index 3334e570..4412fae9 100644 --- a/Graphs/gLineOverlay.cpp +++ b/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); diff --git a/Graphs/gSegmentChart.cpp b/Graphs/gSegmentChart.cpp index df0d627f..985893d6 100644 --- a/Graphs/gSegmentChart.cpp +++ b/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(lines=new GLBuffer(outline_color,2000,GL_LINE_LOOP)); - lines->setSize(1); + addGLBuf(poly=new GLBuffer(gradient_color,4000,GL_POLYGON)); + addGLBuf(lines=new GLBuffer(outline_color,4000,GL_LINE_LOOP)); + 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; diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index a8660abe..7b698ed0 100644 --- a/Graphs/gSummaryChart.cpp +++ b/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 >::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;jsettings_sum(code); break; default: break; } + if (suboffset>0) { + tmp-=suboffset; + if (tmp<0) tmp=0; + } //if (tmp>0) { fnd=true; total+=tmp; diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index 7578a8f7..c5764b75 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -7,6 +7,7 @@ #include #include #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) diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index ddc42570..03f65c6d 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/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[13]=session->AddEventList("IPAPLo",EVL_Event))) return false; - if (!(Code[14]=session->AddEventList("IPAPHi",EVL_Event))) return false; - if (!(Code[15]=session->AddEventList("Leak",EVL_Event))) return false; - if (!(Code[16]=session->AddEventList("RespRate",EVL_Event))) return false; - if (!(Code[17]=session->AddEventList("PTB",EVL_Event))) return false; + if (!(Code[12]=session->AddEventList(CPAP_IPAP,EVL_Event))) return false; + if (!(Code[13]=session->AddEventList(CPAP_IPAPLo,EVL_Event))) return false; + if (!(Code[14]=session->AddEventList(CPAP_IPAPHi,EVL_Event))) return false; + if (!(Code[15]=session->AddEventList(CPAP_Leak,EVL_Event))) return false; + if (!(Code[16]=session->AddEventList(CPAP_RespRate,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[19]=session->AddEventList("TidalVolume",EVL_Event))) return false; - if (!(Code[20]=session->AddEventList("Snore",EVL_Event))) return false; - if (!(Code[22]=session->AddEventList("EPAP",EVL_Event))) return false; - if (!(Code[23]=session->AddEventList("PS",EVL_Event))) return false; + if (!(Code[18]=session->AddEventList(CPAP_MinuteVent,EVL_Event))) return false; + if (!(Code[19]=session->AddEventList(CPAP_TidalVolume,EVL_Event))) return false; + if (!(Code[20]=session->AddEventList(CPAP_Snore,EVL_Event))) return false; + if (!(Code[22]=session->AddEventList(CPAP_EPAP,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 diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index 7b33730c..02e3b6e2 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -22,6 +22,7 @@ License: GPL extern QProgressBar *qprogress; QHash RMS9ModelMap; +QHash > 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; diff --git a/SleepLib/machine_common.h b/SleepLib/machine_common.h index 6306c872..c850dbcb 100644 --- a/SleepLib/machine_common.h +++ b/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"; diff --git a/daily.cpp b/daily.cpp index 77ea2c7a..c8fa2fc5 100644 --- a/daily.cpp +++ b/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;ichannelHasData(code)) { + if (code==CPAP_Leak) suboffset=pref["IntentionalLeak"].toDouble(); else suboffset=0; html+=""+schema::channel[code].label(); - html+=""+a.sprintf("%.2f",cpap->min(code)); - html+=""+a.sprintf("%.2f",cpap->wavg(code)); - html+=""+a.sprintf("%.2f",cpap->p90(code)); - html+=""+a.sprintf("%.2f",cpap->max(code)); + html+=""+a.sprintf("%.2f",cpap->min(code)-suboffset); + html+=""+a.sprintf("%.2f",cpap->wavg(code)-suboffset); + html+=""+a.sprintf("%.2f",cpap->p90(code)-suboffset); + html+=""+a.sprintf("%.2f",cpap->max(code)-suboffset); html+=""; } if (oxi && oxi->channelHasData(code)) { @@ -790,9 +793,6 @@ void Daily::UpdateOXIGraphs(Day *day) void Daily::RedrawGraphs() { GraphView->updateGL(); - /*for (int i=0;iupdateGL(); - } */ } void Daily::on_treeWidget_itemSelectionChanged() diff --git a/mainwindow.cpp b/mainwindow.cpp index 1b47e51f..8f1fdca2 100644 --- a/mainwindow.cpp +++ b/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; - ui->actionEnable_Multithreading->setChecked(pref["EnableMultithreading"].toBool()); - - - if (!pref.Exists("MemoryHog")) pref["MemoryHog"]=true; - - if (!pref.Exists("fruitsalad")) pref["fruitsalad"]=true; - + if (!pref.Exists("EnableMultithreading")) pref["EnableMultithreading"]=QThread::idealThreadCount()>1; + if (!pref.Exists("MemoryHog")) pref["MemoryHog"]=false; + if (!pref.Exists("EnableGraphSnapshots")) pref["EnableGraphSnapshots"]=false; + if (!pref.Exists("AlwaysShowOverlayBars")) pref["AlwaysShowOverlayBars"]=0; 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"))); diff --git a/mainwindow.h b/mainwindow.h index 752013f3..762f4ef1 100644 --- a/mainwindow.h +++ b/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*); diff --git a/mainwindow.ui b/mainwindow.ui index 805625f9..ac3423bc 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -595,11 +595,6 @@ - - - - - diff --git a/overview.cpp b/overview.cpp index 8cdd3c56..d5a894f6 100644 --- a/overview.cpp +++ b/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(); diff --git a/overview.h b/overview.h index c06c109f..52b3ea10 100644 --- a/overview.h +++ b/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; diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 6f1cadc2..9c0148f6 100644 --- a/preferencesdialog.cpp +++ b/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(); - ui->timeEdit->setTime(t); - } + QTime t=pref["DaySplitTime"].toTime(); + ui->timeEdit->setTime(t); int val; - if (pref.Exists("CombineCloserSessions")) { - val=pref["CombineCloserSessions"].toInt(); - ui->combineSlider->setValue(val); - } else { - ui->combineSlider->setValue(val=0); - pref["CombineCloserSessions"]=val; - } + val=pref["CombineCloserSessions"].toInt(); + ui->combineSlider->setValue(val); if (val>0) { ui->combineLCD->display(val); } else ui->combineLCD->display(tr("OFF")); - if (pref.Exists("IgnoreShorterSessions")) { - val=pref["IgnoreShorterSessions"].toInt(); - ui->IgnoreSlider->setValue(val); - } else { - ui->IgnoreSlider->setValue(val=0); - pref["IgnoreShorterSessions"]=val; - } + val=pref["IgnoreShorterSessions"].toInt(); + ui->IgnoreSlider->setValue(val); + if (val>0) { ui->IgnoreLCD->display(val); } else ui->IgnoreLCD->display(tr("OFF")); - - bool b; - if (pref.Exists("MemoryHog")) { - b=pref["MemoryHog"].toBool(); - } else { - pref["MemoryHog"]=b=false; - } - ui->memoryHogCheckbox->setChecked(b); + ui->overlayFlagsCombo->setCurrentIndex(pref["AlwaysShowOverlayBars"].toInt()); + ui->useAntiAliasing->setChecked(pref["UseAntiAliasing"].toBool()); + ui->memoryHogCheckbox->setChecked(pref["MemoryHog"].toBool()); + ui->useGraphSnapshots->setChecked(pref["EnableGraphSnapshots"].toBool()); + ui->intentionalLeakEdit->setValue(pref["IntentionalLeak"].toDouble()); + ui->useMultithreading->setChecked(pref["EnableMultithreading"].toBool()); 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_sliderMoved(int position) +void PreferencesDialog::on_combineSlider_valueChanged(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); diff --git a/preferencesdialog.h b/preferencesdialog.h index 9bb0b940..a98966c1 100644 --- a/preferencesdialog.h +++ b/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; diff --git a/preferencesdialog.ui b/preferencesdialog.ui index cca0d6d4..38c0c807 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -29,7 +29,7 @@ - 0 + 2 @@ -352,7 +352,7 @@ It will be faster changing to days you've already been to if you leave it on. - Retain event data in memory + Cache event data in memory @@ -514,6 +514,134 @@ p, li { white-space: pre-wrap; } + + + &CPAP/Visual + + + + + + + + + 0 + 0 + + + + Intentional Leak + + + + + + + Intentional Leak value for your Mask type in Litres/Minute. +(ResMed machines only report unintentional leaks and don't need this) + + + + + + + + + + + + + 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. + + + Graph Snapshots + + + + + + + + + + 0 + 0 + + + + Overlay Flags + + + + + + + The visual method of displaying waveform overlay flags. + + + + Standard Bars + + + + + Top & Bottom Markers + + + + + + + + + + Reduces the jagged edges on lines a little. + + + Use Anti-Aliasing + + + + + + + Qt::Vertical + + + + 264 + 108 + + + + + + + + Qt::Vertical + + + + 185 + 108 + + + + + + + + You may need to disable this if your experiencing crashes. +It has no effect on single cpu machines. + + + Use Multi-Threading + + + + + &Events