Merge branch 'master' of gitlab.com:sleepyhead/sleepyhead-code

2025-04-09 12:40:43 +00:00 · 2016-04-16 02:12:17 +10:00 · 2016-04-16 02:12:17 +10:00 · 89f87b2d90
commit 89f87b2d90
parent 06a39eb7df 8a855cb509
10 changed files with 80 additions and 39 deletions
--- a/31
+++ b/31
@ -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 <mark@jedimark.net>
+
 Requirements:
 -------------
 Qt5 SDK with webkit (Qt5.5 from http://qt.io/download-open-source recommended)
@ -27,13 +31,26 @@ 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 <mark@jedimark.net>
-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.

-Exceptions and 3rd Party Libraries:
-It uses QuaZip, by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package..
+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 and copyright by Mark Watkins (C) 2011-<current year>."
+
+It is not enough to reference that your derivative "is based on GPL software".
+
--- a/Translations/Francais.fr.ts
+++ b/Translations/Francais.fr.ts
@ -1229,7 +1229,7 @@
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="1187"/>
        <source>This is a beta release, some features may not yet behave as expected.</source>
-        <translation>e logiciel est une version Beta (de test) et certaines fonctions peuvent se comporter de façons inattendues.</translation>
+        <translation>Ce logiciel est une version Beta (de test) et certaines fonctions peuvent se comporter de façons inattendues.</translation>
    </message>
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="1188"/>
@ -1446,7 +1446,7 @@
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="2761"/>
        <source>Choose where to save journal</source>
-        <translation></translation>
+        <translation>Choisissez ou sauvegarder le journal</translation>
    </message>
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="2761"/>
@ -1516,7 +1516,7 @@
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="337"/>
        <source>This red message line is intentional, and will not be a feature in the final version...</source>
-        <translation></translation>
+        <translation>Ce message rouge est intentinel et sera absent de la version finale...</translation>
    </message>
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="558"/>
@ -2303,7 +2303,7 @@
        <source>Apnea
 Hypopnea
 Index</source>
-        <translation>Index des Apnée etHypopnée</translation>
+        <translation>Index des Apnée et Hypopnée</translation>
    </message>
    <message>
        <location filename="../sleepyhead/overview.cpp" line="338"/>
@ -4532,7 +4532,8 @@ Voulez-vous le faire maintenant ?</translation>
        <location filename="../sleepyhead/Graphs/gSessionTimesChart.cpp" line="660"/>
        <source>
 Hours: %1</source>
-        <translation>Heures: %1</translation>
+        <translation>
+Heures: %1</translation>
    </message>
    <message>
        <location filename="../sleepyhead/Graphs/gSessionTimesChart.cpp" line="726"/>
@ -7803,12 +7804,12 @@ Merci de reconstruire les données de PPC</translation>
    <message>
        <location filename="../sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp" line="3363"/>
        <source>0cmH2O</source>
-        <translation></translation>
+        <translation>0cmH2O</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp" line="3364"/>
        <source>1cmH2O</source>
-        <translation></translation>
+        <translation>1cmH2O</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp" line="3365"/>
--- a/Translations/Nederlands.nl.ts
+++ b/Translations/Nederlands.nl.ts
@ -1510,12 +1510,12 @@ AK: Waar staat dat Welkomst-/Startscherm???
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="2574"/>
        <source>Changing the language will reset custom Event and Waveform names/labels/descriptions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzigingen in de namen, labels en beschrijvingen van grafieken gaan verloren als de taal wordt gewijzigd.</translation>
    </message>
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="2574"/>
        <source>Are you sure you want to do this?</source>
-        <translation type="unfinished"></translation>
+        <translation>Weet je het zeker?</translation>
    </message>
    <message>
        <location filename="../sleepyhead/mainwindow.cpp" line="2764"/>
@ -4832,22 +4832,22 @@ TTIA: %1</source>
    <message>
        <location filename="../sleepyhead/SleepLib/common.cpp" line="332"/>
        <source>h</source>
-        <translation type="unfinished"></translation>
+        <translation>h</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/common.cpp" line="333"/>
        <source>m</source>
-        <translation type="unfinished"></translation>
+        <translation>m</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/common.cpp" line="334"/>
        <source>s</source>
-        <translation type="unfinished"> s</translation>
+        <translation>s s</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/common.cpp" line="335"/>
        <source>ms</source>
-        <translation type="unfinished"></translation>
+        <translation>ms</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/common.cpp" line="372"/>
@ -6644,7 +6644,7 @@ Alsjeblieft niets aanraken tot ik klaar ben.</translation>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="491"/>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="493"/>
        <source>Height</source>
-        <translation type="unfinished">Lengte</translation>
+        <translation>Lengte</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="492"/>
@ -6655,61 +6655,61 @@ Alsjeblieft niets aanraken tot ik klaar ben.</translation>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="498"/>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="500"/>
        <source>Notes</source>
-        <translation type="unfinished">Notities</translation>
+        <translation>Notities</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="499"/>
        <source>Bookmark Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Bladwijzer notities</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="506"/>
        <source>Body Mass Index</source>
-        <translation type="unfinished"></translation>
+        <translation>Body Mass Index</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="514"/>
        <source>How you feel (0 = like crap, 10 = unstoppable)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoe voel je je (0=waardeloos, 10=fantastisch)</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="521"/>
        <source>Bookmark Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Bladwijzer begin</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="527"/>
        <source>Bookmark End</source>
-        <translation type="unfinished"></translation>
+        <translation>Bladwijzer eind</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="532"/>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="533"/>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="534"/>
        <source>Last Updated</source>
-        <translation type="unfinished"></translation>
+        <translation>Laatst bijgewerkt</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="538"/>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="539"/>
        <source>Journal Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Dagboek notities</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="540"/>
        <source>Journal</source>
-        <translation type="unfinished">Dagboek</translation>
+        <translation>Dagboek</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="546"/>
        <source>1=Awake 2=REM 3=Light Sleep 4=Deep Sleep</source>
-        <translation type="unfinished"></translation>
+        <translation>1=Wakker 2=REM 3=Lichte slaap 4=Diepe slaap</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="551"/>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="552"/>
        <source>Brain Wave</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hersengolf</translation>
    </message>
    <message>
        <location filename="../sleepyhead/SleepLib/schema.cpp" line="553"/>
--- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
@ -2958,7 +2958,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"));
--- 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;
                    }
