Merge branch 'master' into fix-cms50dplus

oscar/Graphs/gSessionTimesChart.cpp

@@ -896,10 +896,10 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
 
                         float s2 = double(slice.end - slice.start) / 3600000.0;
 
-                        QColor col = (slice.status == EquipmentOn) ? goodcolor : Qt::black;
+                        QColor col = (slice.status == MaskOn) ? goodcolor : Qt::black;
                         QString txt = QObject::tr("%1\nLength: %3\nStart: %2\n").arg(datestr).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2);
 
-                        txt += (slice.status == EquipmentOn) ? QObject::tr("Mask On") : QObject::tr("Mask Off");
+                        txt += (slice.status == MaskOn) ? QObject::tr("Mask On") : QObject::tr("Mask Off");
                         slices.append(SummaryChartSlice(&calcitems[0], s1, s2, txt, col));
                     }
                 } else {

oscar/SleepLib/day.cpp

@@ -654,13 +654,19 @@ qint64 Day::total_time()
                     range.insert(first, 0);
                     range.insert(last, 1);
                     d_totaltime += sess->length();
+                    if (sess->length() == 0) {
+                        qWarning() << sess->s_session << "0 length session";
+                    }
                 }
             } else {
                 for (auto & slice : sess->m_slices) {
-                    if (slice.status == EquipmentOn) {
+                    if (slice.status == MaskOn) {
                         range.insert(slice.start, 0);
                         range.insert(slice.end, 1);
                         d_totaltime += slice.end - slice.start;
+                        if (slice.end - slice.start == 0) {
+                            qWarning() << sess->s_session << "0 length slice";
+                        }
                     }
                 }
             }
@@ -724,13 +730,19 @@ qint64 Day::total_time(MachineType type)
                     range.insert(first, 0);
                     range.insert(last, 1);
                     d_totaltime += sess->length();
+                    if (sess->length() == 0) {
+                        qWarning() << sess->s_session << "0 length session";
+                    }
                 }
             } else {
                 for (const auto & slice : sess->m_slices) {
-                    if (slice.status == EquipmentOn) {
+                    if (slice.status == MaskOn) {
                         range.insert(slice.start, 0);
                         range.insert(slice.end, 1);
                         d_totaltime += slice.end - slice.start;
+                        if (slice.end - slice.start == 0) {
+                            qWarning() << sess->s_session << "0 length slice";
+                        }
                     }
                 }
             }

oscar/SleepLib/event.cpp

@@ -1,4 +1,4 @@
-/* SleepLib Event Class Implementation
+/* SleepLib Event Class Implementation
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
@@ -85,12 +85,12 @@ void EventList::AddEvent(qint64 time, EventStoreType data)
     if (m_first > time) {
         // Crud.. Update all the previous records
         // This really shouldn't happen.
-        qDebug() << "Unordered time detected in AddEvent().";
+        qDebug() << "Unordered time detected in AddEvent()" << m_count << m_first << time << data;
 
         qint32 delta = (m_first - time);
 
         for (quint32 i = 0; i < m_count; ++i) {
-            m_time[i] -= delta;
+            m_time[i] += delta;
         }
 
         m_first = time;

oscar/SleepLib/loader_plugins/prs1_loader.h

@@ -25,7 +25,7 @@
 //********************************************************************************************
 // Please INCREMENT the following value when making changes to this loaders implementation
 // BEFORE making a release
-const int prs1_data_version = 15;
+const int prs1_data_version = 16;
 //
 //********************************************************************************************
 #if 0  // Apparently unused
@@ -128,9 +128,15 @@ public:
     //! \brief Read the chunk's data from a PRS1 file and calculate its CRC, must be called after ReadHeader
     bool ReadData(class QFile & f);
     
-    //! \brief Parse a single data chunk from a .000 file containing compliance data for a brick
+    //! \brief Figures out which Compliance Parser to call, based on machine family/version and calls it.
     bool ParseCompliance(void);
     
+    //! \brief Parse a single data chunk from a .000 file containing compliance data for a P25x brick
+    bool ParseComplianceF0V23(void);
+    
+    //! \brief Parse a single data chunk from a .000 file containing compliance data for a DreamStation 200X brick
+    bool ParseComplianceF0V6(void);
+    
     //! \brief Figures out which Summary Parser to call, based on machine family/version and calls it.
     bool ParseSummary();
 
@@ -155,9 +161,12 @@ public:
     //! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data
     void ParseFlexSetting(quint8 flex, CPAPMode cpapmode);
     
-    //! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data
+    //! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for fileversion 2 machines: F0V234, F5V012, and maybe others
-    void ParseHumidifierSetting(int humid, bool supportsHeatedTubing=true);
+    void ParseHumidifierSettingV2(int humid, bool supportsHeatedTubing=true);
-    
+
+    //! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for family 0 CPAP/APAP family version 6 machines
+    void ParseHumidifierSettingF0V6(unsigned char byte1, unsigned char byte2, bool add_setting=false);
+
     //! \brief Figures out which Event Parser to call, based on machine family/version and calls it.
     bool ParseEvents(CPAPMode mode);
 
@@ -191,6 +200,9 @@ protected:
 
     //! \brief Extract the stored CRC from the end of the data of a PRS1 chunk
     bool ExtractStoredCrc(int size);
+
+    //! \brief Parse a settings slice from a .000 (and maybe .001) file
+    bool ParseSettingsF0V6(const unsigned char* data, int size);
 };
 
 
@@ -233,10 +245,10 @@ public:
     QString wavefile;
     QString oxifile;
 
-    //! \brief As it says on the tin.. Parses .001 files for bricks.
+    //! \brief Imports .000 files for bricks.
-    bool ParseCompliance();
+    bool ImportCompliance();
 
-    //! \brief Imports the .002 summary file.
+    //! \brief Imports the .001 summary file.
     bool ImportSummary();
 
     //! \brief Figures out which Event Parser to call, based on machine family/version and calls it.
@@ -249,7 +261,7 @@ public:
     bool ParseWaveforms();
 
     //! \brief Takes the parsed list of oximeter waveform chunks and adds them to the database.
-    bool ParseOximetery();
+    bool ParseOximetry();
 
 
     //! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine

oscar/SleepLib/loader_plugins/resmed_loader.cpp

@@ -3117,8 +3117,8 @@ void ResmedLoader::initChannels()
         QObject::tr("Climate Control"),
         "", LOOKUP, Qt::black));
 
-    chan->addOption(0, QObject::tr("Manual"));
+    chan->addOption(0, QObject::tr("Auto"));
-    chan->addOption(1, QObject::tr("Auto"));
+    chan->addOption(1, QObject::tr("Manual"));
 
     channel.add(GRP_CPAP, chan = new Channel(RMS9_Mask= 0xe20C, SETTING, MT_CPAP, SESSION,
         "RMS9_Mask", QObject::tr("Mask"),

oscar/SleepLib/session.h

@@ -1,7 +1,8 @@
-/* SleepLib Session Header
+/* SleepLib Session Header
  *
  * This stuff contains the session calculation smarts
  *
+ * Copyright (c) 2019 The OSCAR Team
  * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -24,7 +25,7 @@
 class Machine;
 
 enum SliceStatus {
-    UnknownStatus=0, EquipmentOff, EquipmentLeaking, EquipmentOn
+    UnknownStatus=0, EquipmentOff, MaskOn, MaskOff  // is there an EquipmentOn?
 };
 
 class SessionSlice
@@ -137,7 +138,7 @@ class Session
 //            t = 0;
 //            for (int i=0; i<size; ++i) {
 //                const SessionSlice & slice = m_slices.at(i);
-//                if (slice.status == EquipmentOn) {
+//                if (slice.status == MaskOn) {
 //                    t += slice.end - slice.start;
 //                }
 //            }
@@ -169,7 +170,7 @@ class Session
     //! \brief Set last time to higher of 'd' and existing s_last.  Throw warning if 'd' less than s_first.
     void set_last(qint64 d) {
         if (d <= s_first) {
-            qWarning() << "Session::set_last() d<=s_first";
+            qWarning() << s_session << "Session::set_last() d<=s_first";
             return;
         }
 
@@ -187,7 +188,7 @@ class Session
             t = 0;
             for (int i=0; i<size; ++i) {
                 const SessionSlice & slice = m_slices.at(i);
-                if (slice.status == EquipmentOn) {
+                if (slice.status == MaskOn) {
                     t += slice.end - slice.start;
                 }
             }

oscar/mainwindow.cpp

@@ -1076,6 +1076,13 @@ void MainWindow::setRecBoxHTML(QString html)
 {
     ui->recordsBox->setHtml(html);
 }
+
+void MainWindow::setStatsHTML(QString html)
+{
+    ui->statisticsView->setHtml(html);
+}
+
+
 /***
 QString MainWindow::getWelcomeHTML()
 {
@@ -1404,70 +1411,12 @@ void MainWindow::on_actionPrint_Report_triggered()
         Report::PrintReport(overview->graphView(), STR_TR_Overview);
     } else if (ui->tabWidget->currentWidget() == daily) {
         Report::PrintReport(daily->graphView(), STR_TR_Daily, daily->getDate());
-    } else {
+    } else if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
-        QPrinter printer(QPrinter::HighResolution);
+        Statistics::printReport(this);
-#ifdef Q_WS_X11
-        printer.setPrinterName("Print to File (PDF)");
-        printer.setOutputFormat(QPrinter::PdfFormat);
-        QString name;
-        QString datestr;
-
-        if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
-            name = "Statistics";
-            datestr = QDate::currentDate().toString(Qt::ISODate);
-        } else if (ui->tabWidget->currentWidget() == ui->helpTab) {
-            name = "Help";
-            datestr = QDateTime::currentDateTime().toString(Qt::ISODate);
-        } else { name = "Unknown"; }
-
-        QString filename = p_pref->Get("{home}/" + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf");
-
-        printer.setOutputFileName(filename);
-#endif
-        printer.setPrintRange(QPrinter::AllPages);
-//        if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
-//            printer.setOrientation(QPrinter::Landscape);
-//        } else {
-            printer.setOrientation(QPrinter::Portrait);
-        //}
-        printer.setFullPage(false); // This has nothing to do with scaling
-        printer.setNumCopies(1);
-        printer.setResolution(1200);
-        //printer.setPaperSize(QPrinter::A4);
-        //printer.setOutputFormat(QPrinter::PdfFormat);
-        printer.setPageMargins(5, 5, 5, 5, QPrinter::Millimeter);
-        QPrintDialog pdlg(&printer, this);
-
-        if (pdlg.exec() == QPrintDialog::Accepted) {
-
-            if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
-
-                QTextBrowser b;
-                QPainter painter;
-                painter.begin(&printer);
-
-                QRect rect = printer.pageRect();
-                b.setHtml(ui->statisticsView->toHtml());
-                b.resize(rect.width()/4, rect.height()/4);
-                b.setFrameShape(QFrame::NoFrame);
-
-                double xscale = printer.pageRect().width()/double(b.width());
-                double yscale = printer.pageRect().height()/double(b.height());
-                double scale = qMin(xscale, yscale);
-                painter.translate(printer.paperRect().x() + printer.pageRect().width()/2, printer.paperRect().y() + printer.pageRect().height()/2);
-                painter.scale(scale, scale);
-                painter.translate(-b.width()/2, -b.height()/2);
-
-                b.render(&painter, QPoint(0,0));
-                painter.end();
-
 #ifndef helpless
-            } else if (ui->tabWidget->currentWidget() == help) {
+    } else if (ui->tabWidget->currentWidget() == help) {
-                help->print(&printer);
+        help->print(&printer);  // **** THIS DID NOT SURVIVE REFACTORING STATISTICS PRINT
 #endif
-            }
-
-        }
     }
 }
 
@@ -2366,14 +2315,13 @@ void MainWindow::GenerateStatistics()
     ui->statEndDate->setMaximumDate(last);
 
     Statistics stats;
-    QString html = stats.GenerateHTML();
+    QString htmlStats = stats.GenerateHTML();
+    QString htmlRecords = stats.UpdateRecordsBox();
 
     updateFavourites();
 
-    //QWebFrame *frame=ui->statisticsView->page()->currentFrame();
+    setStatsHTML(htmlStats);
-    //frame->addToJavaScriptWindowObject("mainwin",this);
+    setRecBoxHTML(htmlRecords);
-    //ui->statisticsView->setHtml(html);
-    ui->statisticsView->setHtml(html);
 
 }
 

oscar/mainwindow.h

@@ -160,6 +160,9 @@ class MainWindow : public QMainWindow
 
     //! \brief Internal function to set Records Box html from statistics module
     void setRecBoxHTML(QString html);
+    //! \brief Internal function to set Statistics page html from statistics module
+    void setStatsHTML(QString html);
+
     int importCPAP(ImportPath import, const QString &message);
 
     void startImportDialog() { on_action_Import_Data_triggered(); }

oscar/statistics.cpp

@@ -12,11 +12,23 @@
 #include <QBuffer>
 #include <cmath>
 
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QPainter>
+#include <QMainWindow>
+
 #include "mainwindow.h"
 #include "statistics.h"
 
 extern MainWindow *mainwin;
 
+// HTML components that make up Statistics page and printed report
+QString htmlReportHeader = "";      // Page header
+QString htmlUsage = "";             // CPAP and Oximetry
+QString htmlMachineSettings = "";   // Machine (formerly Rx) changes
+QString htmlMachines = "";          // Machines used in this profile
+QString htmlReportFooter = "";      // Page footer
+
 QString resizeHTMLPixmap(QPixmap &pixmap, int width, int height) {
     QByteArray byteArray;
     QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
@@ -955,8 +967,8 @@ QString Statistics::getRDIorAHIText() {
     return STR_TR_AHI;
 }
 
-// Create the HTML that will be the Statistics page.
+// Create the HTML for CPAP and Oximetry usage
-QString Statistics::GenerateHTML()
+QString Statistics::GenerateCPAPUsage()
 {
     QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
     QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER);
@@ -975,14 +987,11 @@ QString Statistics::GenerateHTML()
         }
     }
 
-    // Create HTML header and <body> statement
+    QString html = "";
-    QString html = htmlHeader(havedata);
 
     // If we don't have any data, return HTML that says that and we are done
     if (!havedata) {
-        html += htmlNoData();
+        return "";
-        html += htmlFooter(havedata);
-        return html;
     }
 
     // Find first and last days with valid CPAP data
@@ -1011,13 +1020,14 @@ QString Statistics::GenerateHTML()
     // Compute number of monthly periods for a monthly rather than standard time distribution
     int number_periods = 0;
     if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
-        QDate beginDate = qMax(firstcpap, lastcpap.addYears(-1));
+        int firstMonth = firstcpap.month();
-        int beginMonth = beginDate.month();
         int lastMonth = lastcpap.month();
-        if (lastMonth < beginMonth) lastMonth += 12; // handle time extending to next year
+        if (lastMonth <= firstMonth && firstcpap.year() != lastcpap.year())
-        number_periods = lastMonth - beginMonth + 1;
+            lastMonth += 12; // handle time extending to next year
+        number_periods = lastMonth - firstMonth + 1;
+
         if (number_periods < 1) {
-            qDebug() << "*** Begin" << beginDate << "beginMonth" << beginMonth << "lastMonth" << lastMonth << "periods" << number_periods;
+            qDebug() << "*** Begin" << firstcpap << "beginMonth" << firstMonth << "lastMonth" << lastMonth << "periods" << number_periods;
             number_periods = 1;
         }
         // But not more than one year
@@ -1068,19 +1078,6 @@ QString Statistics::GenerateHTML()
                     l = s.addDays(-1);
                 } while ((l > first) && (j < number_periods));
 
-//                for (; j < number_periods; ++j) {
-//                    s=QDate(l.year(), l.month(), 1);
-//                    if (s < first) {
-//                        done = true;
-//                        s = first;
-//                    }
-//                    if (p_profile->countDays(row.type, s, l) > 0) {
-//                        periods.push_back(Period(s, l, s.toString("MMMM")));
-//                    } else {
-//                    }
-//                    l = s.addDays(-1);
-//                    if (done || (l < first)) break;
-//                }
                 for (; j < number_periods; ++j) {
                     periods.push_back(Period(last,last, ""));
                 }
@@ -1174,21 +1171,91 @@ QString Statistics::GenerateHTML()
     html += "</table>";
     html += "</div>";
 
-
-    html += GenerateRXChanges();
-    html += GenerateMachineList();
-
-    UpdateRecordsBox();
-
-
-
-    html += "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>";
-    //updateFavourites();
-    html += htmlFooter();
     return html;
 }
 
-void Statistics::UpdateRecordsBox()
+// Create the HTML that will be the Statistics page.
+QString Statistics::GenerateHTML()
+{
+    htmlReportHeader = htmlHeader(true);
+    htmlReportFooter = htmlFooter(true);
+
+    htmlUsage = GenerateCPAPUsage();
+
+    if (htmlUsage == "") {
+        return htmlReportHeader + htmlNoData() + htmlReportFooter;
+    }
+
+    htmlMachineSettings = GenerateRXChanges();
+    htmlMachines = GenerateMachineList();
+
+    UpdateRecordsBox();
+
+    QString htmlScript = "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>";
+
+    return htmlReportHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter;
+}
+
+void Statistics::printReport(QWidget * parent) {
+
+    QPrinter printer(QPrinter::HighResolution);
+#ifdef Q_OS_LINUX
+    printer.setPrinterName("Print to File (PDF)");
+    printer.setOutputFormat(QPrinter::PdfFormat);
+    QString name = "Statistics";
+    QString datestr = QDate::currentDate().toString(Qt::ISODate);
+
+//    if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
+//        name = "Statistics";
+//        datestr = QDate::currentDate().toString(Qt::ISODate);
+//    } else if (ui->tabWidget->currentWidget() == ui->helpTab) {
+//        name = "Help";
+//        datestr = QDateTime::currentDateTime().toString(Qt::ISODate);
+//    } else { name = "Unknown"; }
+
+    QString filename = p_pref->Get("{home}/") + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf";
+
+    printer.setOutputFileName(filename);
+#endif
+    printer.setPrintRange(QPrinter::AllPages);
+//        if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
+//            printer.setOrientation(QPrinter::Landscape);
+//        } else {
+        printer.setOrientation(QPrinter::Portrait);
+    //}
+    printer.setFullPage(false); // This has nothing to do with scaling
+    printer.setNumCopies(1);
+    printer.setResolution(1200);
+    //printer.setPaperSize(QPrinter::A4);
+    //printer.setOutputFormat(QPrinter::PdfFormat);
+    printer.setPageMargins(5, 5, 5, 5, QPrinter::Millimeter);
+    QPrintDialog pdlg(&printer, parent);
+
+    if (pdlg.exec() == QPrintDialog::Accepted) {
+
+            QTextBrowser b;
+            QPainter painter;
+            painter.begin(&printer);
+
+            QRect rect = printer.pageRect();
+            b.setHtml(htmlReportHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter);
+            b.resize(rect.width()/4, rect.height()/4);
+            b.setFrameShape(QFrame::NoFrame);
+
+            double xscale = printer.pageRect().width()/double(b.width());
+            double yscale = printer.pageRect().height()/double(b.height());
+            double scale = qMin(xscale, yscale);
+            painter.translate(printer.paperRect().x() + printer.pageRect().width()/2, printer.paperRect().y() + printer.pageRect().height()/2);
+            painter.scale(scale, scale);
+            painter.translate(-b.width()/2, -b.height()/2);
+
+            b.render(&painter, QPoint(0,0));
+            painter.end();
+
+    }
+}
+
+QString Statistics::UpdateRecordsBox()
 {
     QString html = "<html><head><style type='text/css'>"
                      "p,a,td,body { font-family: '" + QApplication::font().family() + "'; }"
@@ -1473,7 +1540,8 @@ void Statistics::UpdateRecordsBox()
 
 
     html += "</body></html>";
-    mainwin->setRecBoxHTML(html);
+
+    return html;
 }
 
 

oscar/statistics.h

@@ -10,6 +10,7 @@
 #define SUMMARY_H
 
 #include <QObject>
+#include <QMainWindow>
 #include <QHash>
 #include <QList>
 #include "SleepLib/schema.h"
@@ -168,8 +169,11 @@ class Statistics : public QObject
     QString GenerateHTML();
     QString GenerateMachineList();
     QString GenerateRXChanges();
+    QString GenerateCPAPUsage();
 
-    void UpdateRecordsBox();
+    QString UpdateRecordsBox();
+
+    static void printReport(QWidget *parent = nullptr);
 
 
   protected:

oscar/tests/prs1tests.cpp

@@ -100,12 +100,12 @@ void parseAndEmitSessionYaml(const QString & path)
 
         // Run the parser
         PRS1Import* import = dynamic_cast<PRS1Import*>(task);
-        import->ParseSession();
+        bool ok = import->ParseSession();
         
         // Emit the parsed session data to compare against our regression benchmarks
         Session* session = import->session;
         QString outpath = prs1OutputPath(path, m->serial(), session->session(), "-session.yml");
-        SessionToYaml(outpath, session);
+        SessionToYaml(outpath, session, ok);
         
         delete session;
         delete task;
@@ -122,9 +122,21 @@ void PRS1Tests::testSessionsToYaml()
 
 static QString ts(qint64 msecs)
 {
+    // TODO: make this UTC so that tests don't vary by where they're run
     return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
 }
 
+static QString dur(qint64 msecs)
+{
+    qint64 s = msecs / 1000L;
+    int h = s / 3600; s -= h * 3600;
+    int m = s / 60; s -= m * 60;
+    return QString("%1:%2:%3")
+        .arg(h, 2, 10, QChar('0'))
+        .arg(m, 2, 10, QChar('0'))
+        .arg(s, 2, 10, QChar('0'));
+}
+
 static QString byteList(QByteArray data, int limit=-1)
 {
     int count = data.size();
@@ -138,13 +150,12 @@ static QString byteList(QByteArray data, int limit=-1)
     return s;
 }
 
-void ChunkToYaml(QFile & file, PRS1DataChunk* chunk)
+void ChunkToYaml(QTextStream & out, PRS1DataChunk* chunk, bool ok)
 {
-    QTextStream out(&file);
-
     // chunk header
     out << "chunk:" << endl;
     out << "  at: " << hex << chunk->m_filepos << endl;
+    out << "  parsed: " << ok << endl;
     out << "  version: " << dec << chunk->fileVersion << endl;
     out << "  size: " << chunk->blockSize << endl;
     out << "  htype: " << chunk->htype << endl;
@@ -153,6 +164,7 @@ void ChunkToYaml(QFile & file, PRS1DataChunk* chunk)
     out << "  ext: " << chunk->ext << endl;
     out << "  session: " << chunk->sessionid << endl;
     out << "  start: " << ts(chunk->timestamp * 1000L) << endl;
+    out << "  duration: " << dur(chunk->duration * 1000L) << endl;
 
     // hblock for V3 non-waveform chunks
     if (chunk->fileVersion == 3 && chunk->htype == 0) {
@@ -210,7 +222,7 @@ void ChunkToYaml(QFile & file, PRS1DataChunk* chunk)
             }
         }
     }
-    if (dump_data) {
+    if (dump_data || !ok) {
         out << "  data: " << byteList(chunk->m_data, 100) << endl;
     }
     
@@ -256,9 +268,13 @@ void parseAndEmitChunkYaml(const QString & path)
             QFileInfo fi = flist.at(i);
             QString inpath = fi.canonicalFilePath();
             bool ok;
+            
+            if (fi.fileName() == ".DS_Store") {
+                continue;
+            }
 
             QString ext_s = fi.fileName().section(".", -1);
-            ext_s.toInt(&ok);
+            int ext = ext_s.toInt(&ok);
             if (!ok) {
                 // not a numerical extension
                 qWarning() << inpath << "unexpected filename";
@@ -266,7 +282,7 @@ void parseAndEmitChunkYaml(const QString & path)
             }
 
             QString session_s = fi.fileName().section(".", 0, -2);
-            session_s.toInt(&ok, sessionid_base);
+            int sessionid = session_s.toInt(&ok, sessionid_base);
             if (!ok) {
                 // not a numerical session ID
                 qWarning() << inpath << "unexpected filename";
@@ -274,28 +290,36 @@ void parseAndEmitChunkYaml(const QString & path)
             }
             
             // Create the YAML file.
-            QString outpath = prs1OutputPath(path, m->serial(), fi.fileName(), "-chunks.yml");
+            QString suffix = QString(".%1-chunks.yml").arg(ext, 3, 10, QChar('0'));
+            QString outpath = prs1OutputPath(path, m->serial(), sessionid, suffix);
             QFile file(outpath);
             if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
                 qDebug() << outpath;
                 Q_ASSERT(false);
             }
+            QTextStream out(&file);
+
+            // keep only P1234568/Pn/00000000.001
+            QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), QString::SkipEmptyParts);
+            QString relative = pathlist.mid(pathlist.size()-3).join(QDir::separator());
+            out << "file: " << relative << endl;
 
             // Parse the chunks in the file.
             QList<PRS1DataChunk *> chunks = s_loader->ParseFile(inpath);
             for (int i=0; i < chunks.size(); i++) {
                 PRS1DataChunk * chunk = chunks.at(i);
+                bool ok = true;
                 
                 // Parse the inner data.
                 switch (chunk->ext) {
-                    case 0: chunk->ParseCompliance(); break;
+                    case 0: ok = chunk->ParseCompliance(); break;
-                    case 1: chunk->ParseSummary(); break;
+                    case 1: ok = chunk->ParseSummary(); break;
-                    case 2: chunk->ParseEvents(MODE_UNKNOWN); break;
+                    case 2: ok = chunk->ParseEvents(MODE_UNKNOWN); break;
                     default: break;
                 }
                 
                 // Emit the YAML.
-                ChunkToYaml(file, chunk);
+                ChunkToYaml(out, chunk, ok);
                 delete chunk;
             }
             

oscar/tests/sessiontests.cpp

@@ -11,6 +11,7 @@
 
 static QString ts(qint64 msecs)
 {
+    // TODO: make this UTC so that tests don't vary by where they're run
     return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
 }
 
@@ -19,6 +20,17 @@ static QString hex(int i)
     return QString("0x") + QString::number(i, 16).toUpper();
 }
 
+static QString dur(qint64 msecs)
+{
+    qint64 s = msecs / 1000L;
+    int h = s / 3600; s -= h * 3600;
+    int m = s / 60; s -= m * 60;
+    return QString("%1:%2:%3")
+        .arg(h, 2, 10, QChar('0'))
+        .arg(m, 2, 10, QChar('0'))
+        .arg(s, 2, 10, QChar('0'));
+}
+
 #define ENUMSTRING(ENUM) case ENUM: s = #ENUM; break
 static QString eventListTypeName(EventListType t)
 {
@@ -28,7 +40,7 @@ static QString eventListTypeName(EventListType t)
         ENUMSTRING(EVL_Event);
         default:
             s = hex(t);
-            qDebug() << qPrintable(s);
+            qDebug() << "EVL" << qPrintable(s);
     }
     return s;
 }
@@ -76,8 +88,9 @@ static QString settingChannel(ChannelID i)
         CHANNELNAME(PRS1_AutoOff);
         CHANNELNAME(PRS1_MaskAlert);
         CHANNELNAME(PRS1_ShowAHI);
+        CHANNELNAME(CPAP_BrokenSummary);
         s = hex(i);
-        qDebug() << qPrintable(s);
+        qDebug() << "setting channel" << qPrintable(s);
     } while(false);
     return s;
 }
@@ -126,9 +139,8 @@ static QString eventChannel(ChannelID i)
         CHANNELNAME(PRS1_0C);
         CHANNELNAME(PRS1_0E);
         CHANNELNAME(PRS1_15);
-        CHANNELNAME(CPAP_BrokenSummary);
         s = hex(i);
-        qDebug() << qPrintable(s);
+        qDebug() << "event channel" << qPrintable(s);
     } while(false);
     return s;
 }
@@ -157,7 +169,7 @@ static QString intList(quint32* data, int count, int limit=-1)
     return s;
 }
 
-void SessionToYaml(QString filepath, Session* session)
+void SessionToYaml(QString filepath, Session* session, bool ok)
 {
     QFile file(filepath);
     if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
@@ -170,6 +182,27 @@ void SessionToYaml(QString filepath, Session* session)
     out << "  id: " << session->session() << endl;
     out << "  start: " << ts(session->first()) << endl;
     out << "  end: " << ts(session->last()) << endl;
+    out << "  valid: " << ok << endl;
+    
+    if (!session->m_slices.isEmpty()) {
+        out << "  slices:" << endl;
+        for (auto & slice : session->m_slices) {
+            QString s;
+            switch (slice.status) {
+            case MaskOn: s = "mask on"; break;
+            case MaskOff: s = "mask off"; break;
+            case EquipmentOff: s = "equipment off"; break;
+            default: s = "unknown"; break;
+            }
+            out << "  - status: " << s << endl;
+            out << "    start: " << ts(slice.start) << endl;
+            out << "    end: " << ts(slice.end) << endl;
+        }
+    }
+    Day day;
+    day.addSession(session);
+    out << "  total_time: " << dur(day.total_time()) << endl;
+    day.removeSession(session);
 
     out << "  settings:" << endl;
 
@@ -198,13 +231,23 @@ void SessionToYaml(QString filepath, Session* session)
         // Note that this is a vector of lists
         QVector<EventList *> &ev = session->eventlist[*key];
         int ev_size = ev.size();
+        if (ev_size == 0) {
+            continue;
+        }
+        EventList &e = *ev[0];
         
-        // TODO: See what this actually signifies. Some waveform data seems to have to multiple event lists,
+        // Multiple eventlists in a channel are used to account for discontiguous data.
-        // which might reflect blocks within the original files, or something else.
+        // See CoalesceWaveformChunks for the coalescing of multiple contiguous waveform
-        if (ev_size > 2) qDebug() << session->session() << eventChannel(*key) << "ev_size =" << ev_size;
+        // chunks and ParseWaveforms/ParseOximetry for the creation of eventlists per
+        // coalesced chunk.
+        //
+        // TODO: Is this only for waveform data?
+        if (ev_size > 1 && e.type() != EVL_Waveform) {
+            qWarning() << session->session() << eventChannel(*key) << "ev_size =" << ev_size;
+        }
 
         for (int j = 0; j < ev_size; j++) {
-            EventList &e = *ev[j];
+            e = *ev[j];
             out << "    - count: "  << (qint32)e.count() << endl;
             if (e.count() == 0)
                 continue;

oscar/tests/sessiontests.h

@@ -11,6 +11,6 @@
 
 #include "../SleepLib/session.h"
 
-void SessionToYaml(QString filepath, Session* session);
+void SessionToYaml(QString filepath, Session* session, bool ok);
 
 #endif // SESSIONTESTS_H