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 line plot thickness preference, fixed barchart gradients

Browse Source
This commit is contained in:
Mark Watkins 2014-05-10 12:53:50 +10:00
parent b041277ad4
commit f98291c62b
5 changed files with 65 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/Graphs/gLineChart.cpp
View File

@ -660,7 +660,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
if (done) { break; } if (done) { break; }
} }
} }
painter.setPen(QPen(m_colors[gi],1)); painter.setPen(QPen(m_colors[gi],p_profile->appearance->lineThickness()));
painter.drawLines(lines); painter.drawLines(lines);
w.graphView()->lines_drawn_this_frame+=lines.count(); w.graphView()->lines_drawn_this_frame+=lines.count();
lines.clear(); lines.clear();
@ -760,7 +760,7 @@ void AHIChart::paint(QPainter &painter, gGraph &w, int left, int top, int width,
double top1 = top + height; double top1 = top + height;
bool done = false; bool done = false;
painter.setPen(QPen(m_color,1.5)); painter.setPen(QPen(m_color,p_profile->appearance->lineThickness()));
painter.setClipRect(left, top, width, height); painter.setClipRect(left, top, width, height);
painter.setClipping(true); painter.setClipping(true);

14
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -567,7 +567,7 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, int left, int top, int wi
} }
QColor col1 = col; QColor col1 = col;
QColor col2 = brighten(col); QColor col2 = Qt::white;
//outlines->setColor(Qt::black); //outlines->setColor(Qt::black);
int np = d.value().size(); int np = d.value().size();
@ -587,7 +587,7 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, int left, int top, int wi
//tmp-=miny; //tmp-=miny;
h = tmp * ymult; h = tmp * ymult;
QLinearGradient gradient(QPoint(0,0),QPoint(barw,0)); QLinearGradient gradient(x1, py-h, x1+barw, py-h);
gradient.setColorAt(0,col1); gradient.setColorAt(0,col1);
gradient.setColorAt(1,col2); gradient.setColorAt(1,col2);
painter.fillRect(x1, py-h, barw, h, QBrush(gradient)); painter.fillRect(x1, py-h, barw, h, QBrush(gradient));
@ -683,9 +683,9 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, int left, int top, int wi
if (graphtype == GT_BAR) { if (graphtype == GT_BAR) {
QColor col1 = col; QColor col1 = col;
QColor col2 = brighten(col); QColor col2 = Qt::white;
QLinearGradient gradient(0,0,barw,h); QLinearGradient gradient(x1, py-h, x1+barw, py-h);
gradient.setColorAt(0,col1); gradient.setColorAt(0,col1);
gradient.setColorAt(1,col2); gradient.setColorAt(1,col2);
painter.fillRect(x1, py-h, barw, h, QBrush(gradient)); painter.fillRect(x1, py-h, barw, h, QBrush(gradient));
@ -740,15 +740,15 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, int left, int top, int wi
} }
if (zd == hl_day) { if (zd == hl_day) {
painter.setPen(QPen(col2,10)); painter.setPen(QPen(brighten(col2),10));
painter.drawPoint(px2 - barw / 2, py2); painter.drawPoint(px2 - barw / 2, py2);
} }
if (lastdaygood) { if (lastdaygood) {
painter.setPen(QPen(col2,1)); painter.setPen(QPen(col2,p_profile->appearance->lineThickness()));
painter.drawLine(lastX[j] - barw / 2, lastY[j], px2 - barw / 2, py2); painter.drawLine(lastX[j] - barw / 2, lastY[j], px2 - barw / 2, py2);
} else { } else {
painter.setPen(QPen(col1,1)); painter.setPen(QPen(col1,p_profile->appearance->lineThickness()));
painter.drawLine(px + barw / 2 - 1, py2, px + barw / 2 + 1, py2); painter.drawLine(px + barw / 2 - 1, py2, px + barw / 2 + 1, py2);
} }

8
sleepyhead/SleepLib/profiles.h
View File