--- 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();
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@ -858,7 +858,6 @@ QStringList getDriveList()
    }

 #endif
-
    return drivelist;
 }

@ -2790,3 +2789,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&version=%2&platform=%3").arg(language).arg(VersionString).arg(PlatformString)));
+}
--- 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();
--- a/sleepyhead/mainwindow.ui
+++ b/sleepyhead/mainwindow.ui
@ -1896,8 +1896,8 @@ border: 2px solid #56789a; border-radius: 30px;
         <rect>
          <x>0</x>
          <y>0</y>
-          <width>100</width>
-          <height>30</height>
+          <width>77</width>
+          <height>236</height>
         </rect>
        </property>
        <property name="palette">
@ -3044,7 +3044,7 @@ border-radius: 10px;
         <rect>
          <x>0</x>
          <y>0</y>
-          <width>76</width>
+          <width>77</width>
          <height>236</height>
         </rect>
        </property>
@ -3176,6 +3176,8 @@ border-radius: 10px;
    <addaction name="actionHelp_Support_SleepyHead_Development"/>
    <addaction name="separator"/>
    <addaction name="actionCheck_for_Updates"/>
+    <addaction name="separator"/>
+    <addaction name="actionReport_a_Bug"/>
    <addaction name="action_About"/>
   </widget>
   <widget class="QMenu" name="menu_Data">
@ -3523,6 +3525,11 @@ border-radius: 10px;
    <string>Export for Review</string>
   </property>
  </action>
+  <action name="actionReport_a_Bug">
+   <property name="text">
+    <string>Report a Bug</string>
+   </property>
+  </action>
 </widget>
 <customwidgets>
  <customwidget>
--- a/sleepyhead/sleepyhead.pro
+++ b/sleepyhead/sleepyhead.pro
@ -331,3 +331,6 @@ DEPENDPATH += $$PWD/../3rdparty/quazip
 #    }
 #    LIBS += -lquazip
 #}
+
+DISTFILES += \
+    ../README