diff --git a/oscar/SleepLib/appsettings.cpp b/oscar/SleepLib/appsettings.cpp
index 7434be3c..d5839498 100644
--- a/oscar/SleepLib/appsettings.cpp
+++ b/oscar/SleepLib/appsettings.cpp
@@ -35,6 +35,8 @@ AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref)
m_graphTooltips = initPref(STR_AS_GraphTooltips, true).toBool();
m_usePixmapCaching = initPref(STR_AS_UsePixmapCaching, false).toBool();
m_odt = (OverlayDisplayType)initPref(STR_AS_OverlayType, (int)ODT_Bars).toInt();
+ initPref(STR_AS_GraphTooltips, 0);
+ m_alternatingColorsCombo = initPref(STR_AS_setAlternatingColorsCombo, 0).toInt();
#ifndef REMOVE_FITNESS
m_olm = (OverviewLinechartModes)initPref(STR_AS_OverviewLinechartMode, (int)OLC_Bartop).toInt();
#endif
diff --git a/oscar/SleepLib/appsettings.h b/oscar/SleepLib/appsettings.h
index 4f0e06ed..86933be7 100644
--- a/oscar/SleepLib/appsettings.h
+++ b/oscar/SleepLib/appsettings.h
@@ -39,6 +39,7 @@ const QString STR_AS_ShowPieChart = "EnablePieChart";
const QString STR_AS_Animations = "AnimationsAndTransitions";
const QString STR_AS_SquareWave = "SquareWavePlots";
const QString STR_AS_OverlayType = "OverlayType";
+const QString STR_AS_setAlternatingColorsCombo = "AlternatingColorsCombo";
#ifndef REMOVE_FITNESS
const QString STR_AS_OverviewLinechartMode = "OverviewLinechartMode";
#endif
@@ -87,6 +88,7 @@ public:
bool m_usePixmapCaching, m_antiAliasing, m_squareWavePlots,m_graphTooltips, m_lineCursorMode, m_animations;
bool m_showPerformance, m_showDebug;
int m_tooltipTimeout, m_graphHeight, m_scrollDampening;
+ int m_alternatingColorsCombo;
bool m_multithreading, m_cacheSessions;
float m_lineThickness;
@@ -142,6 +144,7 @@ public:
//! \Allow disabling of sessions
//! \brief Whether to show graph tooltips
inline bool graphTooltips() const { return m_graphTooltips; }
+ inline int alternatingColorsCombo() { return m_alternatingColorsCombo;}
//! \brief Pen width of line plots
inline float lineThickness() const { return m_lineThickness; }
//! \brief Whether to show line cursor
@@ -203,6 +206,7 @@ public:
//! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
void setGraphTooltips(bool b) { setPref(STR_AS_GraphTooltips, m_graphTooltips=b); }
//! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)
+ void setAlternatingColorsCombo(int b) { setPref(STR_AS_setAlternatingColorsCombo, m_alternatingColorsCombo=b); }
#ifndef REMOVE_FITNESS
void setOverviewLinechartMode(OverviewLinechartModes olm) { setPref(STR_AS_OverviewLinechartMode, (int)(m_olm=olm)); }
#endif
diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp
index 5847d349..12930a47 100644
--- a/oscar/preferencesdialog.cpp
+++ b/oscar/preferencesdialog.cpp
@@ -32,6 +32,7 @@
#include "ui_preferencesdialog.h"
#include "SleepLib/machine_common.h"
#include "highresolution.h"
+#include "daily.h"
extern QFont *defaultfont;
extern QFont *mediumfont;
@@ -248,6 +249,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
// Radio Buttons illustrate the operating mode.
ui->permissiveMode->setChecked(!profile->cpap->clinicalMode());
HighResolution::checkBox(false,ui->highResolution);
+ ui->alternatingColorsCombo->setCurrentIndex(AppSetting->alternatingColorsCombo());
ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport());
#ifndef NO_CHECKUPDATES
@@ -864,6 +866,12 @@ bool PreferencesDialog::Save()
p_profile->cpap->setClinicalMode(ui->clinicalMode->isChecked());
HighResolution::checkBox(true,ui->highResolution);
+
+ if (ui->alternatingColorsCombo->currentIndex() != AppSetting->alternatingColorsCombo()) {
+ AppSetting->setAlternatingColorsCombo(ui->alternatingColorsCombo->currentIndex());
+ mainwin->GenerateStatistics();
+ }
+
AppSetting->setGraphTooltips(ui->graphTooltips->isChecked());
AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked());
diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui
index 4140ee51..ccb04665 100644
--- a/oscar/preferencesdialog.ui
+++ b/oscar/preferencesdialog.ui
@@ -10,7 +10,7 @@
0
0
942
- 737
+ 994
@@ -32,6 +32,9 @@
:/icons/preferences.png:/icons/preferences.png
+
+ <string>"QGroupBox{ margin: 0px; padding: 0px; border: 1px solid gray; }"</string>
+
true
@@ -63,7 +66,7 @@
- 2
+ 7
@@ -1073,9 +1076,6 @@ This option must be enabled before import, otherwise a purge is required.
-
Custom flagging is an experimental method of detecting events missed by the device. They are not included in AHI. They are also displayed in the Statistics Tab using the Permissive mode (see Clinical tab).
@@ -2832,15 +2832,15 @@ Try it and see if you like it.
-
+
+ false
+
Pixmap caching is an graphics acceleration technique. May cause problems with font drawing in graph display area on your platform.
Use Pixmap Caching
-
- false
-
-
@@ -2849,7 +2849,7 @@ Try it and see if you like it.
<html><head/><body><p>These features have recently been pruned. They will come back later. </p></body></html>
- Animations Fancy Stuff
+ Animations && Fancy Stuff
@@ -2929,6 +2929,75 @@ Try it and see if you like it.
+ -
+
+
+ QGroupBox { margin: 0px; padding: 0px; border: none}
+
+
+ Statistics
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
-
+
+
-
+
+ Every 3rd Line
+
+
+ -
+
+ Every 2nd Line
+
+
+ -
+
+ Disabled
+
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+ QLabel{
+ margin: 0px;
+ padding: 0px;
+ border: none;
+}
+
+
+ Alternating Color Spacing
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
-
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 702653cc..cc159507 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -48,9 +48,22 @@ QString htmlMachines = ""; // Devices used in this profile
QString htmlReportFooter = ""; // Page footer
SummaryInfo summaryInfo;
+int alternatingModulo = 0;
+void initAlternatingColor() {
+ DEBUGFC Q(alternatingModulo) ;
+ int alternateMode = AppSetting->alternatingColorsCombo();
+ DEBUGFC Q(alternatingModulo) ;
+ if (alternateMode==0) alternatingModulo=3;
+ else if (alternateMode==1) alternatingModulo=2;
+ else alternatingModulo = 0xffff;
+}
QString alternatingColor(int& counter) {
+ if (alternatingModulo<=0) {
+ initAlternatingColor();
+ }
counter++;
- int offset = counter %= 3;
+ int offset = counter % alternatingModulo;
+ //DEBUGFC Q(alternatingModulo) Q(counter) Q(offset);
if ( offset == 0) {
//return "#d0ffd0"; // very lightgreen
//return "#d8ffd8"; // very lightgreen
@@ -1308,6 +1321,7 @@ QString Statistics::getRDIorAHIText() {
// Create the HTML for CPAP and Oximetry usage
QString Statistics::GenerateCPAPUsage()
{
+
summaryInfo.clear(p_profile->FirstDay(),p_profile->LastDay());
QList cpap_machines = p_profile->GetMachines(MT_CPAP);
QList oximeters = p_profile->GetMachines(MT_OXIMETER);
@@ -1565,6 +1579,8 @@ QString Statistics::GenerateCPAPUsage()
// Create the HTML that will be the Statistics page.
QString Statistics::GenerateHTML()
{
+ DEBUGFC;
+ initAlternatingColor();
htmlReportHeader = generateHeader(true);
htmlReportHeaderPrint = generateHeader(false);
htmlReportFooter = generateFooter(true);