chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Square Wave plot preference, plus restart app notice on changing certain preferences

Browse Source
This commit is contained in:
Mark Watkins 2011-11-07 14:10:48 +10:00
parent 52381d2dc3
commit 073a3e901a
6 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Graphs/gGraphView.cpp
View File

@ -1404,7 +1404,6 @@ void gGraph::mouseDoubleClickEvent(QMouseEvent * event)
} }
void gGraph::keyPressEvent(QKeyEvent * event) void gGraph::keyPressEvent(QKeyEvent * event)
{ {
bool ok=false;
for (QVector<Layer *>::iterator i=m_layers.begin();i!=m_layers.end();i++) { for (QVector<Layer *>::iterator i=m_layers.begin();i!=m_layers.end();i++) {
(*i)->keyPressEvent(event); (*i)->keyPressEvent(event);
} }

4
Graphs/gLineChart.cpp
View File

@ -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 - ymin) * nmult); // Same for Y scale with precomputed gain
py=yst-((data - miny) * ymult); // Same for Y scale with precomputed gain py=yst-((data - miny) * ymult); // Same for Y scale with precomputed gain
if (px<left) px=left; //if (px<left) px=left;
if (px>left+width) px=left+width; //if (px>left+width) px=left+width;
if (firstpx) { if (firstpx) {
firstpx=false; firstpx=false;
} else { } else {

40
daily.cpp
View File

@ -167,28 +167,28 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
TE->AddLayer(AddCPAP(new gStatsLine(CPAP_Te)),LayerBottom,0,20,1); TE->AddLayer(AddCPAP(new gStatsLine(CPAP_Te)),LayerBottom,0,20,1);
TI->AddLayer(AddCPAP(new gStatsLine(CPAP_Ti)),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))); LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,Qt::darkYellow,square)));
PRD->AddLayer(AddCPAP(new gLineChart(CPAP_EPAP,Qt::blue,true))); SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::darkGray,square)));
PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAP,Qt::red,true)));
LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,Qt::darkYellow,true))); PTB->AddLayer(AddCPAP(new gLineChart(CPAP_PTB,Qt::gray,square)));
SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::darkGray,true))); MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,square)));
RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,square)));
PTB->AddLayer(AddCPAP(new gLineChart(CPAP_PTB,Qt::gray,true))); MV->AddLayer(AddCPAP(new gLineChart(CPAP_MinuteVent,Qt::darkCyan,square)));
MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false))); TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::magenta,square)));
RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,true))); FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FLG,Qt::darkBlue,square)));
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)));
//RE->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent,Qt::magenta,true))); //RE->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent,Qt::magenta,true)));
IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,true))); IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,square)));
TE->AddLayer(AddCPAP(new gLineChart(CPAP_Te,Qt::darkGreen,true))); TE->AddLayer(AddCPAP(new gLineChart(CPAP_Te,Qt::darkGreen,square)));
TI->AddLayer(AddCPAP(new gLineChart(CPAP_Ti,Qt::darkBlue,true))); TI->AddLayer(AddCPAP(new gLineChart(CPAP_Ti,Qt::darkBlue,square)));
INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,true))); INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,square)));
INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,true))); INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,square)));
PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,true))); PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,square)));
SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,true))); SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,square)));
PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethy,Qt::darkBlue,false))); PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethy,Qt::darkBlue,false)));
SPO2->forceMaxY(100); SPO2->forceMaxY(100);
@ -199,8 +199,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
graphs[i]->AddLayer(new gXAxis(),LayerBottom,0,20); graphs[i]->AddLayer(new gXAxis(),LayerBottom,0,20);
} }
layout->layout(); layout->layout();
QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday); QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday);

1
mainwindow.cpp
View File

@ -113,6 +113,7 @@ MainWindow::MainWindow(QWidget *parent) :
if (!PROFILE.Exists("MemoryHog")) PROFILE["MemoryHog"]=false; if (!PROFILE.Exists("MemoryHog")) PROFILE["MemoryHog"]=false;
if (!PROFILE.Exists("EnableGraphSnapshots")) PROFILE["EnableGraphSnapshots"]=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("EnableOximetry")) PROFILE["EnableOximetry"]=false;
if (!PROFILE.Exists("LinkGroups")) PROFILE["LinkGroups"]=false; if (!PROFILE.Exists("LinkGroups")) PROFILE["LinkGroups"]=false;
if (!PROFILE.Exists("AlwaysShowOverlayBars")) PROFILE["AlwaysShowOverlayBars"]=0; if (!PROFILE.Exists("AlwaysShowOverlayBars")) PROFILE["AlwaysShowOverlayBars"]=0;

