From 826b9bb175ae40bd6d7bf864b36f850aefe0bcac Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 3 Apr 2016 22:48:24 +1000 Subject: [PATCH 1/7] Add Report a Bug Help menu option --- sleepyhead/mainwindow.cpp | 8 ++++++++ sleepyhead/mainwindow.h | 2 ++ sleepyhead/mainwindow.ui | 13 ++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index e29f0042..30ef5d65 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -2790,3 +2790,11 @@ void MainWindow::on_mainsplitter_splitterMoved(int, int) { p_profile->appearance->setRightPanelWidth(ui->mainsplitter->sizes()[1]); } + +#include "translation.h" +void MainWindow::on_actionReport_a_Bug_triggered() +{ + QSettings settings(getDeveloperName(), getAppName()); + QString language = settings.value(LangSetting).toString(); + QDesktopServices::openUrl(QUrl(QString("http://sleepyhead.jedimark.net/report_bugs.php?lang=%1").arg(language))); +} diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index db59a220..58130630 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -339,6 +339,8 @@ class MainWindow : public QMainWindow void on_mainsplitter_splitterMoved(int pos, int index); + void on_actionReport_a_Bug_triggered(); + private: void importCPAPBackups(); void finishCPAPImport(); diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index fc6ffba1..11b93dbf 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -1896,8 +1896,8 @@ border: 2px solid #56789a; border-radius: 30px; 0 0 - 100 - 30 + 77 + 236 @@ -3044,7 +3044,7 @@ border-radius: 10px; 0 0 - 76 + 77 236 @@ -3176,6 +3176,8 @@ border-radius: 10px; + + @@ -3523,6 +3525,11 @@ border-radius: 10px; Export for Review + + + Report a Bug + + From 0bc6fbbcc6a6ff65abcd9a84f1ad8d010e3c9485 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 3 Apr 2016 23:37:42 +1000 Subject: [PATCH 2/7] Supply version and platform strings to Report Bugs page --- sleepyhead/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 30ef5d65..a3633cec 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -2796,5 +2796,5 @@ void MainWindow::on_actionReport_a_Bug_triggered() { QSettings settings(getDeveloperName(), getAppName()); QString language = settings.value(LangSetting).toString(); - QDesktopServices::openUrl(QUrl(QString("http://sleepyhead.jedimark.net/report_bugs.php?lang=%1").arg(language))); + QDesktopServices::openUrl(QUrl(QString("http://sleepyhead.jedimark.net/report_bugs.php?lang=%1&version=%2&platform=%3").arg(language).arg(VersionString).arg(PlatformString))); } From 2e2b7d269c92445cf6409b678da0626d332dc612 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 4 Apr 2016 01:00:36 +1000 Subject: [PATCH 3/7] Issue #0005 EPR on/off glitch --- sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index c8332177..b5fabce5 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -403,6 +403,7 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles) } EventDataType epr = -1, epr_level = -1; + bool a10 = false; if ((mode == MODE_CPAP) || (mode == MODE_APAP)) { if ((sig = str.lookupSignal(RMS9_EPR))) { epr= EventDataType(sig->data[rec]) * sig->gain + sig->offset; @@ -412,17 +413,20 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles) } if ((sig = str.lookupLabel("S.EPR.EPRType"))) { + a10 = true; epr = EventDataType(sig->data[rec]) * sig->gain + sig->offset; epr += 1; } int epr_on=0, clin_epr_on=0; if ((sig = str.lookupLabel("S.EPR.EPREnable"))) { // first check machines opinion + a10 = true; epr_on = EventDataType(sig->data[rec]) * sig->gain + sig->offset; } if (epr_on && (sig = str.lookupLabel("S.EPR.ClinEnable"))) { + a10 = true; clin_epr_on = EventDataType(sig->data[rec]) * sig->gain + sig->offset; } - if (!(epr_on && clin_epr_on)) { + if (a10 && !(epr_on && clin_epr_on)) { epr = 0; epr_level = 0; } From d5db4718d256865b3f7e80ae88af1c8f855ec30a Mon Sep 17 00:00:00 2001 From: Arie Klerk Date: Fri, 8 Apr 2016 11:06:07 +0200 Subject: [PATCH 4/7] Here are the latest files --- Translations/Francais.fr.ts | 15 ++++++++------- Translations/Nederlands.nl.ts | 36 +++++++++++++++++------------------ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Translations/Francais.fr.ts b/Translations/Francais.fr.ts index 203cfac4..c138f2da 100644 --- a/Translations/Francais.fr.ts +++ b/Translations/Francais.fr.ts @@ -1229,7 +1229,7 @@ This is a beta release, some features may not yet behave as expected. - e logiciel est une version Beta (de test) et certaines fonctions peuvent se comporter de façons inattendues. + Ce logiciel est une version Beta (de test) et certaines fonctions peuvent se comporter de façons inattendues. @@ -1446,7 +1446,7 @@ Choose where to save journal - + Choisissez ou sauvegarder le journal @@ -1516,7 +1516,7 @@ This red message line is intentional, and will not be a feature in the final version... - + Ce message rouge est intentinel et sera absent de la version finale... @@ -2303,7 +2303,7 @@ Apnea Hypopnea Index - Index des Apnée etHypopnée + Index des Apnée et Hypopnée @@ -4532,7 +4532,8 @@ Voulez-vous le faire maintenant ? Hours: %1 - Heures: %1 + +Heures: %1 @@ -7803,12 +7804,12 @@ Merci de reconstruire les données de PPC 0cmH2O - + 0cmH2O 1cmH2O - + 1cmH2O diff --git a/Translations/Nederlands.nl.ts b/Translations/Nederlands.nl.ts index e4c1af2f..ffe716b8 100644 --- a/Translations/Nederlands.nl.ts +++ b/Translations/Nederlands.nl.ts @@ -1510,12 +1510,12 @@ AK: Waar staat dat Welkomst-/Startscherm??? Changing the language will reset custom Event and Waveform names/labels/descriptions. - + Wijzigingen in de namen, labels en beschrijvingen van grafieken gaan verloren als de taal wordt gewijzigd. Are you sure you want to do this? - + Weet je het zeker? @@ -4832,22 +4832,22 @@ TTIA: %1 h - + h m - + m s - s + s s ms - + ms @@ -6644,7 +6644,7 @@ Alsjeblieft niets aanraken tot ik klaar ben. Height - Lengte + Lengte @@ -6655,61 +6655,61 @@ Alsjeblieft niets aanraken tot ik klaar ben. Notes - Notities + Notities Bookmark Notes - + Bladwijzer notities Body Mass Index - + Body Mass Index How you feel (0 = like crap, 10 = unstoppable) - + Hoe voel je je (0=waardeloos, 10=fantastisch) Bookmark Start - + Bladwijzer begin Bookmark End - + Bladwijzer eind Last Updated - + Laatst bijgewerkt Journal Notes - + Dagboek notities Journal - Dagboek + Dagboek 1=Awake 2=REM 3=Light Sleep 4=Deep Sleep - + 1=Wakker 2=REM 3=Lichte slaap 4=Diepe slaap Brain Wave - + Hersengolf From 40753bc7a787c494b0247d5ed9befd9caff5267d Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 11 Apr 2016 13:11:15 +1000 Subject: [PATCH 5/7] Fix Heated Tubing spelling mistake --- sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 27d2d219..6d88bf6d 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -2905,7 +2905,7 @@ void PRS1Loader::initChannels() "PRS1HeatedTubing", QObject::tr("Heated Tubing"), QObject::tr("Heated Tubing Connected"), - QObject::tr("Headed Tubing"), + QObject::tr("Heated Tubing"), "", LOOKUP, Qt::green)); chan->addOption(0, QObject::tr("Yes")); chan->addOption(1, QObject::tr("No")); From 98e2498afcaf5efbe0889178541da62d82ba0179 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 15 Apr 2016 11:15:07 +1000 Subject: [PATCH 6/7] Fix spelling mistake and update README.TXT a little --- README | 27 +++++++++++++++++++-------- sleepyhead/UpdaterWindow.cpp | 2 +- sleepyhead/mainwindow.cpp | 1 - sleepyhead/sleepyhead.pro | 3 +++ 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/README b/README index d838f030..3557c7f5 100644 --- a/README +++ b/README @@ -3,6 +3,10 @@ SleepyHead v1.0 branch SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. +SleepyHead is written by Mark Watkins (aka Jedimark), an Australian software developer afflicted with sleep apnea. + +SleepyHead is copyright (C) 2011-2016 Mark Watkins + Requirements: ------------- Qt5 SDK with webkit (Qt5.5 from http://qt.io/download-open-source recommended) @@ -27,13 +31,20 @@ You may need to add a -spec option to qmake to suit your platform. Adding -j3 speeds up the make command on a dual core or greater system. -Author: Mark Watkins -Copyright (C)2011-2016 Mark Watkins -Licence Stuff -------------- -This software is released under the GNU Public License version 3.0 +Software Licensing Information +------------------------------ +SleepyHead is released under the GNU GPL v3 License. Please see below for a note on giving correct attribution in redistribution of derivatives. + +It is built using Qt SDK (Open Source Edition), available from http://qt.io. + +It also uses QuaZip, by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package http://sourceforge.net/projects/quazip/ + +Redistribution of derivatives +----------------------------- +I created this software to help lessen the exploitation of others. Seeing my work being used to exploit others is incredibly un-motivational, and incredibly disrespectful of all the work I put into this project. + +If you plan on reselling any derivatives of SleepyHead, I specifically request that you give due credit and link back, mentioning clearly in your advertising material, software installer and about screens that your derivative "is based on the free and open-source software SleepyHead available from http://sleepyhead.jedimark.net, developed by Mark Watkins (C) 2011-. " + +It is not enough to reference that your derivative "is based on GPL software". -Exceptions and 3rd Party Libraries: -It uses QuaZip, by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package.. -http://sourceforge.net/projects/quazip/ diff --git a/sleepyhead/UpdaterWindow.cpp b/sleepyhead/UpdaterWindow.cpp index d210b193..e5f37297 100644 --- a/sleepyhead/UpdaterWindow.cpp +++ b/sleepyhead/UpdaterWindow.cpp @@ -444,7 +444,7 @@ void UpdaterWindow::ParseUpdatesXML(QIODevice *dev) if (QMessageBox::question(mainwin, tr("SleepyHead Updates"), tr("New SleepyHead Updates are avilable:")+"\n\n"+ - tr("Would you like t download and install them now?"), + tr("Would you like to download and install them now?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) { StartMaintenanceTool(); diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index a3633cec..297c5c17 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -858,7 +858,6 @@ QStringList getDriveList() } #endif - return drivelist; } diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index e9c08d2f..9133c609 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -331,3 +331,6 @@ DEPENDPATH += $$PWD/../3rdparty/quazip # } # LIBS += -lquazip #} + +DISTFILES += \ + ../README From 8a855cb509fac48cf2750309e9e910c7004851ef Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 15 Apr 2016 11:18:04 +1000 Subject: [PATCH 7/7] README.txt needs newlines for gitlab's ugly display box --- README | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README b/README index 3557c7f5..20350793 100644 --- a/README +++ b/README @@ -34,17 +34,23 @@ Adding -j3 speeds up the make command on a dual core or greater system. Software Licensing Information ------------------------------ -SleepyHead is released under the GNU GPL v3 License. Please see below for a note on giving correct attribution in redistribution of derivatives. +SleepyHead is released under the GNU GPL v3 License. Please see below for a note on giving correct attribution +in redistribution of derivatives. It is built using Qt SDK (Open Source Edition), available from http://qt.io. -It also uses QuaZip, by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package http://sourceforge.net/projects/quazip/ +It also uses QuaZip, by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package +http://sourceforge.net/projects/quazip/ Redistribution of derivatives ----------------------------- -I created this software to help lessen the exploitation of others. Seeing my work being used to exploit others is incredibly un-motivational, and incredibly disrespectful of all the work I put into this project. +I created this software to help lessen the exploitation of others. Seeing my work being used to exploit others +is incredibly un-motivational, and incredibly disrespectful of all the work I put into this project. -If you plan on reselling any derivatives of SleepyHead, I specifically request that you give due credit and link back, mentioning clearly in your advertising material, software installer and about screens that your derivative "is based on the free and open-source software SleepyHead available from http://sleepyhead.jedimark.net, developed by Mark Watkins (C) 2011-. " +If you plan on reselling any derivatives of SleepyHead, I specifically request that you give due credit and +link back, mentioning clearly in your advertising material, software installer and about screens that your +derivative "is based on the free and open-source software SleepyHead available from http://sleepyhead.jedimark.net, +developed and copyright by Mark Watkins (C) 2011-." It is not enough to reference that your derivative "is based on GPL software".