Fix some build warnings, project file commented out crud, and Breathing Not Detected untranslatable string

sleepyhead/Graphs/MinutesAtPressure.cpp

@@ -126,23 +126,23 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
     QRect rect = region.boundingRect();
 
 
-    int cells = m_maxpressure-m_minpressure+1;
+    //int cells = m_maxpressure-m_minpressure+1;
 
 
     int top = rect.top()-10;
     float width = rect.width();
     float height = rect.height();
     float left = rect.left();
-    float pix = width / float(cells);
+    //float pix = width / float(cells);
     float bottom = rect.bottom()+1;
 
 
-    int numchans = chans.size();
+    //int numchans = chans.size();
 
-    int cells_high = numchans + 2;
+    //int cells_high = numchans + 2;
 
     //height += 10;
-    float hix = height / cells_high;
+    //float hix = height / cells_high;
 
     m_minx = graph.min_x;
     m_maxx = graph.max_x;
@@ -1056,7 +1056,7 @@ void RecalcMAP::run()
     IPAP.AddChannels(chans);
     EPAP.AddChannels(chans);
 
-    ChannelID code;
+    //ChannelID code;
 
 //    QList<ChannelID> badchans;
 //    for (int i=0 ; i < chans.size(); ++i) {

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -776,7 +776,7 @@ bool PRS1Import::ParseF5Events()
 
     EventDataType data0, data1, data2, data4, data5;
 
-    EventDataType currentPressure=0, leak, p;
+    EventDataType currentPressure=0, leak; //, p;
 
     bool calcLeaks = p_profile->cpap->calculateUnintentionalLeaks();
     float lpm4 = p_profile->cpap->custom4cmH2OLeaks();
@@ -1353,7 +1353,7 @@ bool PRS1Import::ParseF0Events()
     bool FV3 = (event->fileVersion == 3);
     unsigned char * buffer = (unsigned char *)event->m_data.data();
 
-    EventDataType currentPressure=0, leak, p;
+    EventDataType currentPressure=0, leak; //, p;
 
     bool calcLeaks = p_profile->cpap->calculateUnintentionalLeaks();
     float lpm4 = p_profile->cpap->custom4cmH2OLeaks();
@@ -2167,7 +2167,7 @@ bool PRS1Import::ParseSummaryF5V2()
 
     session->set_first(qint64(summary->timestamp) * 1000L);
 
-    CPAPMode cpapmode = MODE_UNKNOWN;
+    //CPAPMode cpapmode = MODE_UNKNOWN;
     summary_duration = data[0x18] | data[0x19] << 8;
 
     return true;
@@ -3131,9 +3131,9 @@ void PRS1Loader::initChannels()
         DEFAULT,    QColor("black")));
     channel.add(GRP_CPAP, new Channel(PRS1_BND = 0x1159, SPAN,  MT_CPAP,   SESSION,
         "PRS1_BND",
-        QString("Breathing Not Detected").arg(0x12,2,16,QChar('0')),
+        QObject::tr("Breathing Not Detected"),
-        QString("A period during a session where the machine could not detect flow.").arg(0x12,2,16,QChar('0')),
+        QObject::tr("A period during a session where the machine could not detect flow."),
-        QString("BND").arg(0x12,2,16,QChar('0')),
+        QObject::tr("BND"),
         STR_UNIT_Unknown,
         DEFAULT,    QColor("light purple")));
 

sleepyhead/reports.cpp

@@ -210,7 +210,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
             float hours = day->hours(MT_CPAP);
             ahi /= hours;
             float csr = (100.0 / hours) * (day->sum(CPAP_CSR) / 3600.0);
-            float pb = (100.0 / hours) * (day->sum(CPAP_PB) / 3600.0);
+            //float pb = (100.0 / hours) * (day->sum(CPAP_PB) / 3600.0);
             float uai = day->count(CPAP_Apnea) / hours;
             float oai = day->count(CPAP_Obstructive) / hours;
             float hi = (day->count(CPAP_ExP) + day->count(CPAP_Hypopnea)) / hours;

sleepyhead/sleepyhead.pro

@@ -4,7 +4,8 @@
 #
 #-------------------------------------------------
 
-QT += core gui network xml printsupport
+QT += core gui network xml printsupport serialport
+
 
 greaterThan(QT_MAJOR_VERSION,4) {
     QT += widgets webkitwidgets
@@ -55,7 +56,6 @@ exists(../.git):{
 
     GIT_BRANCH=$$system(git rev-parse --abbrev-ref HEAD)
     DEFINES += GIT_BRANCH=\\\"$$GIT_BRANCH\\\"
-#    DEFINES += GIT_REVISION=\\\"$$system(git rev-parse --short HEAD)\\\"
     DEFINES += GIT_REVISION="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --short HEAD)\\\""
 
 #    contains(GIT_BRANCH,"testing"):
@@ -103,10 +103,6 @@ win32 {
     }
 }
 
-#include(3rdparty/quazip-0.5.1/quazip/quazip.pri)
-
-#include(SleepLib2/sleeplib.pri)
-
 SOURCES += \
     common_gui.cpp \
     daily.cpp \
@@ -292,45 +288,9 @@ mac {
     QMAKE_BUNDLE_DATA += TransFiles
 }
 
-#!win32 {
-#    include(../3rdparty/qtserialport/src/serialport/serialport-lib.pri)
-#    INCLUDEPATH += $$PWD/../3rdparty/qtserialport/include/QtSerialPort/5.3.1/QtSerialPort
-#    DEPENDPATH +=  $$PWD/../3rdparty/qtserialport/include/QtSerialPort/5.3.1/QtSerialPort
-#} else {
-    QT += serialport
-#}
-
 include(../3rdparty/quazip/quazip/quazip.pri)
 INCLUDEPATH += $$PWD/../3rdparty/quazip
 DEPENDPATH += $$PWD/../3rdparty/quazip
 
-#bundlelibs = $$cat($$PWD/../Bundle3rdParty)
-
-#contains(bundlelibs, true) {
-#    include(../3rdparty/quazip/quazip/quazip.pri)
-#    INCLUDEPATH += $$PWD/../3rdparty/quazip
-#    DEPENDPATH += $$PWD/../3rdparty/quazip
-
-# !win32 {
-#    include(../3rdparty/qtserialport/src/serialport/serialport-lib.pri)
-#    INCLUDEPATH += $$PWD/../3rdparty/qtserialport/include/QtSerialPort/5.3.1/QtSerialPort
-#    DEPENDPATH +=  $$PWD/../3rdparty/qtserialport/include/QtSerialPort/5.3.1/QtSerialPort
-# #   DEPENDPATH += $$PWD/../3rdparty/qtserialport/src/serialport/include/QtSerialPort/5.3.1
-#    }
-#} else {
-#    unix {
-#        message("Attempting to build with system quazip.");
-#        QMAKE_LFLAGS += -L/usr/lib -L/usr/local/lib
-#        INCLUDEPATH += /usr/local/include
-#        INCLUDEPATH += /usr/include
-#        DEPENDPATH += /usr/local/include/quazip
-#        DEPENDPATH += /usr/include/quazip
-#    } else {
-#        #Configure it if you need it...
-#        warning("Building with externally linked quazip is unsupported on this platform");
-#    }
-#    LIBS += -lquazip
-#}
-
 DISTFILES += \
     ../README