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

Screenshot fix code, show pressure percentile lines in daily line charts

Browse Source
This commit is contained in:
Mark Watkins 2014-08-10 08:43:21 +10:00
parent 0c57c04537
commit 8537455d57
5 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sleepyhead/Graphs/gLineChart.cpp
View File

@ -207,6 +207,45 @@ skipcheck:
// }
// }
// }
CPAPMode mode = (CPAPMode)m_day->settings_wavg(CPAP_Mode);
float perc = p_profile->general->prefCalcPercentile();
for (int i=0; i<m_codes.size(); ++i) {
ChannelID code = m_codes.at(i);
schema::Channel & chan = schema::channel[code];
if (code == CPAP_Pressure) {
if (mode == MODE_APAP) {
float f = m_day->percentile(code, perc / 100.0);
chan.setUpperThreshold(f);
chan.setUpperThresholdColor(Qt::black);
m_threshold.push_back(QString("%1% %2 %3").arg(perc, 0, 'f', 0).arg(chan.fullname()).arg(f,0,'f',2));
} else {
chan.setUpperThreshold(0);
m_threshold.push_back(QString());
}
} else if (code == CPAP_IPAP) {
if (mode >= MODE_BILEVEL_AUTO_FIXED_PS) {
float f = m_day->percentile(code,perc / 100.0);
chan.setUpperThreshold(f);
chan.setUpperThresholdColor(Qt::black);
m_threshold.push_back(QString("%1% %2 %3").arg(perc, 0, 'f', 0).arg(chan.fullname()).arg(f,0,'f',2));
} else {
chan.setUpperThreshold(0);
m_threshold.push_back(QString());
}
} else if (code == CPAP_EPAP) {
if ((mode >= MODE_BILEVEL_AUTO_FIXED_PS) && (mode != MODE_ASV)) {
float f = m_day->percentile(code,perc / 100.0);
chan.setUpperThreshold(f);
chan.setUpperThresholdColor(Qt::black);
m_threshold.push_back(QString("%1% %2 %3").arg(perc, 0, 'f', 0).arg(chan.fullname()).arg(f,0,'f',2));
} else {
chan.setUpperThreshold(0);
m_threshold.push_back(QString());
}
} else if (code == CPAP_Leak) {
m_threshold.push_back(QObject::tr("%1 threshold").arg(chan.fullname()));
} else m_threshold.push_back(QString());
}
}
EventDataType gLineChart::Miny()
{
@ -415,18 +454,20 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (chan.upperThreshold() > 0) {
QColor color = chan.upperThresholdColor();
color.setAlpha(100);
painter.setPen(color);
painter.setPen(QPen(QBrush(color),1,Qt::DotLine));
EventDataType y=top + height + 1 - ((chan.upperThreshold() - miny) * ymult);
painter.drawLine(left + 1, y, left + 1 + width, y);
painter.drawText(left+4, y-2, m_threshold.at(gi));
}
if (chan.lowerThreshold() > 0) {
QColor color = chan.lowerThresholdColor();
color.setAlpha(100);
painter.setPen(color);
painter.setPen(QPen(QBrush(color),1,Qt::DotLine));
EventDataType y=top + height + 1 - ((chan.lowerThreshold() - miny) * ymult);
painter.drawLine(left+1, y, left + 1 + width, y);
painter.drawText(left+4, y-2, m_threshold.at(gi));
}
lines.clear();
@ -719,7 +760,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
}
}
painter.setPen(QPen(chan.defaultColor(),p_profile->appearance->lineThickness()));
painter.setPen(QPen(chan.defaultColor(), p_profile->appearance->lineThickness()));
painter.drawLines(lines);
w.graphView()->lines_drawn_this_frame += lines.count();
lines.clear();

1
sleepyhead/Graphs/gLineChart.h
View File

@ -100,6 +100,7 @@ class gLineChart: public Layer
int subtract_offset;
QVector<ChannelID> m_codes;
QStringList m_threshold;
QVector<QColor> m_colors;
QVector<bool> m_square;
QHash<ChannelID, bool> m_enabled;

2
sleepyhead/Graphs/gSegmentChart.cpp
View File

@ -75,7 +75,7 @@ void gSegmentChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (rect.width() > rect.height()) {
left = rect.left() + (rect.width() - rect.height());
}
left --;
//left --;
if (!m_visible) { return; }
if (!m_day) { return; }

14
sleepyhead/mainwindow.cpp
View File

@ -1363,8 +1363,6 @@ void MainWindow::on_action_About_triggered()
"<p><b>" + tr("3rd Party Libaries:") + "</b> " +
tr("SleepyHead is built using the <a href=\"http://qt-project.org\">Qt Application Framework</a>.")
+ " " +
tr("It uses the cross platform <a href=\"http://code.google.com/p/qextserialport\">QExtSerialPort</a> library for serial port access in the Oximetry module.")
+ " " +
tr("In the updater code, SleepyHead uses <a href=\"http://sourceforge.net/projects/quazip\">QuaZip</a> by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package.")
+ "<br/>"
"<p>" + tr("Special thanks to Pugsy from <a href='http://cpaptalk.com'>CPAPTalk</a> for her help with documentation and tutorials, as well as everyone who helped out by testing and sharing their CPAP data.")
@ -1522,7 +1520,17 @@ void MainWindow::DelayedScreenshot()
h /= pr;
#endif
QPixmap pixmap = QPixmap::grabWindow(this->winId(), x(), y(), w, h);
#ifdef Q_OS_WIN32
QRect rec = QApplication::desktop()->screenGeometry();
// grab the whole screen
QPixmap desktop = QPixmap::grabWindow(this->winId(), 0, 0, rec.width(), rec.height());
QPixmap pixmap = desktop.copy(x() * devicePixelRatio(), y() * devicePixelRatio(), width() * devicePixelRatio(), (height()+20) * devicePixelRatio());
#else
QPixmap pixmap = QPixmap::grabWindow(this->winId(), x(), y(), w, h+10);
#endif
QString a = PREF.Get("{home}/Screenshots");
QDir dir(a);

1
sleepyhead/sleepyhead.pro
View File

@ -119,7 +119,6 @@ unix {
HEADERS += build_number.h
}
#include(..3rdparty/qextserialport/src/qextserialport.pri)
#include(3rdparty/quazip-0.5.1/quazip/quazip.pri)
#include(SleepLib2/sleeplib.pri)