diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index 0aec3114..fc720b65 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -340,6 +340,10 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) } lastY[i]=top+height-1-h; } + float compliance_hours=0; + if (PROFILE.ExistsAndTrue("ShowCompliance")) { + compliance_hours=PROFILE["ComplianceHours"].toDouble(); + } Day * day; EventDataType hours; @@ -366,7 +370,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) int j; QHash >::iterator times=m_times.find(zd); QColor col=m_colors[0]; - //if (hours<4) col=QColor("#f03030"); + //if (hoursactionDebug->setChecked(PROFILE["ShowDebug"].toBool()); @@ -132,6 +133,8 @@ MainWindow::MainWindow(QWidget *parent) : if (!PROFILE.Exists("PulseChangeDuration")) PROFILE["PulseChangeDuration"]=8; if (!PROFILE.Exists("GraphHeight")) PROFILE["GraphHeight"]=180; if (!PROFILE.Exists("OxiDiscardThreshold")) PROFILE["OxiDiscardThreshold"]=10; + if (!PROFILE.Exists("ComplianceHours")) PROFILE["ComplianceHours"]=4; + if (!PROFILE.Exists("ShowCompliance")) PROFILE["ShowCompliance"]=true; //ui->actionUse_AntiAliasing->setChecked(PROFILE["UseAntiAliasing"].toBool()); ui->action_Link_Graph_Groups->setChecked(PROFILE["LinkGroups"].toBool()); diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 4597d9b0..a894ddc0 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -168,10 +168,12 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : general["SkipEmptyDays"]=Preference(p_profile,"SkipEmptyDays",PT_Checkbox,tr("Skip Empty Days"),tr("Skip over calendar days that don't have any data"),true); general["EnableMultithreading"]=Preference(p_profile,"EnableMultithreading",PT_Checkbox,tr("Enable Multithreading"),tr("Try to use extra processor cores where possible"),false); general["MemoryHog"]=Preference(p_profile,"MemoryHog",PT_Checkbox,tr("Cache Session Data"),tr("Keep session data in memory to improve load speed revisiting the date."),false); - general["GraphHeight"]=Preference(p_profile,"GraphHeight",PT_Checkbox,tr("Graph Height"),tr("Default Graph Height"),160); - general["MaskDescription"]=Preference(p_profile,"MaskDescription",PT_Checkbox,tr("Mask Description"),tr("Whatever you want to record about your mask."),QString()); - general["HighResPrinting"]=Preference(p_profile,"HighResPrinting",PT_Checkbox,tr("High Resolution Printing"),tr("Use much slower but better quality high resolution printing."),QString()); - general["EmptyGraphFun"]=Preference(p_profile,"EmptyGraphFun",PT_Checkbox,tr("Less Boring Empty Graph Pages"),tr("Make empty graph pages more attractive."),QString()); + general["GraphHeight"]=Preference(p_profile,"GraphHeight",PT_Spinbox,tr("Graph Height"),tr("Default Graph Height"),160); + general["MaskDescription"]=Preference(p_profile,"MaskDescription",PT_LineEdit,tr("Mask Description"),tr("Whatever you want to record about your mask."),QString()); + general["HighResPrinting"]=Preference(p_profile,"HighResPrinting",PT_Checkbox,tr("High Resolution Printing"),tr("Use much slower but better quality high resolution printing."),true); + general["EmptyGraphFun"]=Preference(p_profile,"EmptyGraphFun",PT_Checkbox,tr("Less Boring Empty Graph Pages"),tr("Make empty graph pages more attractive."),false); + general["ShowCompliance"]=Preference(p_profile,"ShowCompliance",PT_Checkbox,tr("Show Compliance Information"),tr("Allow compliance information to be shown."),true); + general["ComplianceHours"]=Preference(p_profile,"ComplianceHours",PT_Spinbox,tr("Compliance Hours"),tr("Regard days over this combined session length as compliant."),4.0); if (!(p_profile)->Exists("MaskStartDate")) { (PROFILE["MaskStartDate"]=PROFILE.FirstDay()); @@ -200,6 +202,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : ui->enableMultithreading->setChecked(general["EnableMultithreading"].value().toBool()); ui->cacheSessionData->setChecked(general["MemoryHog"].value().toBool()); ui->lessBoringEmptyGraphPages->setChecked(general["EmptyGraphFun"].value().toBool()); + ui->complianceGroupbox->setChecked(general["ShowCompliance"].value().toBool()); + ui->complianceHours->setValue(general["ComplianceHours"].value().toDouble()); + #ifdef Q_WS_MAC general["HighResPrinting"].setValue(true); ui->highResolutionPrinting->setChecked(true); @@ -329,6 +334,9 @@ void PreferencesDialog::Save() general["HighResPrinting"].setValue(ui->highResolutionPrinting->isChecked()); general["EmptyGraphFun"].setValue(ui->lessBoringEmptyGraphPages->isChecked()); + general["ShowCompliance"].setValue(ui->complianceGroupbox->isChecked()); + general["ComplianceHours"].setValue(ui->complianceHours->value()); + (*profile)["MaskStartDate"]=ui->startedUsingMask->date(); (*profile)["GraphHeight"]=ui->graphHeight->value(); diff --git a/preferencesdialog.ui b/preferencesdialog.ui index da625d1e..2af24339 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -38,7 +38,7 @@ - 7 + 6 @@ -1171,6 +1171,12 @@ p, li { white-space: pre-wrap; } General Settings + + 4 + + + 4 + @@ -1232,6 +1238,70 @@ this application to be unstable with this feature enabled. + + + + Show Compliance + + + true + + + + 4 + + + 4 + + + + + Regard days with under this usage as "incompliant". + + + hours + + + 1 + + + 8.000000000000000 + + + 4.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Define compliance as over + + + + + + + of usage per night + + + + + + @@ -1428,6 +1498,12 @@ this application to be unstable with this feature enabled. &Appearance + + 0 + + + 2 + @@ -1435,92 +1511,73 @@ this application to be unstable with this feature enabled. General Settings - - - 0 - - - 4 - - - 4 - - - 0 - - - 0 - + - - - - - - 0 - 0 - - - - Overlay Flags - - - - - - - - 0 - 0 - - - - The visual method of displaying waveform overlay flags. - - - - Standard Bars - - - - - Top & Bottom Markers - - - - - - - - Graph Height - - - - - - - - 0 - 0 - - - - 50 - - - 600 - - - 10 - - - 180 - - - - + + + + 0 + 0 + + + + Overlay Flags + + - + + + + + 0 + 0 + + + + The visual method of displaying waveform overlay flags. + + + + Standard Bars + + + + + Top & Bottom Markers + + + + + + + + Graph Height + + + + + + + + 0 + 0 + + + + 50 + + + 600 + + + 10 + + + 180 + + + + Qt::Vertical @@ -1589,9 +1646,15 @@ this application to be unstable with this feature enabled. 0 + + 4 + 0 + + 4 +