From e53eae62781696e851dc35acc45eeb9cd8287d62 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 30 Nov 2011 19:08:45 +1000 Subject: [PATCH] More cleanups to previous crud.. Dropped mask history idea --- Graphs/gSummaryChart.cpp | 22 +- daily.ui | 64 ++--- overview.cpp | 2 +- preferencesdialog.cpp | 62 ++--- preferencesdialog.h | 2 +- preferencesdialog.ui | 491 +++++++++++++++++++-------------------- 6 files changed, 309 insertions(+), 334 deletions(-) diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index 75aa616d..30b9c426 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -304,19 +304,22 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) if (m_graphtype==GT_SESSIONS) { int j; QHash >::iterator times=m_times.find(zd); + QColor col=m_colors[0]; + //if (hours<4) col=QColor("#f03030"); + + if (zd==hl_day) { + col=QColor("gold"); + } + QColor col2=brighten(col); for (j=0;jadd(x1,py,x1,py-h,col); quads->add(x2,py-h,x2,py,col2); @@ -349,12 +352,19 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) if (!j) continue; j--; + tmp=g.value(); + QColor col=m_colors[j]; + if (m_type[j]==ST_HOURS) { + if (tmp<4) { + col=QColor("#f04040"); + } + } + if (zd==hl_day) { col=QColor("gold"); } - tmp=g.value(); //if (!tmp) continue; if (m_type[j]==ST_MAX) { if (tmp>totalvalues[j]) totalvalues[j]=tmp; diff --git a/daily.ui b/daily.ui index 40967469..ff4437ec 100644 --- a/daily.ui +++ b/daily.ui @@ -136,38 +136,6 @@ - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - Go to the most recent day with data records - - - >| - - - - :/icons/last.png:/icons/last.png - - - Qt::ToolButtonTextOnly - - - true - - - @@ -206,6 +174,38 @@ + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + Go to the most recent day with data records + + + >| + + + + :/icons/last.png:/icons/last.png + + + Qt::ToolButtonTextOnly + + + true + + + diff --git a/overview.cpp b/overview.cpp index ba24c296..d2fe7900 100644 --- a/overview.cpp +++ b/overview.cpp @@ -103,7 +103,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : UC->AddLayer(uc); us=new SummaryChart("Hours",GT_SESSIONS); - us->addSlice("",QColor("#c0c0ff"),ST_HOURS); + us->addSlice("",QColor("dark blue"),ST_HOURS); us->addSlice("",QColor("blue"),ST_SESSIONS); US->AddLayer(us); diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 88c09d59..10006ffe 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -137,35 +137,25 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : //ui->skipEmptyDays->setChecked((*profile)["SkipEmptyDays"].toBool()); general.clear(); - general.push_back(Preference(p_profile,"UseAntiAliasing",PT_Checkbox,"Use Anti-Aliasing","Enable Graphical smoothing. Doesn't always look pretty.",false)); - general.push_back(Preference(p_profile,"SquareWavePlots",PT_Checkbox,"Square Wave Plots","Try to use Square Wave plots where possible",true)); - general.push_back(Preference(p_profile,"EnableGraphSnapshots",PT_Checkbox,"Event Breakdown Piechart","Shows Event Breakdown in Daily view. This may cause problems on older computers.",true)); - general.push_back(Preference(p_pref,"SkipLoginScreen",PT_Checkbox,"Skip Login Screen","Bypass the login screen at startup",false)); - general.push_back(Preference(p_profile,"SkipEmptyDays",PT_Checkbox,"Skip Empty Days","Skip over calendar days that don't have any data",true)); - general.push_back(Preference(p_profile,"EnableMultithreading",PT_Checkbox,"Enable Multithreading","Try to use extra processor cores where possible",false)); - general.push_back(Preference(p_profile,"MemoryHog",PT_Checkbox,"Cache Session Data","Keep session data in memory to improve load speed revisiting the date.",false)); + general["UseAntiAliasing"]=Preference(p_profile,"UseAntiAliasing",PT_Checkbox,"Use Anti-Aliasing","Enable Graphical smoothing. Doesn't always look pretty.",false); + general["SquareWavePlots"]=Preference(p_profile,"SquareWavePlots",PT_Checkbox,"Square Wave Plots","Try to use Square Wave plots where possible",true); + general["EnableGraphSnapshots"]=Preference(p_profile,"EnableGraphSnapshots",PT_Checkbox,"Event Breakdown Piechart","Shows Event Breakdown in Daily view. This may cause problems on older computers.",true); + general["SkipLoginScreen"]=Preference(p_pref,"SkipLoginScreen",PT_Checkbox,"Skip Login Screen","Bypass the login screen at startup",false); + general["SkipEmptyDays"]=Preference(p_profile,"SkipEmptyDays",PT_Checkbox,"Skip Empty Days","Skip over calendar days that don't have any data",true); + general["EnableMultithreading"]=Preference(p_profile,"EnableMultithreading",PT_Checkbox,"Enable Multithreading","Try to use extra processor cores where possible",false); + general["MemoryHog"]=Preference(p_profile,"MemoryHog",PT_Checkbox,"Cache Session Data","Keep session data in memory to improve load speed revisiting the date.",false); - ui->genOpWidget->clear(); - for (int i=0;isetToolTip(p.tooltip()); - - bool b=p.value().toBool(); - wi->setCheckState(b ? Qt::Checked : Qt::Unchecked); - QVariant t; - t.setValue(p); - wi->setData(Qt::UserRole,t); - ui->genOpWidget->addItem(wi); - } - ui->genOpWidget->sortItems(); + ui->useAntiAliasing->setChecked(general["UseAntiAliasing"].value().toBool()); + ui->useSquareWavePlots->setChecked(general["SquareWavePlots"].value().toBool()); + ui->enableGraphSnapshots->setChecked(general["EnableGraphSnapshots"].value().toBool()); + ui->skipLoginScreen->setChecked(general["SkipLoginScreen"].value().toBool()); + ui->skipEmptyDays->setChecked(general["SkipEmptyDays"].value().toBool()); + ui->enableMultithreading->setChecked(general["EnableMultithreading"].value().toBool()); + ui->cacheSessionData->setChecked(general["MemoryHog"].value().toBool()); if (!PREF.Exists("Updates_AutoCheck")) PREF["Updates_AutoCheck"]=true; ui->automaticallyCheckUpdates->setChecked(PREF["Updates_AutoCheck"].toBool()); - if (!PREF.Exists("SkipLoginScreen")) PREF["SkipLoginScreen"]=false; - ui->skipLoginScreen->setChecked(PREF["SkipLoginScreen"].toBool()); - if (!PREF.Exists("Updates_CheckFrequency")) PREF["Updates_CheckFrequency"]=3; ui->updateCheckEvery->setValue(PREF["Updates_CheckFrequency"].toInt()); if (PREF.Exists("Updates_LastChecked")) { @@ -266,20 +256,16 @@ void PreferencesDialog::Save() { bool needs_restart=false; - for (int i=0;igenOpWidget->count();i++) { - QListWidgetItem *item=ui->genOpWidget->item(i); - bool checked=item->checkState() == Qt::Checked; - QVariant data=item->data(Qt::UserRole); - - Preference p=data.value(); - - if (p.value().toBool()!=checked) { - p.setValue(checked); - if (p.code()=="SquareWavePlots") { - needs_restart=true; - } - } + general["UseAntiAliasing"].setValue(ui->useAntiAliasing->isChecked()); + if (ui->useSquareWavePlots->isChecked()!=general["SquareWavePlots"].value().toBool()) { + general["SquareWavePlots"].setValue(ui->useSquareWavePlots->isChecked()); + needs_restart=true; } + general["EnableGraphSnapshots"].setValue(ui->enableGraphSnapshots->isChecked()); + general["SkipLoginScreen"].setValue(ui->skipLoginScreen->isChecked()); + general["SkipEmptyDays"].setValue(ui->skipEmptyDays->isChecked()); + general["EnableMultithreading"].setValue(ui->enableMultithreading->isChecked()); + general["MemoryHog"].setValue(ui->cacheSessionData->isChecked()); if ((*profile)["CombineCloserSessions"].toInt()!=ui->combineSlider->value()) needs_restart=true; @@ -288,8 +274,6 @@ void PreferencesDialog::Save() (*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(); diff --git a/preferencesdialog.h b/preferencesdialog.h index 58d1a4d1..70d3ad51 100644 --- a/preferencesdialog.h +++ b/preferencesdialog.h @@ -78,7 +78,7 @@ private: QStringListModel *importModel; MySortFilterProxyModel *graphFilterModel; QStandardItemModel *graphModel; - QVector general; + QHash general; }; diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 2eb3a71c..4c7201d4 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -10,7 +10,7 @@ 0 0 640 - 396 + 407 @@ -38,7 +38,7 @@ - 5 + 6 @@ -349,223 +349,216 @@ p, li { white-space: pre-wrap; } &Mask - + + + 0 + + + 2 + + + 2 + + + 0 + + + 2 + - - - Qt::Horizontal + + + + 0 + 0 + - - - - - - CPAP Mask Information - - - false - - - - 0 - - - 4 - - - 0 - - - 0 - - - 4 - - - - - Mask Type - - - - - - - - - - - - - - - - - 0 - 0 - - - - Leak mode - - - - - - - - Total Leaks - - - - - Unintentional Leaks - - - - - - - - - - - - 0 - 0 - - - - Description - - - - - - - - 0 - 0 - - - - true - - - - - - - Date - - - - - - - - 0 - 0 - - - - Current - - - - - - - - Start - - - - - End - - - - - Name - - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Mask History - - - - - - - - 0 - 0 - - - - &New Mask - - - - - - - - - - - - - - - 75 - true - - + + CPAP Mask Information + + + false + + + + 0 + + + 2 + + + 0 + + + 0 + + + 4 + + + 2 + + + + + Mask Type + + + + + + - Leak Profile + - - - - - - true + + + + + + + + 0 + 0 + + + + Description + + + + + + + + + + + 0 + 0 + + + + + Total Leaks - - false - - - - Pressure - - - - - Leak - - - - - - + + + + Unintentional Leaks + + + + + + + + + 0 + 0 + + + + Leak mode + + + + + + + + 0 + 0 + + + + Started Using + + + + + + + + 0 + 0 + + + + true + + + + + + + + true + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:italic;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; font-style:normal;">Note: </span>Before the following date, all leaks </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">will show as reported by the machine.</p></body></html> + + + + + + + + 75 + true + + + + Leak Profile + + + + + + + true + + + false + + + + Pressure + + + + + Leak + + + + + + + + + + + + + + + + + Hmmm... Empty Space + + + Qt::AlignCenter + + + + @@ -897,7 +890,7 @@ p, li { white-space: pre-wrap; } - + Allow use of multiple CPU cores where available to improve performance. May cause problems. @@ -906,8 +899,15 @@ p, li { white-space: pre-wrap; } - - + + + + Skip over Empty Days + + + + + Keep session data in memory to speed up revisiting days. @@ -916,8 +916,8 @@ p, li { white-space: pre-wrap; } - - + + Allows graphs to be "screenshotted" for display purposes. The Event Breakdown PIE chart uses this method, as does @@ -1128,15 +1128,9 @@ this application to be unstable with this feature enabled. &Appearance - + - - 0 - - - 0 - @@ -1239,35 +1233,22 @@ this application to be unstable with this feature enabled. - - - Settings - - - - 0 - - - 0 - - - 4 - - - 0 - - - 0 - - - - - true - - - - - + + + + + Use Anti-Aliasing + + + + + + + Square Wave Plots + + + +