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

Fix Time at Pressure chart sometimes dropping outside of graph boundary

Browse Source
This commit is contained in:
Mark Watkins 2016-03-17 10:28:21 +10:00
parent 75e3f6eed7
commit f79f12be86
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sleepyhead/Graphs/MinutesAtPressure.cpp
View File

@ -221,6 +221,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
double p0, p1, p2, p3; double p0, p1, p2, p3;
QString label; QString label;
double s2;
int widest_YAxis = 0; int widest_YAxis = 0;
int mouseOverKey = 0; int mouseOverKey = 0;
@ -314,14 +315,17 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
// Plot IPAP Time at Pressure // Plot IPAP Time at Pressure
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
xp=left; xp=left;
double lastyp = bottom - (double(ipap.times[min-1]) * ystep); s2 = double(ipap.times[qMax(0, min-1)]/60.0);
if (s2 < 0) s2=0;
double lastyp = bottom - (s2 * ystep);
for (int i=min; i<max; ++i) { for (int i=min; i<max; ++i) {
p0 = ipap.times[i-1] / 60.0; p0 = ipap.times[i-1] / 60.0;
p1 = ipap.times[i]/ 60.0; p1 = ipap.times[i]/ 60.0;
p2 = ipap.times[i+1]/ 60.0; p2 = ipap.times[i+1]/ 60.0;
p3 = ipap.times[i+2]/ 60.0; p3 = ipap.times[i+2]/ 60.0;
yp = bottom - (double(p1) * ystep); yp = bottom - qMax((double(p1) * ystep),0.0);
if (i == mouseOverKey) { if (i == mouseOverKey) {
painter.setPen(QPen(Qt::black)); painter.setPen(QPen(Qt::black));
@ -332,7 +336,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);
lastyp = yp; lastyp = yp;
xp += xstep; xp += xstep;
double s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2),0.0f); s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2), 0.0f);
yp = qMax(double(bottom-height), (bottom - (s2 * ystep))); yp = qMax(double(bottom-height), (bottom - (s2 * ystep)));
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);
@ -351,6 +355,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
lastyp = yp; lastyp = yp;
s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.8), 0.0f); s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.8), 0.0f);
if (s2 < 0) s2=0;
yp = qMax(double(bottom-height), (bottom - (s2 * ystep))); yp = qMax(double(bottom-height), (bottom - (s2 * ystep)));
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);
xp+=xstep; xp+=xstep;
@ -412,18 +417,19 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
xp = left; xp = left;
lastyp = bottom - (double(ipap.events[ch][min-1]) * estep); s2 = ipap.events[ch][qMax(min-1,0)];
lastyp = bottom - (s2 * estep);
for (int i=min; i<max; ++i) { for (int i=min; i<max; ++i) {
p0 = ipap.events[ch][i-1]; p0 = ipap.events[ch][i-1];
p1 = ipap.events[ch][i]; p1 = ipap.events[ch][i];
p2 = ipap.events[ch][i+1]; p2 = ipap.events[ch][i+1];
p3 = ipap.events[ch][i+1]; p3 = ipap.events[ch][i+1];
yp = bottom - (double(p1) * estep); yp = bottom - qMax((double(p1) * estep),0.0);
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);
lastyp = yp; lastyp = yp;
xp += xstep; xp += xstep;
double s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2),0.0f); s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2), 0.0f);
yp = qMax(double(bottom-height), double(bottom - (s2 * estep))); yp = qMax(double(bottom-height), double(bottom - (s2 * estep)));
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);
@ -477,7 +483,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
lastyp = yp; lastyp = yp;
xp += xstep; xp += xstep;
double s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2),0.0f); s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2), 0.0f);
yp = qMax(double(bottom-height), (bottom - (s2 * estep))); yp = qMax(double(bottom-height), (bottom - (s2 * estep)));
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);
@ -510,7 +516,8 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
if (epap.min_pressure) { if (epap.min_pressure) {
painter.setPen(QPen(echan.defaultColor(), p_profile->appearance->lineThickness())); painter.setPen(QPen(echan.defaultColor(), p_profile->appearance->lineThickness()));
xp=left, lastyp = bottom - (double(epap.times[min]) * ystep); s2 = double(epap.times[qMax(min,0)]/60.0);
xp=left, lastyp = bottom - (s2 * ystep);
for (int i=min; i<max; ++i) { for (int i=min; i<max; ++i) {
p0 = epap.times[i-1]/60.0; p0 = epap.times[i-1]/60.0;
p1 = epap.times[i]/60.0; p1 = epap.times[i]/60.0;
@ -523,12 +530,12 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
painter.setPen(QPen(echan.defaultColor(), p_profile->appearance->lineThickness())); painter.setPen(QPen(echan.defaultColor(), p_profile->appearance->lineThickness()));
} }
yp = bottom - (double(p1) * ystep); yp = bottom - qMax((double(p1) * ystep), 0.0);
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);
lastyp = yp; lastyp = yp;
xp += xstep; xp += xstep;
double s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2),0.0f); s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2), 0.0f);
yp = qMax(double(bottom-height), (bottom - (s2 * ystep))); yp = qMax(double(bottom-height), (bottom - (s2 * ystep)));
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);