From fbea37dcb573f3afe73230cbefcbd3892f882385 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 31 Jul 2015 08:36:52 +1000 Subject: [PATCH] Stop ResMed importer crashing on zero record STR.edf files --- sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp | 6 ++++++ sleepyhead/reports.cpp | 2 +- sleepyhead/sleepyhead.pro | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index 09d57aa4..4912d134 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -2031,6 +2031,12 @@ int ResmedLoader::Open(QString path) int days = duration / 86400000L; // GetNumDataRecords = this.. Duh! + if (days<0) { + qDebug() << "Error: Negative number of days in STR.edf, aborting import"; + days=0; + return -1; + } + // Process STR.edf and find first and last time for each day QVector dayused; diff --git a/sleepyhead/reports.cpp b/sleepyhead/reports.cpp index 340b068a..564ae4a8 100644 --- a/sleepyhead/reports.cpp +++ b/sleepyhead/reports.cpp @@ -134,7 +134,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date) QRectF bounds = painter.boundingRect(QRectF(0, top, virt_width, 0), title, QTextOption(Qt::AlignHCenter | Qt::AlignTop)); painter.drawText(bounds, title, QTextOption(Qt::AlignHCenter | Qt::AlignTop)); - top += bounds.height() + normal_height / 2.0; + top += bounds.height() + 90 / 2.0; painter.setFont(report_font); int maxy = 0; diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index 5d47bd7c..f25fbb11 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -14,7 +14,7 @@ greaterThan(QT_MAJOR_VERSION,4) { #SleepyHead requires OpenGL 2.0 support to run smoothly #On platforms where it's not available, it can still be built to work -#provided the BrokenGL file resides in the SleepyHead source root directory +#provided the BrokenGL DEFINES flag is passed to qmake (eg, qmake [specs] /path/to/SleepyHeadQT.pro DEFINES+=BrokenGL) contains(DEFINES, BrokenGL) { message("Building with QWidget gGraphView") DEFINES += BROKEN_OPENGL_BUILD @@ -24,6 +24,7 @@ contains(DEFINES, BrokenGL) { QT += opengl #The following forces ResMed session locking.. it *may* not be necessary.. I'm still trying to assess this properly. +#Blah blah.. this isn't connected anymore.. just leaving it until I have the energy to clean it up DEFINES += LOCK_RESMED_SESSIONS #CONFIG += c++11