23
preferencesdialog.cpp
View File

@ -69,6 +69,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
if (!(*profile).Exists("SkipEmptyDays")) (*profile)["SkipEmptyDays"]=true; if (!(*profile).Exists("SkipEmptyDays")) (*profile)["SkipEmptyDays"]=true;
ui->skipEmptyDays->setChecked((*profile)["SkipEmptyDays"].toBool()); 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; if (!PREF.Exists("Updates_AutoCheck")) PREF["Updates_AutoCheck"]=true;
ui->automaticallyCheckUpdates->setChecked(PREF["Updates_AutoCheck"].toBool()); ui->automaticallyCheckUpdates->setChecked(PREF["Updates_AutoCheck"].toBool());
@ -177,13 +180,24 @@ void PreferencesDialog::on_eventTable_doubleClicked(const QModelIndex &index)
void PreferencesDialog::Save() void PreferencesDialog::Save()
{ {
bool needs_restart=false;
(*profile)["UnitSystem"]=ui->unitCombo->currentText(); (*profile)["UnitSystem"]=ui->unitCombo->currentText();
//(*profile)["TimeZone"]=ui->timeZoneCombo->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)["CombineCloserSessions"]=ui->combineSlider->value();
(*profile)["IgnoreShorterSessions"]=ui->IgnoreSlider->value(); (*profile)["IgnoreShorterSessions"]=ui->IgnoreSlider->value();
(*profile)["MemoryHog"]=ui->memoryHogCheckbox->isChecked(); (*profile)["MemoryHog"]=ui->memoryHogCheckbox->isChecked();
if ((*profile)["DaySplitTime"].toTime()!=ui->timeEdit->time()) {
needs_restart=true;
}
(*profile)["DaySplitTime"]=ui->timeEdit->time(); (*profile)["DaySplitTime"]=ui->timeEdit->time();
(*profile)["AlwaysShowOverlayBars"]=ui->overlayFlagsCombo->currentIndex(); (*profile)["AlwaysShowOverlayBars"]=ui->overlayFlagsCombo->currentIndex();
@ -196,6 +210,11 @@ void PreferencesDialog::Save()
(*profile)["SyncOximetry"]=ui->oximetrySync->isChecked(); (*profile)["SyncOximetry"]=ui->oximetrySync->isChecked();
(*profile)["OximeterType"]=ui->oximetryType->currentText(); (*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(); (*profile)["SkipEmptyDays"]=ui->skipEmptyDays->isChecked();
PREF["Updates_AutoCheck"]=ui->automaticallyCheckUpdates->isChecked(); PREF["Updates_AutoCheck"]=ui->automaticallyCheckUpdates->isChecked();
PREF["Updates_CheckFrequency"]=ui->updateCheckEvery->value(); PREF["Updates_CheckFrequency"]=ui->updateCheckEvery->value();
@ -252,6 +271,10 @@ void PreferencesDialog::Save()
profile->Save(); profile->Save();
PREF.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) void PreferencesDialog::on_combineSlider_valueChanged(int position)

13
preferencesdialog.ui
View File

@ -38,7 +38,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>4</number>
</property> </property>
<widget class="QWidget" name="visualTab"> <widget class="QWidget" name="visualTab">
<attribute name="title"> <attribute name="title">
@ -133,7 +133,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="3"> <item row="9" column="0" colspan="3">
<spacer name="verticalSpacer_4"> <spacer name="verticalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -206,6 +206,13 @@ It has no effect on single cpu machines.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2">
<widget class="QCheckBox" name="squareWavePlots">
<property name="text">
<string>Square Wave Plots</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="sessionTab"> <widget class="QWidget" name="sessionTab">
@ -949,7 +956,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
<string>&amp;General</string> <string>&amp;Updates</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing"> <property name="spacing">