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

Made graph scaling honour min/max Graph Preferences

Browse Source
This commit is contained in:
Mark Watkins 2014-05-21 00:52:29 +10:00
parent 5dd44a4f32
commit a9ffeac07f
4 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sleepyhead/Graphs/gGraph.cpp
View File

@ -513,6 +513,19 @@ void gGraph::ToolTip(QString text, int x, int y, int timeout)
// YAxis Autoscaling code // YAxis Autoscaling code
void gGraph::roundY(EventDataType &miny, EventDataType &maxy) void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
{ {
if ((zoomY() == 0) && PROFILE.appearance->allowYAxisScaling()) {
if (rec_maxy > rec_miny) {
// Use graph preference settings only for this graph
miny = rec_miny;
maxy = rec_maxy;
return;
} // else use loader defined min/max settings
} else {
// Autoscale this graph
miny = min_y, maxy = max_y;
}
int m, t; int m, t;
bool ymin_good = false, ymax_good = false; bool ymin_good = false, ymax_good = false;

12
sleepyhead/Graphs/gLineChart.cpp
View File

@ -173,7 +173,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
top++; top++;
EventDataType miny, maxy;
double minx, maxx; double minx, maxx;
@ -185,17 +184,12 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
// hmmm.. subtract_offset.. // hmmm.. subtract_offset..
/*if (miny<0) { EventDataType miny = m_physminy;
miny=-MAX(fabs(miny),fabs(maxy)); EventDataType maxy = m_physmaxy;
}*/
if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
miny = m_physminy, maxy = m_physmaxy;
} else {
miny = w.min_y, maxy = w.max_y;
}
w.roundY(miny, maxy); w.roundY(miny, maxy);
//#define DEBUG_AUTOSCALER //#define DEBUG_AUTOSCALER
#ifdef DEBUG_AUTOSCALER #ifdef DEBUG_AUTOSCALER
QString a = QString().sprintf("%.2f - %.2f",miny, maxy); QString a = QString().sprintf("%.2f - %.2f",miny, maxy);

26
sleepyhead/Graphs/gYAxis.cpp
View File

@ -43,19 +43,8 @@ void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion &region)
int x, y; int x, y;
EventDataType miny, maxy; EventDataType miny = w.physMinY();
EventDataType maxy = w.physMaxY();
if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
miny = w.physMinY();
maxy = w.physMaxY();
} else {
miny = w.min_y;
maxy = w.max_y;
if (miny < 0) { // even it up if it's starts negative
miny = -MAX(fabs(miny), fabs(maxy));
}
}
w.roundY(miny, maxy); w.roundY(miny, maxy);
@ -297,16 +286,9 @@ void gYAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
int labelW = 0; int labelW = 0;
EventDataType miny;
EventDataType maxy;
if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) { EventDataType miny = w.physMinY();
miny = w.physMinY(); EventDataType maxy = w.physMaxY();
maxy = w.physMaxY();
} else {
miny = w.min_y;
maxy = w.max_y;
}
w.roundY(miny, maxy); w.roundY(miny, maxy);

5
sleepyhead/preferencesdialog.cpp
View File

@ -821,10 +821,11 @@ void PreferencesDialog::on_resetGraphButton_clicked()
return; return;
} }
gGraphView *views[3]; gGraphView *views[3] = {0};
views[0] = mainwin->getDaily()->graphView(); views[0] = mainwin->getDaily()->graphView();
views[1] = mainwin->getOverview()->graphView(); views[1] = mainwin->getOverview()->graphView();
views[2] = mainwin->getOximetry()->graphView(); if (mainwin->getOximetry())
views[2] = mainwin->getOximetry()->graphView();
// Iterate over all graph containers. // Iterate over all graph containers.
for (unsigned j = 0; j < 3; j++) { for (unsigned j = 0; j < 3; j++) {