@ -244,6 +244,7 @@ const QString STR_AS_OverviewLinechartMode = "OverviewLinechartMode";
const QString STR_AS_UsePixmapCaching = "UsePixmapCaching"; const QString STR_AS_UsePixmapCaching = "UsePixmapCaching";
const QString STR_AS_AllowYAxisScaling = "AllowYAxisScaling"; const QString STR_AS_AllowYAxisScaling = "AllowYAxisScaling";
const QString STR_AS_GraphTooltips = "GraphTooltips"; const QString STR_AS_GraphTooltips = "GraphTooltips";
const QString STR_AS_LineThickness = "LineThickness";
// UserSettings Strings // UserSettings Strings
const QString STR_US_UnitSystem = "UnitSystem"; const QString STR_US_UnitSystem = "UnitSystem";
@ -568,6 +569,7 @@ class AppearanceSettings : public ProfileSettings
initPref(STR_AS_UsePixmapCaching, true); initPref(STR_AS_UsePixmapCaching, true);
initPref(STR_AS_OverlayType, ODT_Bars); initPref(STR_AS_OverlayType, ODT_Bars);
initPref(STR_AS_OverviewLinechartMode, OLC_Bartop); initPref(STR_AS_OverviewLinechartMode, OLC_Bartop);
initPref(STR_AS_LineThickness, 1.0);
} }
//! \brief Returns the normal (unscaled) height of a graph //! \brief Returns the normal (unscaled) height of a graph
@ -586,6 +588,10 @@ class AppearanceSettings : public ProfileSettings
bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); } bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); }
//! \brief Whether to show graph tooltips //! \brief Whether to show graph tooltips
bool graphTooltips() const { return getPref(STR_AS_GraphTooltips).toBool(); } bool graphTooltips() const { return getPref(STR_AS_GraphTooltips).toBool(); }
//! \brief Pen width of line plots
float lineThickness() const { return getPref(STR_AS_LineThickness).toFloat(); }
//! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform) //! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform)
OverlayDisplayType overlayType() const { OverlayDisplayType overlayType() const {
return (OverlayDisplayType)getPref(STR_AS_OverlayType).toInt(); return (OverlayDisplayType)getPref(STR_AS_OverlayType).toInt();
@ -617,6 +623,8 @@ class AppearanceSettings : public ProfileSettings
void setOverviewLinechartMode(OverviewLinechartModes od) { void setOverviewLinechartMode(OverviewLinechartModes od) {
setPref(STR_AS_OverviewLinechartMode, (int)od); setPref(STR_AS_OverviewLinechartMode, (int)od);
} }
//! \brief Set the pen width of line plots.
void setLineThickness(float size) { setPref(STR_AS_LineThickness, size); }
}; };
/*! \class UserSettings /*! \class UserSettings

4
sleepyhead/preferencesdialog.cpp
View File

@ -156,6 +156,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->bigFontBold->setChecked(bigfont->weight() == QFont::Bold); ui->bigFontBold->setChecked(bigfont->weight() == QFont::Bold);
ui->bigFontItalic->setChecked(bigfont->italic()); ui->bigFontItalic->setChecked(bigfont->italic());
ui->lineThicknessSlider->setValue(profile->appearance->lineThickness()*2);
ui->startedUsingMask->setDate(profile->cpap->maskStartDate()); ui->startedUsingMask->setDate(profile->cpap->maskStartDate());
ui->leakModeCombo->setCurrentIndex(profile->cpap->leakMode()); ui->leakModeCombo->setCurrentIndex(profile->cpap->leakMode());
@ -388,6 +390,8 @@ bool PreferencesDialog::Save()
profile->appearance->setUsePixmapCaching(ui->usePixmapCaching->isChecked()); profile->appearance->setUsePixmapCaching(ui->usePixmapCaching->isChecked());
profile->appearance->setSquareWavePlots(ui->useSquareWavePlots->isChecked()); profile->appearance->setSquareWavePlots(ui->useSquareWavePlots->isChecked());
profile->appearance->setGraphSnapshots(ui->enableGraphSnapshots->isChecked()); profile->appearance->setGraphSnapshots(ui->enableGraphSnapshots->isChecked());
profile->appearance->setLineThickness(float(ui->lineThicknessSlider->value()) / 2.0);
profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked()); profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked());
profile->general->setTooltipTimeout(ui->tooltipTimeoutSlider->value() * 50); profile->general->setTooltipTimeout(ui->tooltipTimeoutSlider->value() * 50);

53
sleepyhead/preferencesdialog.ui
View File

@ -10,7 +10,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>721</width> <width>721</width>
<height>572</height> <height>610</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -51,7 +51,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>5</number> <number>6</number>
</property> </property>
<widget class="QWidget" name="importTab"> <widget class="QWidget" name="importTab">
<attribute name="title"> <attribute name="title">
@ -1882,7 +1882,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="7" column="1">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -1895,7 +1895,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="5" column="1" colspan="2"> <item row="6" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_16"> <layout class="QHBoxLayout" name="horizontalLayout_16">
<item> <item>
<widget class="QSlider" name="scrollDampeningSlider"> <widget class="QSlider" name="scrollDampeningSlider">
@ -1943,7 +1943,7 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="1" colspan="2"> <item row="5" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_17"> <layout class="QHBoxLayout" name="horizontalLayout_17">
<item> <item>
<widget class="QSlider" name="tooltipTimeoutSlider"> <widget class="QSlider" name="tooltipTimeoutSlider">
@ -1991,7 +1991,7 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_46"> <widget class="QLabel" name="label_46">
<property name="text"> <property name="text">
<string>Scroll Dampening</string> <string>Scroll Dampening</string>
@ -2001,7 +2001,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_45"> <widget class="QLabel" name="label_45">
<property name="text"> <property name="text">
<string>Tooltip Timeout</string> <string>Tooltip Timeout</string>
@ -2093,6 +2093,42 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QLabel" name="label_48">
<property name="text">
<string>Line Thickness</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QSlider" name="lineThicknessSlider">
<property name="toolTip">
<string>The pixel thickness of line plots</string>
</property>
<property name="minimum">
<number>2</number>
</property>
<property name="maximum">
<number>8</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -2175,8 +2211,7 @@ this application to be unstable with this feature enabled.</string>
<item> <item>
<widget class="QCheckBox" name="animationsAndTransitionsCheckbox"> <widget class="QCheckBox" name="animationsAndTransitionsCheckbox">
<property name="toolTip"> <property name="toolTip">
<string>Turn on/off the spinning &quot;context&quot; cube. <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These features have recently been pruned. They will come back later. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
It really doesn't use that much resources.. :)</string>
</property> </property>
<property name="text"> <property name="text">
<string>Animations &amp;&amp; Fancy Stuff</string> <string>Animations &amp;&amp; Fancy Stuff</string>