From 8537455d57c01d09e7194f6f4e2035f805144e82 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 10 Aug 2014 08:43:21 +1000 Subject: [PATCH] Screenshot fix code, show pressure percentile lines in daily line charts --- sleepyhead/Graphs/gLineChart.cpp | 47 +++++++++++++++++++++++++++-- sleepyhead/Graphs/gLineChart.h | 1 + sleepyhead/Graphs/gSegmentChart.cpp | 2 +- sleepyhead/mainwindow.cpp | 14 +++++++-- sleepyhead/sleepyhead.pro | 1 - 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp index 8ebe8102..255c2774 100644 --- a/sleepyhead/Graphs/gLineChart.cpp +++ b/sleepyhead/Graphs/gLineChart.cpp @@ -207,6 +207,45 @@ skipcheck: // } // } // } + CPAPMode mode = (CPAPMode)m_day->settings_wavg(CPAP_Mode); + float perc = p_profile->general->prefCalcPercentile(); + for (int i=0; ipercentile(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 ®ion) 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 ®ion) } } - 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(); diff --git a/sleepyhead/Graphs/gLineChart.h b/sleepyhead/Graphs/gLineChart.h index d6b96342..f5bc0f90 100644 --- a/sleepyhead/Graphs/gLineChart.h +++ b/sleepyhead/Graphs/gLineChart.h @@ -100,6 +100,7 @@ class gLineChart: public Layer int subtract_offset; QVector m_codes; + QStringList m_threshold; QVector m_colors; QVector m_square; QHash m_enabled; diff --git a/sleepyhead/Graphs/gSegmentChart.cpp b/sleepyhead/Graphs/gSegmentChart.cpp index d25960fa..5f18b9c6 100644 --- a/sleepyhead/Graphs/gSegmentChart.cpp +++ b/sleepyhead/Graphs/gSegmentChart.cpp @@ -75,7 +75,7 @@ void gSegmentChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion) if (rect.width() > rect.height()) { left = rect.left() + (rect.width() - rect.height()); } - left --; + //left --; if (!m_visible) { return; } if (!m_day) { return; } diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index a39d60fd..5c5ab9a2 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -1363,8 +1363,6 @@ void MainWindow::on_action_About_triggered() "

" + tr("3rd Party Libaries:") + " " + tr("SleepyHead is built using the Qt Application Framework.") + " " + - tr("It uses the cross platform QExtSerialPort library for serial port access in the Oximetry module.") - + " " + tr("In the updater code, SleepyHead uses QuaZip by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package.") + "
" "

" + tr("Special thanks to Pugsy from CPAPTalk 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); diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index 46d7980c..1107a8e8 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -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)