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

Show labels over top/bottom event markers

Browse Source
This commit is contained in:
Mark Watkins 2014-08-06 11:25:11 +10:00
parent 800ca0e2e0
commit 639588a261
4 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sleepyhead/Graphs/gLineChart.cpp
View File

@ -859,12 +859,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
legendx -= bw*2;
}
}
if (m_day && (p_profile->appearance->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))) {
QHash<ChannelID, gLineOverlayBar *>::iterator fit;
for (fit = flags.begin(); fit != flags.end(); ++fit) {
fit.value()->paint(painter, w, region);
}
}
if (!total_points) { // No Data?
@ -877,5 +871,11 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
}
}
painter.setClipping(false);
if (m_day && (p_profile->appearance->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))) {
QHash<ChannelID, gLineOverlayBar *>::iterator fit;
for (fit = flags.begin(); fit != flags.end(); ++fit) {
fit.value()->paint(painter, w, region);
}
}
painter.setRenderHint(QPainter::Antialiasing, false);
}

60
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -178,17 +178,17 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
m_count++;
m_sum += raw;
if ((odt == ODT_Bars) || (xx < 3600000)) {
// if ((odt == ODT_Bars) || (xx < 3600000)) {
// show the fat dots in the middle
painter.setPen(QPen(m_flag_color,4));
painter.drawPoint(x1, double(height) / double(yy)*double(-20 - w.min_y) + topp);
painter.setPen(QPen(m_flag_color,1));
} else {
// thin lines down the bottom
painter.drawLine(x1, start_py + 1, x1, start_py + 1 + 12);
}
// } else {
// // thin lines down the bottom
// painter.drawLine(x1, start_py + 1, x1, start_py + 1 + 12);
// }
}
} else if (m_flt == FT_Bar) {
////////////////////////////////////////////////////////////////////////////
@ -203,19 +203,19 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
break;
}
x1 = jj * double(X - w.min_x) + left;
x1 = jj * (double(X) - double(w.min_x)) + left;
m_count++;
m_sum += raw;
int z = start_py + height;
double d1 = jj * double(raw) * 1000.0;
if ((odt == ODT_Bars) || (xx < 3600000)) {
z = top;
double d1 = jj * double(raw) * 1000.0;
if ((odt == ODT_Bars)) { // || (xx < 3600000)) {
QRect rect(x1-d1-2, top, d1+2, height);
QColor col = m_flag_color;
painter.setPen(QPen(col,4));
painter.drawPoint(x1, top);
@ -239,26 +239,40 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.setPen(QPen(col,1));
painter.drawLine(x1, top, x1, bottom);
}
QColor txcol = hover ? Qt::red: Qt::black;
if (xx < 300000) {
QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(raw);
GetTextExtent(lab, x, y);
w.renderText(lab, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol);
} else if (xx < (3600000)) {
if (!hover) {
GetTextExtent(m_label, x, y);
w.renderText(m_label, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol);
} else {
QString lab = QString("%1 (%2)").arg(m_label).arg(raw);
GetTextExtent(lab, x, y);
w.renderText(lab, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol);
}
}
} else {
painter.drawLine(x1, z, x1, z - 12);
}
QRect rect(x1-d1-2, topp, d1+6, height);
QColor txcol = hover ? Qt::red: Qt::black;
if (xx < 300000) {
QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(raw);
GetTextExtent(lab, x, y);
w.renderText(lab, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol);
} else if (xx < (3600000)) {
if (!hover) {
GetTextExtent(m_label, x, y);
w.renderText(m_label, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol);
} else {
QString lab = QString("%1 (%2)").arg(m_label).arg(raw);
if (rect.contains(mouse)) {
painter.setPen(QPen(m_flag_color,4));
QString lab = QString("%1 (%2)").arg(schema::channel[m_code].label()).arg(raw);
GetTextExtent(lab, x, y);
w.renderText(lab, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol);
w.renderText(lab, x1 - (x / 2)+2, start_py + 14 + y + (3 * w.printScaleY()),0);
x1-=1;
} else {
painter.setPen(QPen(m_flag_color,1));
}
painter.drawLine(x1, z, x1, z - 12);
painter.drawLine(x1, start_py+2, x1, start_py + 14);
}
}
}

5
sleepyhead/docs/release_notes.html
View File

@ -10,9 +10,12 @@
<br/>
<b>New features & bug fixes in v0.9.7</b><br/>
<list>
<li>New Feature: Large Leak flagging where not present, using redline threshold</li>
<li>New Feature: Can switch off individual daily view linechart event overlays in a combo box down the bottom left</li>
<li>New Feature: Events are now visible on all daily charts in line cursor mode</li>
<li>Fix an issue that caused some burried PRS1 session data to not be imported</li>
<li>Fix a lot of pressure and pressure relief strings</li>
<li>New Feature: Added basic Weinmann SOMNOsoft2 Import importer</li>
<li>New Feature: Added (very experimental)Weinmann SOMNOsoft2 Import importer</li>
<li>Fixed inverted CMS50 .spoR file pulse and spo2</l>
<li>Added CMS50i .spo2 file import support</li>
<li>New Feature: Added a Welcome page to make things a little friendlier</li>

2
sleepyhead/welcome.cpp
View File

@ -161,7 +161,7 @@ QString GenerateWelcomeHTML()
else if (ahi < 10) ahitext = QString("<font color=red>")+QObject::tr("not very good")+"</font>";
else ahitext = QString("<font color=red>")+QObject::tr("horrible, please consult your doctor")+"</font>";
html += QObject::tr("Your had an AHI of %1, which is considered %2").arg(ahi,0,'f',2).arg(ahitext)+"<br/>";
html += QObject::tr("You had an AHI of %1, which is considered %2").arg(ahi,0,'f',2).arg(ahitext)+"<br/>";
int seconds = int(hours * 3600.0) % 60;
int minutes = int(hours * 60) % 60;