From 073a3e901a26e8bbc821a60d82e3ec14461e6f6a Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 7 Nov 2011 14:10:48 +1000 Subject: [PATCH] Added Square Wave plot preference, plus restart app notice on changing certain preferences --- Graphs/gGraphView.cpp | 1 - Graphs/gLineChart.cpp | 4 ++-- daily.cpp | 40 +++++++++++++++++++--------------------- mainwindow.cpp | 1 + preferencesdialog.cpp | 23 +++++++++++++++++++++++ preferencesdialog.ui | 13 ++++++++++--- 6 files changed, 55 insertions(+), 27 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 67c88b03..0c45e06a 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -1404,7 +1404,6 @@ void gGraph::mouseDoubleClickEvent(QMouseEvent * event) } void gGraph::keyPressEvent(QKeyEvent * event) { - bool ok=false; for (QVector::iterator i=m_layers.begin();i!=m_layers.end();i++) { (*i)->keyPressEvent(event); } diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index bdc64fa4..ddcdee8f 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -396,8 +396,8 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height) //py=yst+((data - ymin) * nmult); // Same for Y scale with precomputed gain py=yst-((data - miny) * ymult); // Same for Y scale with precomputed gain - if (pxleft+width) px=left+width; + //if (pxleft+width) px=left+width; if (firstpx) { firstpx=false; } else { diff --git a/daily.cpp b/daily.cpp index 75ce947e..045a043f 100644 --- a/daily.cpp +++ b/daily.cpp @@ -167,28 +167,28 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) TE->AddLayer(AddCPAP(new gStatsLine(CPAP_Te)),LayerBottom,0,20,1); TI->AddLayer(AddCPAP(new gStatsLine(CPAP_Ti)),LayerBottom,0,20,1); */ + bool square=PROFILE["SquareWavePlots"].toBool(); + PRD->AddLayer(AddCPAP(new gLineChart(CPAP_Pressure,QColor("dark green"),square))); + PRD->AddLayer(AddCPAP(new gLineChart(CPAP_EPAP,Qt::blue,square))); + PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAP,Qt::red,square))); - PRD->AddLayer(AddCPAP(new gLineChart(CPAP_Pressure,QColor("dark green"),true))); - PRD->AddLayer(AddCPAP(new gLineChart(CPAP_EPAP,Qt::blue,true))); - PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAP,Qt::red,true))); + LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,Qt::darkYellow,square))); + SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::darkGray,square))); - LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,Qt::darkYellow,true))); - SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::darkGray,true))); - - PTB->AddLayer(AddCPAP(new gLineChart(CPAP_PTB,Qt::gray,true))); - MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false))); - RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,true))); - MV->AddLayer(AddCPAP(new gLineChart(CPAP_MinuteVent,Qt::darkCyan,true))); - TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::magenta,true))); - FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FLG,Qt::darkBlue,true))); + PTB->AddLayer(AddCPAP(new gLineChart(CPAP_PTB,Qt::gray,square))); + MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,square))); + RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,square))); + MV->AddLayer(AddCPAP(new gLineChart(CPAP_MinuteVent,Qt::darkCyan,square))); + TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::magenta,square))); + FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FLG,Qt::darkBlue,square))); //RE->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent,Qt::magenta,true))); - IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,true))); - TE->AddLayer(AddCPAP(new gLineChart(CPAP_Te,Qt::darkGreen,true))); - TI->AddLayer(AddCPAP(new gLineChart(CPAP_Ti,Qt::darkBlue,true))); - INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,true))); - INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,true))); - PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,true))); - SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,true))); + IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,square))); + TE->AddLayer(AddCPAP(new gLineChart(CPAP_Te,Qt::darkGreen,square))); + TI->AddLayer(AddCPAP(new gLineChart(CPAP_Ti,Qt::darkBlue,square))); + INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,square))); + INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,square))); + PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,square))); + SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,square))); PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethy,Qt::darkBlue,false))); SPO2->forceMaxY(100); @@ -199,8 +199,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) graphs[i]->AddLayer(new gXAxis(),LayerBottom,0,20); } - - layout->layout(); QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday); diff --git a/mainwindow.cpp b/mainwindow.cpp index afa85f82..bf24411e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -113,6 +113,7 @@ MainWindow::MainWindow(QWidget *parent) : if (!PROFILE.Exists("MemoryHog")) PROFILE["MemoryHog"]=false; if (!PROFILE.Exists("EnableGraphSnapshots")) PROFILE["EnableGraphSnapshots"]=false; + if (!PROFILE.Exists("SquareWavePlots")) PROFILE["SquareWavePlots"]=true; if (!PROFILE.Exists("EnableOximetry")) PROFILE["EnableOximetry"]=false; if (!PROFILE.Exists("LinkGroups")) PROFILE["LinkGroups"]=false; if (!PROFILE.Exists("AlwaysShowOverlayBars")) PROFILE["AlwaysShowOverlayBars"]=0; diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 953df5e1..92088fb3 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -69,6 +69,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : if (!(*profile).Exists("SkipEmptyDays")) (*profile)["SkipEmptyDays"]=true; ui->skipEmptyDays->setChecked((*profile)["SkipEmptyDays"].toBool()); + if (!(*profile).Exists("SquareWavePlots")) (*profile)["SquareWavePlots"]=true; + ui->squareWavePlots->setChecked((*profile)["SquareWavePlots"].toBool()); + if (!PREF.Exists("Updates_AutoCheck")) PREF["Updates_AutoCheck"]=true; ui->automaticallyCheckUpdates->setChecked(PREF["Updates_AutoCheck"].toBool()); @@ -177,13 +180,24 @@ void PreferencesDialog::on_eventTable_doubleClicked(const QModelIndex &index) void PreferencesDialog::Save() { + bool needs_restart=false; + (*profile)["UnitSystem"]=ui->unitCombo->currentText(); //(*profile)["TimeZone"]=ui->timeZoneCombo->currentText(); + if (((*profile)["CombineCloserSessions"].toInt()!=ui->combineSlider->value()) || + ((*profile)["IgnoreShorterSessions"].toInt()!=ui->IgnoreSlider->value())) { + needs_restart=true; + } (*profile)["CombineCloserSessions"]=ui->combineSlider->value(); (*profile)["IgnoreShorterSessions"]=ui->IgnoreSlider->value(); (*profile)["MemoryHog"]=ui->memoryHogCheckbox->isChecked(); + + if ((*profile)["DaySplitTime"].toTime()!=ui->timeEdit->time()) { + needs_restart=true; + } + (*profile)["DaySplitTime"]=ui->timeEdit->time(); (*profile)["AlwaysShowOverlayBars"]=ui->overlayFlagsCombo->currentIndex(); @@ -196,6 +210,11 @@ void PreferencesDialog::Save() (*profile)["SyncOximetry"]=ui->oximetrySync->isChecked(); (*profile)["OximeterType"]=ui->oximetryType->currentText(); + if (ui->squareWavePlots->isChecked() != (*profile)["SquareWavePlots"].toBool()) { + needs_restart=true; + } + (*profile)["SquareWavePlots"]=ui->squareWavePlots->isChecked(); + (*profile)["SkipEmptyDays"]=ui->skipEmptyDays->isChecked(); PREF["Updates_AutoCheck"]=ui->automaticallyCheckUpdates->isChecked(); PREF["Updates_CheckFrequency"]=ui->updateCheckEvery->value(); @@ -252,6 +271,10 @@ void PreferencesDialog::Save() profile->Save(); PREF.Save(); + + if (needs_restart) { + QMessageBox::warning(this,"Restart Required","One or more of the changes you have made will require this application to be restarted, in order for these changes to come into effect.",QMessageBox::Ok); + } } void PreferencesDialog::on_combineSlider_valueChanged(int position) diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 4a803818..85bdea00 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -38,7 +38,7 @@ - 0 + 4 @@ -133,7 +133,7 @@ - + Qt::Vertical @@ -206,6 +206,13 @@ It has no effect on single cpu machines. + + + + Square Wave Plots + + + @@ -949,7 +956,7 @@ p, li { white-space: pre-wrap; } - &General + &Updates