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

Feint backing lines in event overlays. Fixed PRS1 Mask Pressure scale bug

Browse Source
This commit is contained in:
Mark Watkins 2014-08-06 14:30:41 +10:00
parent 554132d1c5
commit 45d1430de9
3 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/Graphs/gLineChart.cpp
View File

@ -172,7 +172,7 @@ skipcheck:
if (chan->type() == schema::FLAG) { if (chan->type() == schema::FLAG) {
lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Bar); lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Bar);
} else if (chan->type() == schema::MINOR_FLAG) { } else if (chan->type() == schema::MINOR_FLAG) {
lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Bar); lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Dot);
} else if (chan->type() == schema::SPAN) { } else if (chan->type() == schema::SPAN) {
lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Span); lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Span);
} }

55
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -163,7 +163,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.fillRect(rect, QBrush(col)); painter.fillRect(rect, QBrush(col));
} }
} else if (m_flt == FT_Dot) { }/* else if (m_flt == FT_Dot) {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// FT_Dot // FT_Dot
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@ -193,7 +193,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
// painter.drawLine(x1, start_py + 1, x1, start_py + 1 + 12); // painter.drawLine(x1, start_py + 1, x1, start_py + 1 + 12);
// } // }
} }
} else if (m_flt == FT_Bar) { } */else if ((m_flt == FT_Bar) || (m_flt == FT_Dot)) {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// FT_Bar // FT_Bar
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@ -214,7 +214,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
double d1 = jj * double(raw) * 1000.0; double d1 = jj * double(raw) * 1000.0;
if ((odt == ODT_Bars)) { // || (xx < 3600000)) { if ((m_flt == FT_Bar) && (odt == ODT_Bars)) { // || (xx < 3600000)) {
QRect rect(x1-d1-2, top, d1+2, height); QRect rect(x1-d1-2, top, d1+2, height);
QColor col = m_flag_color; QColor col = m_flag_color;
@ -261,27 +261,44 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
} else { } else {
if (!m_blockhover && QRect(x1-2, topp, 6, height).contains(mouse)) { //////////////////////////////////////////////////////////////////////////////////////
if (!m_hover) { // Top and bottom markers
m_hover = true; //////////////////////////////////////////////////////////////////////////////////////
bool b = false;
if (!m_blockhover && QRect(x1-2, topp, 6, height).contains(mouse) && !m_hover) {
// only want to draw the highlight/label once per frame
m_hover = true;
b = true;
QString lab = QString("%1 (%2)").arg(schema::channel[m_code].label()).arg(raw); // Draw text label
GetTextExtent(lab, x, y); QString lab = QString("%1 (%2)").arg(schema::channel[m_code].label()).arg(raw);
painter.fillRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4, QBrush(QColor(255,255,255,245))); GetTextExtent(lab, x, y);
painter.setPen(QPen(Qt::gray,1)); painter.fillRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4, QBrush(QColor(255,255,255,245)));
painter.drawRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4); painter.setPen(QPen(Qt::gray,1));
w.renderText(lab, x1 - (x / 2)+2 - x, start_py + 14 + y + (3 * w.printScaleY()),0); painter.drawRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4);
//x1-=1; w.renderText(lab, x1 - (x / 2)+2 - x, start_py + 14 + y + (3 * w.printScaleY()),0);
painter.setPen(QPen(m_flag_color,4));
} else { //x1-=1;
painter.setPen(QPen(m_flag_color,1)); QColor col = m_flag_color;
} col.setAlpha(60);
painter.setPen(QPen(col, 4));
painter.drawLine(x1, start_py+14, x1, z - 12);
painter.setPen(QPen(m_flag_color,4));
painter.drawLine(x1, z, x1, z - 14);
painter.drawLine(x1, start_py+2, x1, start_py + 16);
} else { } else {
QColor col = m_flag_color;
col.setAlpha(10);
painter.setPen(QPen(col,1));
painter.drawLine(x1, start_py+14, x1, z - 12);
painter.setPen(QPen(m_flag_color,1)); painter.setPen(QPen(m_flag_color,1));
painter.drawLine(x1, z, x1, z - 12);
painter.drawLine(x1, start_py+2, x1, start_py + 14);
} }
painter.drawLine(x1, z, x1, z - 12);
painter.drawLine(x1, start_py+2, x1, start_py + 14);
} }
} }
} }

2
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -1727,7 +1727,7 @@ bool PRS1Import::ParseWaveforms()
} }
if (data[1].size() > 0) { if (data[1].size() > 0) {
EventList * pres = session->AddEventList(CPAP_MaskPressureHi, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, dur / data[1].size()); EventList * pres = session->AddEventList(CPAP_MaskPressureHi, EVL_Waveform, 0.1, 0.0, 0.0, 0.0, dur / data[1].size());
pres->AddWaveform(ti, (unsigned char *)data[1].data(), data[1].size(), dur); pres->AddWaveform(ti, (unsigned char *)data[1].data(), data[1].size(), dur);
} }