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

Stop print daily report screwing up selections

Browse Source
This commit is contained in:
Mark Watkins 2014-08-29 01:11:34 +10:00
parent 8b652541e9
commit 48df9c2f46
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/Graphs/gGraph.cpp
View File

@ -320,7 +320,7 @@ void gGraph::paint(QPainter &painter, const QRegion &region)
if (m_snapshot) { if (m_snapshot) {
QLinearGradient linearGrad(QPointF(100, 100), QPointF(width / 2, 100)); QLinearGradient linearGrad(QPointF(100, 100), QPointF(width / 2, 100));
linearGrad.setColorAt(0, QColor(255, 150, 150,50)); linearGrad.setColorAt(0, QColor(255, 150, 150,40));
linearGrad.setColorAt(1, QColor(255,255,255,20)); linearGrad.setColorAt(1, QColor(255,255,255,20));
painter.fillRect(m_rect, QBrush(linearGrad)); painter.fillRect(m_rect, QBrush(linearGrad));

26
sleepyhead/reports.cpp
View File

@ -407,10 +407,22 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
QVector<qint64> start, end; QVector<qint64> start, end;
qint64 savest, saveet; qint64 savest, saveet;
gGraph *g;
gv->GetXBounds(savest, saveet); gv->GetXBounds(savest, saveet);
for (int i=0;i < gv->size(); i++) {
g = (*gv)[i];
if (g->isEmpty() || !g->visible()) continue;
if (g->group() == 0) {
savest = g->min_x;
saveet = g->max_x;
break;
}
}
qint64 st = savest, et = saveet; qint64 st = savest, et = saveet;
gGraph *g;
if (name == STR_TR_Daily) { if (name == STR_TR_Daily) {
if (!print_bookmarks) { if (!print_bookmarks) {
@ -429,21 +441,21 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
et = day->last(MT_OXIMETER); et = day->last(MT_OXIMETER);
} }
if (g->name() == schema::channel[CPAP_FlowRate].code()) { if (!g->isSnapshot() && (g->name() == schema::channel[CPAP_FlowRate].code())) {
if (!((qAbs(savest - st) < 2000) && (qAbs(saveet - et) < 2000))) { if (!((qAbs(g->min_x - st) < 2000) && (qAbs(g->max_x - et) < 2000))) {
start.push_back(st); start.push_back(st);
end.push_back(et); end.push_back(et);
graphs.push_back(g); graphs.push_back(g);
labels.push_back(QObject::tr("Entire Day's Flow Waveform")); labels.push_back(QObject::tr("Entire Day's Flow Waveform"));
} }
start.push_back(savest); start.push_back(g->min_x);
end.push_back(saveet); end.push_back(g->max_x);
graphs.push_back(g); graphs.push_back(g);
labels.push_back(QObject::tr("Current Selection")); labels.push_back(QObject::tr("Current Selection"));
} else { } else {
start.push_back(savest); start.push_back(g->min_x);
end.push_back(saveet); end.push_back(g->max_x);
graphs.push_back(g); graphs.push_back(g);
labels.push_back(""); labels.push_back("");
} }