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

Tinker in overview charts, darken Flow Limitation chart so maximum is visible on white

Browse Source
This commit is contained in:
Mark Watkins 2018-04-25 23:00:25 +10:00
parent b3c92aa9fe
commit 90d5cadc0c
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sleepyhead/Graphs/gSessionTimesChart.cpp
View File

@ -1,4 +1,4 @@
/* gSessionTimesChart Implementation /* gSessionTimesChart Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -164,7 +164,7 @@ void gSummaryChart::preCalc()
for (int i=0; i<calcitems.size(); ++i) { for (int i=0; i<calcitems.size(); ++i) {
SummaryCalcItem & calc = calcitems[i]; SummaryCalcItem & calc = calcitems[i];
calc.reset(idx_end - idx_start); calc.reset(idx_end - idx_start, midcalc);
} }
} }
@ -403,7 +403,6 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
m_minx = graph.min_x; m_minx = graph.min_x;
m_maxx = graph.max_x; m_maxx = graph.max_x;
QDateTime date2 = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::UTC); QDateTime date2 = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::UTC);
QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::UTC); QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::UTC);
@ -604,7 +603,7 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
// painter.fillRect(rec, slice.brush); // painter.fillRect(rec, slice.brush);
outlines.append(rec); outlines.append(rec);
} else { } else {
painter.fillRect(rec, QBrush(brighten(color,1.25))); painter.fillRect(rec, brighten(color, 1.25));
outlines.append(rec); outlines.append(rec);
} }
@ -683,7 +682,7 @@ void gUsageChart::preCalc()
incompdays = 0; incompdays = 0;
SummaryCalcItem & calc = calcitems[0]; SummaryCalcItem & calc = calcitems[0];
calc.reset(idx_end - idx_start); calc.reset(idx_end - idx_start, midcalc);
} }
void gUsageChart::customCalc(Day *, QVector<SummaryChartSlice> &list) void gUsageChart::customCalc(Day *, QVector<SummaryChartSlice> &list)
@ -739,14 +738,14 @@ void gSessionTimesChart::preCalc() {
total_length = 0; total_length = 0;
SummaryCalcItem & calc = calcitems[0]; SummaryCalcItem & calc = calcitems[0];
calc.reset((idx_end - idx_start) * 6); calc.reset((idx_end - idx_start) * 6, midcalc);
SummaryCalcItem & calc1 = calcitems[1]; SummaryCalcItem & calc1 = calcitems[1];
calc1.reset(idx_end - idx_start); calc1.reset(idx_end - idx_start, midcalc);
SummaryCalcItem & calc2 = calcitems[2]; SummaryCalcItem & calc2 = calcitems[2];
calc2.reset(idx_end - idx_start); calc2.reset(idx_end - idx_start, midcalc);
} }
void gSessionTimesChart::customCalc(Day *, QVector<SummaryChartSlice> & slices) { void gSessionTimesChart::customCalc(Day *, QVector<SummaryChartSlice> & slices) {

6
sleepyhead/Graphs/gSessionTimesChart.h
View File

@ -1,4 +1,4 @@
/* gSessionTimesChart Header /* gSessionTimesChart Header
* *
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -91,8 +91,8 @@ struct SummaryCalcItem {
max = qMax(max, value); max = qMax(max, value);
} }
void reset(int reserve) { void reset(int reserve, short mc) {
midcalc = p_profile->general->prefCalcMiddle(); midcalc = mc;
wavg_sum = 0; wavg_sum = 0;
avg_sum = 0; avg_sum = 0;

3
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -1,4 +1,4 @@
/* gSummaryChart Implementation /* gSummaryChart Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -571,6 +571,7 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
float lineThickness = AppSetting->lineThickness(); float lineThickness = AppSetting->lineThickness();
for (qint64 Q = minx; Q <= maxx + ms_per_day; Q += ms_per_day) { for (qint64 Q = minx; Q <= maxx + ms_per_day; Q += ms_per_day) {
zd = Q / ms_per_day; zd = Q / ms_per_day;
d = m_values.find(zd); d = m_values.find(zd);

2
sleepyhead/SleepLib/schema.cpp
View File

@ -403,7 +403,7 @@ void init()
schema::channel.add(GRP_CPAP, new Channel(CPAP_FLG = 0x1113, WAVEFORM, MT_CPAP, SESSION, "FLG", schema::channel.add(GRP_CPAP, new Channel(CPAP_FLG = 0x1113, WAVEFORM, MT_CPAP, SESSION, "FLG",
QObject::tr("Flow Limitation"), QObject::tr("Flow Limitation"),
QObject::tr("Graph showing severity of flow limitations"), QObject::tr("Flow Limit."), QObject::tr("Graph showing severity of flow limitations"), QObject::tr("Flow Limit."),
STR_UNIT_Severity, DEFAULT, QColor("dark gray"))); STR_UNIT_Severity, DEFAULT, QColor("#585858")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_TgMV = 0x1114, WAVEFORM, MT_CPAP, SESSION, schema::channel.add(GRP_CPAP, new Channel(CPAP_TgMV = 0x1114, WAVEFORM, MT_CPAP, SESSION,
"TgMV", QObject::tr("Target Minute Ventilation"), "TgMV", QObject::tr("Target Minute Ventilation"),