diff --git a/Building/MacOS/BUILD-mac.md b/Building/MacOS/BUILD-mac.md index 0b43b014..b9d71fe0 100644 --- a/Building/MacOS/BUILD-mac.md +++ b/Building/MacOS/BUILD-mac.md @@ -63,7 +63,7 @@ NOTE: Official builds are currently made with [macOS 10.14 Mojave] and Command-L 2. (Optional) Package for distribution: - ~/Qt5.12.5/5.12.5/clang_64/bin/macdeployqt OSCAR.app -dmg + make dist-mac The dmg is at OSCAR.dmg. @@ -77,17 +77,13 @@ NOTE: Official builds are currently made with [macOS 10.14 Mojave] and Command-L 3. Click to expand "Details" for the **qmake** build step. 4. Uncheck "Enable Qt Quick Compiler", click "No" to defer recompiling. 4. Configure packaging for distribution: - 1. Copy the "Build directory" path from the **Build Settings** panel above. (Default is "/Users/build/OSCAR-code/build-oscar-Desktop_Qt_5_12_5_clang_64bit-Release") - 2. Tools > External > Configure... - 3. Select "Add Tool" from the "Add" drop-down menu near the bottom of the window. - 4. Set the name to "Deploy". - 5. Set the Description to "Creates a distributable .dmg". - 6. Set the Executable to the full path where you installed Qt: "/Users/build/Qt5.12.5/5.12.5/clang_64/bin/macdeployqt". - 7. Set the Arguments to "OSCAR.app -dmg". - 8. Set the working directory to the build directory path copied in step 1. - 9. Click OK. -5. To compile, select Build > Build Project "oscar". The application is in OSCAR.app. -6. To create a .dmg, select Tools > External > Deploy. The dmg is at OSCAR.dmg. + 1. Click "Clone..." to the right of the "Edit build configuration" drop-down menu. + 2. Name the new configuration "Deploy". + 3. Click to expand "Details" for the **Make** build step. + 4. Set the Make arguments for the Make step to "dist-mac". +5. To build OSCAR, select "Release" from the "oscar" button in the left panel. Then select Build > Build Project "oscar". The application is in OSCAR.app. +6. To build OSCAR and package for distribution, select "Deploy" from the "oscar" button in the left panel. Then select Build > Build Project "oscar". The dmg is at OSCAR.dmg. + * Progress in "Compile Output" will pause for several seconds while "Creating .dmg". This is normal. [Qt 5.12.5]: http://download.qt.io/archive/qt/5.12/5.12.5/qt-opensource-mac-x64-5.12.5.dmg [macOS 10.14 Mojave]: https://apps.apple.com/us/app/macos-mojave/id1398502828?ls=1&mt=12 diff --git a/Building/MacOS/README.rtfd/Oscar-mac-2-open-applications-folder.jpg b/Building/MacOS/README.rtfd/Oscar-mac-2-open-applications-folder.jpg new file mode 100644 index 00000000..9fefe690 Binary files /dev/null and b/Building/MacOS/README.rtfd/Oscar-mac-2-open-applications-folder.jpg differ diff --git a/Building/MacOS/README.rtfd/Oscar-mac-3-opened-applications-folder.jpg b/Building/MacOS/README.rtfd/Oscar-mac-3-opened-applications-folder.jpg new file mode 100644 index 00000000..dff709a4 Binary files /dev/null and b/Building/MacOS/README.rtfd/Oscar-mac-3-opened-applications-folder.jpg differ diff --git a/Building/MacOS/README.rtfd/Oscar-mac-4-click.jpg b/Building/MacOS/README.rtfd/Oscar-mac-4-click.jpg new file mode 100644 index 00000000..ce4812b6 Binary files /dev/null and b/Building/MacOS/README.rtfd/Oscar-mac-4-click.jpg differ diff --git a/Building/MacOS/README.rtfd/Oscar-mac-5-drag.jpg b/Building/MacOS/README.rtfd/Oscar-mac-5-drag.jpg new file mode 100644 index 00000000..c2e29cd3 Binary files /dev/null and b/Building/MacOS/README.rtfd/Oscar-mac-5-drag.jpg differ diff --git a/Building/MacOS/README.rtfd/Oscar-mac-6-right-click-open.jpg b/Building/MacOS/README.rtfd/Oscar-mac-6-right-click-open.jpg new file mode 100644 index 00000000..e9ea6111 Binary files /dev/null and b/Building/MacOS/README.rtfd/Oscar-mac-6-right-click-open.jpg differ diff --git a/Building/MacOS/README.rtfd/Oscar-mac-7-open-confirm-with-cursor.jpg b/Building/MacOS/README.rtfd/Oscar-mac-7-open-confirm-with-cursor.jpg new file mode 100644 index 00000000..e44ee769 Binary files /dev/null and b/Building/MacOS/README.rtfd/Oscar-mac-7-open-confirm-with-cursor.jpg differ diff --git a/Building/MacOS/README.rtfd/Oscar-mac-8-open-error.jpg b/Building/MacOS/README.rtfd/Oscar-mac-8-open-error.jpg new file mode 100644 index 00000000..bcce7e92 Binary files /dev/null and b/Building/MacOS/README.rtfd/Oscar-mac-8-open-error.jpg differ diff --git a/Building/MacOS/README.rtfd/TXT.rtf b/Building/MacOS/README.rtfd/TXT.rtf new file mode 100644 index 00000000..0e2a458d --- /dev/null +++ b/Building/MacOS/README.rtfd/TXT.rtf @@ -0,0 +1,69 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf840 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red28\green28\blue28;\red255\green255\blue255;\red9\green47\blue157; +\red10\green0\blue109;\red0\green0\blue0;} +{\*\expandedcolortbl;;\cssrgb\c14510\c14510\c14510;\cssrgb\c100000\c100000\c100000;\cssrgb\c2353\c27059\c67843; +\cssrgb\c4314\c0\c50196;\csgenericrgb\c0\c0\c0;} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1} +{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid101\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{upper-alpha\}.}{\leveltext\leveltemplateid102\'02\'01.;}{\levelnumbers\'01;}\fi-360\li1440\lin1440 }{\listname ;}\listid2} +{\list\listtemplateid3\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid201\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid3}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}} +\margl1440\margr1440\vieww19380\viewh16080\viewkind0 +\deftab720 +\pard\pardeftab720\partightenfactor0 + +\f0\b\fs33\fsmilli16800 \cf2 \cb3 \expnd0\expndtw0\kerning0 +System requirements\ +\cf0 \cb1 \ +\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0 +\ls1\ilvl0 +\b0\fs28 \cf2 \cb3 \kerning1\expnd0\expndtw0 {\listtext \'95 }\expnd0\expndtw0\kerning0 +MacOSX 10.12 or later.\cb1 \ +\pard\pardeftab720\partightenfactor0 + +\b\fs33\fsmilli16800 \cf2 \cb3 \ +\ +Installation\ +\pard\pardeftab720\partightenfactor0 + +\b0\fs28 \cf2 \cb1 \ +\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0 +\ls2\ilvl0\cf2 \cb3 \kerning1\expnd0\expndtw0 {\listtext 1. }\expnd0\expndtw0\kerning0 +To install OSCAR, you need to copy it to the Applications folder on your computer. To do so:\uc0\u8232 \cb1 \ +\pard\tx940\tx1440\pardeftab720\li1440\fi-1440\partightenfactor0 +\ls2\ilvl1\cf2 \cb3 \kerning1\expnd0\expndtw0 {\listtext A. }\expnd0\expndtw0\kerning0 +Open the Applications folder in Finder by selecting the "Go" menu and then "Applications": \uc0\u8232 \u8232 \cf4 \cb1 {{\NeXTGraphic Oscar-mac-2-open-applications-folder.jpg \width9620 \height8140 \noorient +}¬}\cf2 \uc0\u8232 \u8232 \cf4 {{\NeXTGraphic Oscar-mac-3-opened-applications-folder.jpg \width17640 \height10960 \noorient +}¬}\cf2 \uc0\u8232 \ +\ls2\ilvl1\cb3 \kerning1\expnd0\expndtw0 {\listtext B. }\expnd0\expndtw0\kerning0 +Arrange the windows so that you can see the OSCAR icon and the Applications folder, as shown below.\uc0\u8232 \cb1 \ +\ls2\ilvl1\cb3 \kerning1\expnd0\expndtw0 {\listtext C. }\expnd0\expndtw0\kerning0 +Click on the OSCAR icon and drag it into the Applications window. Note the green "+" cursor indicating that it will be copied to this location when you unclick: \cf4 \cb1 {{\NeXTGraphic Oscar-mac-4-click.jpg \width18520 \height12920 \noorient +}¬}\cf2 \uc0\u8232 \u8232 \cf4 {{\NeXTGraphic Oscar-mac-5-drag.jpg \width18520 \height12920 \noorient +}¬}\cf2 \uc0\u8232 \ +\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0 +\ls2\ilvl0\cf2 \cb3 \kerning1\expnd0\expndtw0 {\listtext 2. }\expnd0\expndtw0\kerning0 +To launch OSCAR for the first time, you will need to grant it permission, otherwise you will receive an error that it "can't be opened because it is from an unidentified developer." To grant OSCAR permission to run:\uc0\u8232 \cb1 \ +\pard\tx940\tx1440\pardeftab720\li1440\fi-1440\partightenfactor0 +\ls2\ilvl1\cf2 \cb3 \kerning1\expnd0\expndtw0 {\listtext A. }\expnd0\expndtw0\kerning0 +Hold down the "control" key on your keyboard and click on the new OSCAR icon in the Applications folder. Select "open" from the menu that will appear: \cf4 \cb1 {{\NeXTGraphic Oscar-mac-6-right-click-open.jpg \width18520 \height13460 \noorient +}¬}\cf2 \uc0\u8232 \ +\ls2\ilvl1\cb3 \kerning1\expnd0\expndtw0 {\listtext B. }\expnd0\expndtw0\kerning0 +A window will appear advising you that "OSCAR is from an unidentified developer" and asking if you want to run it. Click "Open" to grant it permission: \uc0\u8232 \cf5 \cb1 {{\NeXTGraphic Oscar-mac-7-open-confirm-with-cursor.jpg \width10640 \height6220 \noorient +}¬}\cf2 \uc0\u8232 \u8232 \cb3 You will only need to do this the first time you run OSCAR after installing any new version.\cb1 \ +\pard\pardeftab720\partightenfactor0 + +\b\fs33\fsmilli16800 \cf2 \cb3 \ +\ +Troubleshooting\ +\cf0 \cb1 \ +\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0 +\ls3\ilvl0 +\b0\fs28 \cf2 \cb3 \kerning1\expnd0\expndtw0 {\listtext \'95 }\expnd0\expndtw0\kerning0 +Help, I'm getting the following error! \uc0\u8232 \cf5 \cb1 {{\NeXTGraphic Oscar-mac-8-open-error.jpg \width10640 \height6220 \noorient +}¬}\cf2 \uc0\u8232 \u8232 \cf6 \cb3 This can happen after installing a new version of OSCAR. Open the Applications folder as shown in step 1 above and then see step 2 above to grant OSCAR permission to run.\ +\pard\tx720\pardeftab720\partightenfactor0 +\cf2 \ +\ +The most up-to-date version of these instructions can be found at {\field{\*\fldinst{HYPERLINK "http://www.apneaboard.com/wiki/index.php/OSCAR_Installation:_Apple_Mac"}}{\fldrslt http://www.apneaboard.com/wiki/index.php/OSCAR_Installation:_Apple_Mac}}.\ +} \ No newline at end of file diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 1bfb11a0..03e0cc79 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib PRS1 Loader Implementation * - * Copyright (c) 2019 The OSCAR Team + * Copyright (c) 2019-2020 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -197,12 +197,25 @@ static QString ts(qint64 msecs) } -// TODO: have UNEXPECTED_VALUE set a flag in the importer/machine that this data set is unusual -#define UNEXPECTED_VALUE(SRC, VALS) { qWarning() << this->sessionid << QString("%1: %2 = %3 != %4").arg(__func__).arg(#SRC).arg(SRC).arg(VALS); } +// TODO: See the LogUnexpectedMessage TODO about generalizing this for other loaders. +// Right now this macro assumes that it's called within a method that has a "loader" member +// that points to the PRS1Loader* instance that's calling it. +#define UNEXPECTED_VALUE(SRC, VALS) { \ + QString message = QString("%1:%2: %3 = %4 != %5").arg(__func__).arg(__LINE__).arg(#SRC).arg(SRC).arg(VALS); \ + qWarning() << this->sessionid << message; \ + loader->LogUnexpectedMessage(message); \ + } #define CHECK_VALUE(SRC, VAL) if ((SRC) != (VAL)) UNEXPECTED_VALUE(SRC, VAL) #define CHECK_VALUES(SRC, VAL1, VAL2) if ((SRC) != (VAL1) && (SRC) != (VAL2)) UNEXPECTED_VALUE(SRC, #VAL1 " or " #VAL2) // for more than 2 values, just write the test manually and use UNEXPECTED_VALUE if it fails +void PRS1Loader::LogUnexpectedMessage(const QString & message) +{ + m_importMutex.lock(); + m_unexpectedMessages += message; + m_importMutex.unlock(); +} + enum FlexMode { FLEX_None, FLEX_CFlex, FLEX_CFlexPlus, FLEX_AFlex, FLEX_RiseTime, FLEX_BiFlex, FLEX_AVAPS, FLEX_PFlex, FLEX_Unknown }; @@ -696,7 +709,6 @@ int PRS1Loader::OpenMachine(const QString & path) ScanFiles(paths, sessionid_base, m); int tasks = countTasks(); - unknownCodes.clear(); emit updateMessage(QObject::tr("Importing Sessions...")); QCoreApplication::processEvents(); @@ -708,16 +720,22 @@ int PRS1Loader::OpenMachine(const QString & path) finishAddingSessions(); - if (unknownCodes.size() > 0) { - for (auto it = unknownCodes.begin(), end=unknownCodes.end(); it != end; ++it) { - qDebug() << QString("Unknown CPAP Codes '0x%1' was detected during import").arg((short)it.key(), 2, 16, QChar(0)); - QStringList & strlist = it.value(); - for (int i=0;i 0 && p_profile->session->warnOnUnexpectedData()) { + // Compare this to the list of messages previously seen for this machine + // and only alert if there are new ones. + QSet newMessages = m_unexpectedMessages - m->previouslySeenUnexpectedData(); + if (newMessages.count() > 0) { + // TODO: Rework the importer call structure so that this can become an + // emit statement to the appropriate import job. + QMessageBox::information(QApplication::activeWindow(), + QObject::tr("Untested Data"), + QObject::tr("Your Philips Respironics %1 (%2) generated data that OSCAR has never seen before.").arg(m->getInfo().model).arg(m->getInfo().modelnumber) +"\n\n"+ + QObject::tr("The imported data may not be entirely accurate, so the developers would like a .zip copy of this machine's SD card and matching Encore .pdf reports to make sure OSCAR is handling the data correctly.") + ,QMessageBox::Ok); + m->previouslySeenUnexpectedData() += newMessages; } } - + return m->unsupported() ? -1 : tasks; } @@ -799,17 +817,21 @@ Machine* PRS1Loader::CreateMachineFromProperties(QString propertyfile) // This time supply the machine object so it can populate machine properties.. PeekProperties(m->info, propertyfile, m); - if (!m->untested() && !s_PRS1ModelInfo.IsTested(props)) { - m->setUntested(true); + if (!s_PRS1ModelInfo.IsTested(props)) { qDebug() << info.modelnumber << "untested"; + if (p_profile->session->warnOnUntestedMachine() && m->warnOnUntested()) { + m->suppressWarnOnUntested(); // don't warn the user more than once #ifndef UNITTEST_MODE - QMessageBox::information(QApplication::activeWindow(), + // TODO: Rework the importer call structure so that this can become an + // emit statement to the appropriate import job. + QMessageBox::information(QApplication::activeWindow(), QObject::tr("Machine Untested"), QObject::tr("Your Philips Respironics CPAP machine (Model %1) has not been tested yet.").arg(info.modelnumber) +"\n\n"+ QObject::tr("It seems similar enough to other machines that it might work, but the developers would like a .zip copy of this machine's SD card and matching Encore .pdf reports to make sure it works with OSCAR.") ,QMessageBox::Ok); #endif + } } // Mark the machine in the profile as unsupported. @@ -858,6 +880,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin sesstasks.clear(); new_sessions.clear(); // this hash is used by OpenFile + m_unexpectedMessages.clear(); PRS1Import * task = nullptr; @@ -1127,6 +1150,7 @@ enum PRS1ParsedEventType EV_PRS1_APNEA_ALARM, EV_PRS1_LOW_MV_ALARM, EV_PRS1_SNORES_AT_PRESSURE, + EV_PRS1_INTERVAL_BOUNDARY, // An artificial internal-only event used to separate stat intervals }; enum PRS1ParsedEventUnit @@ -1221,6 +1245,22 @@ public: }; +class PRS1IntervalBoundaryEvent : public PRS1ParsedEvent +{ +public: + virtual QMap contents(void) + { + QMap out; + out["start"] = timeStr(m_start); + return out; + } + + static const PRS1ParsedEventType TYPE = EV_PRS1_INTERVAL_BOUNDARY; + + PRS1IntervalBoundaryEvent(int start) : PRS1ParsedEvent(TYPE, start) {} +}; + + class PRS1ParsedDurationEvent : public PRS1ParsedEvent { public: @@ -1654,6 +1694,7 @@ static QString parsedEventTypeName(PRS1ParsedEventType t) ENUMSTRING(EV_PRS1_APNEA_ALARM); ENUMSTRING(EV_PRS1_LOW_MV_ALARM); ENUMSTRING(EV_PRS1_SNORES_AT_PRESSURE); + ENUMSTRING(EV_PRS1_INTERVAL_BOUNDARY); default: s = hex(t); qDebug() << "Unknown PRS1ParsedEventType type:" << qPrintable(s); @@ -1896,6 +1937,7 @@ bool PRS1DataChunk::ParseEventsF5V3(void) this->AddEvent(new PRS1SnoreEvent(t, data[pos+8])); // 08=Snore count // TODO: not a VS on official waveform, but appears in flags and contributes to overall VS index this->AddEvent(new PRS1EPAPAverageEvent(t, data[pos+9], GAIN)); // 09=EPAP average this->AddEvent(new PRS1LeakEvent(t, data[pos+0xa])); // 0A=Leak (average?) + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); break; case 0x04: // Pressure Pulse duration = data[pos]; // TODO: is this a duration? @@ -2133,6 +2175,7 @@ bool PRS1DataChunk::ParseEventsF5V0(void) this->AddEvent(new PRS1TidalVolumeEvent(t, data[pos+7])); // 07=Tidal Volume (average?) this->AddEvent(new PRS1SnoreEvent(t, data[pos+8])); // 08=Snore count // TODO: not a VS on official waveform, but appears in flags and contributes to overall VS index this->AddEvent(new PRS1EPAPAverageEvent(t, data[pos+9])); // 09=EPAP average + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); break; default: DUMP_EVENT(); @@ -2303,6 +2346,7 @@ bool PRS1DataChunk::ParseEventsF5V1(void) this->AddEvent(new PRS1SnoreEvent(t, data[pos+8])); // 08=Snore count // TODO: not a VS on official waveform, but appears in flags and contributes to overall VS index this->AddEvent(new PRS1EPAPAverageEvent(t, data[pos+9])); // 09=EPAP average this->AddEvent(new PRS1LeakEvent(t, data[pos+0xa])); // 0A=Leak (average?) new to F5V1 (originally found in F5V3) + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); break; default: DUMP_EVENT(); @@ -2531,6 +2575,7 @@ bool PRS1DataChunk::ParseEventsF5V2(void) this->AddEvent(new PRS1SnoreEvent(t, data[pos+8])); // 08=Snore count // TODO: not a VS on official waveform, but appears in flags and contributes to overall VS index this->AddEvent(new PRS1EPAPAverageEvent(t, data[pos+9], GAIN)); // 09=EPAP average this->AddEvent(new PRS1LeakEvent(t, data[pos+0xa])); // 0A=Leak (average?) new to F5V1 (originally found in F5V3) + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); break; /* case 0x0f: @@ -2673,6 +2718,8 @@ bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t) if (!m_currentSliceInitialized) { m_currentSliceInitialized = true; m_currentSlice = m_slices.constBegin(); + m_lastIntervalEvents.clear(); // there was no previous slice, so there are no pending end-of-slice events + m_lastIntervalEnd = 0; updated = true; } @@ -2687,10 +2734,15 @@ bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t) } } + if (updated) { + // Write out any pending end-of-slice events. + FinishSlice(); + } + if (updated && (*m_currentSlice).status == MaskOn) { - // Set the interval start/end times based on the new slice's start time. - m_statIntervalStart = (*m_currentSlice).start; - m_statIntervalEnd = m_statIntervalStart; + // Set the interval start times based on the new slice's start time. + m_statIntervalStart = 0; + StartNewInterval((*m_currentSlice).start); // Create a new eventlist for this new slice, to allow for a gap in the data between slices. CreateEventChannels(chunk); @@ -2700,6 +2752,40 @@ bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t) } +void PRS1Import::FinishSlice() +{ + qint64 t = m_lastIntervalEnd; // end of the slice (at least of its interval data) + + // If the most recently recorded interval stats aren't at the end of the slice, + // import additional events marking the end of the data. + if (t != m_prevIntervalStart) { + // Make sure to use the same pressure used to import the original events, + // otherwise calculated channels (such as PS or LEAK) will be wrong. + EventDataType orig_pressure = m_currentPressure; + m_currentPressure = m_intervalPressure; + + // Import duplicates of each event with the end-of-slice timestamp. + for (auto & e : m_lastIntervalEvents) { + ImportEvent(t, e); + } + + // Restore the current pressure. + m_currentPressure = orig_pressure; + } + m_lastIntervalEvents.clear(); +} + + +void PRS1Import::StartNewInterval(qint64 t) +{ + if (t == m_prevIntervalStart) { + qWarning() << sessionid << "Multiple zero-length intervals at end of slice?"; + } + m_prevIntervalStart = m_statIntervalStart; + m_statIntervalStart = t; +} + + bool PRS1Import::IsIntervalEvent(PRS1ParsedEvent* e) { bool intervalEvent = false; @@ -2793,21 +2879,27 @@ bool PRS1Import::ImportEventChunk(PRS1DataChunk* event) continue; } + if (e->m_type == PRS1IntervalBoundaryEvent::TYPE) { + StartNewInterval(t); + continue; // these internal pseudo-events don't get imported + } + bool intervalEvent = IsIntervalEvent(e); qint64 interval_end_t = 0; if (intervalEvent) { - // Calculate the start timetamp for the interval described by this event. - if (t != m_statIntervalEnd) { - // When we encounter the first event of a series of stats (as identified by a new timestamp), - // check whether the previous interval ended within the current slice. (Check the timestamp + 1 - // since intervals can't start at the end of a slice, in contrast to regular (instantaneous) - // events below.) - if (!UpdateCurrentSlice(event, m_statIntervalEnd + 1)) { - // If so, simply advance the interval to start where the previous one ended. - m_statIntervalStart = m_statIntervalEnd; - // (otherwise UpdateCurrentSlice will have set it to the slice start time.) - } - m_statIntervalEnd = t; + // Deal with statistics that are reported at the end of an interval, but which need to be imported + // at the start of the interval. + + if (event->family == 3 && event->familyVersion == 3) { + // In F3V3, each slice has its own chunk, so the initial call to UpdateCurrentSlice() + // for this chunk is all that's needed. + // + // We can't just call it again here for simplicity, since the timestamps of F3V3 stat events + // can go past the end of the slice. + } else { + // For all other machines, the event's time stamp will be within bounds of its slice, so + // we can use it to find the current slice. + UpdateCurrentSlice(event, t); } // Clamp this interval's end time to the end of the slice. interval_end_t = min(t, (*m_currentSlice).end); @@ -2832,6 +2924,7 @@ bool PRS1Import::ImportEventChunk(PRS1DataChunk* event) } } + // Import the event. switch (e->m_type) { // F3V3 doesn't have individual HY/CA/OA events, only counts every 2 minutes, where // nonzero counts show up as overview flags. Currently OSCAR doesn't have a way to @@ -2868,14 +2961,29 @@ bool PRS1Import::ImportEventChunk(PRS1DataChunk* event) default: ImportEvent(t, e); - // If this interval event is reported at the end of the slice, import an additional event - // marking the end of the data. (The above import marks the beginning of the interval.) - if (intervalEvent && interval_end_t == (*m_currentSlice).end) { - ImportEvent(interval_end_t, e); + + // Cache the most recently imported interval events so that we can import duplicate end-of-slice events if needed. + // We can't write them here because we don't yet know if they're the last in the slice. + if (intervalEvent) { + // Reset the list of pending events when we encounter a stat event in a new interval. + // + // This logic has grown sufficiently complex that it may eventually be worth encapsulating + // each batch of parsed interval events into a composite interval event when parsing, + // rather than requiring timestamp-based gymnastics to infer that structure on import. + if (m_lastIntervalEnd != interval_end_t) { + m_lastIntervalEvents.clear(); + m_lastIntervalEnd = interval_end_t; + m_intervalPressure = m_currentPressure; + } + // The events need to be in order so that any dynamically calculated channels (such as PS) are properly computed. + m_lastIntervalEvents.append(e); } break; } } + + // Write out any pending end-of-slice events. + FinishSlice(); if (!ok) { return false; @@ -3118,6 +3226,7 @@ bool PRS1DataChunk::ParseEventsF3V6(void) this->AddEvent(new PRS1Test1Event(t, data[pos+9])); // 09=TMV??? this->AddEvent(new PRS1SnoreEvent(t, data[pos+0xa])); // 0A=Snore count // TODO: not a VS on official waveform, but appears in flags and contributes to overall VS index this->AddEvent(new PRS1LeakEvent(t, data[pos+0xb])); // 0B=Leak (average?) + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); break; case 0x03: // Pressure Pulse duration = data[pos]; // TODO: is this a duration? @@ -3265,6 +3374,7 @@ bool PRS1DataChunk::ParseEventsF3V3(void) this->AddEvent(new PRS1ClearAirwayCount(t, h[13])); // count of clear airway events this->AddEvent(new PRS1ObstructiveApneaCount(t, h[14])); // count of obstructive events this->AddEvent(new PRS1LeakEvent(t, h[15])); + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); h += record_size; } @@ -3508,6 +3618,7 @@ bool PRS1DataChunk::ParseEventsF0V23() case 0x11: // Statistics this->AddEvent(new PRS1TotalLeakEvent(t, data[pos])); this->AddEvent(new PRS1SnoreEvent(t, data[pos+1])); + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); break; case 0x12: // Snore count per pressure // Some sessions (with lots of ramps) have multiple of these, each with a @@ -3709,6 +3820,7 @@ bool PRS1DataChunk::ParseEventsF0V4() this->AddEvent(new PRS1PressureAverageEvent(t, data[pos+2])); // TODO: The original code also handled the above differently for different modes. It looks like it ignored the // value for Auto-BiLevel. + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); break; case 0x12: // Snore count per pressure // Some sessions (with lots of ramps) have multiple of these, each with a @@ -3920,6 +4032,7 @@ bool PRS1DataChunk::ParseEventsF0V6() // TODO: See F0V4 comments, this may be average EPAP with pressure relief. // We should look carefully at what that means for bilevel, both fixed and auto. this->AddEvent(new PRS1PressureAverageEvent(t, data[pos+2])); + this->AddEvent(new PRS1IntervalBoundaryEvent(t)); break; case 0x12: // Snore count per pressure // Some sessions (with lots of ramps) have multiple of these, each with a @@ -7521,7 +7634,7 @@ QList PRS1Loader::ParseFile(const QString & path) int firstsession = 0; do { - chunk = PRS1DataChunk::ParseNext(f); + chunk = PRS1DataChunk::ParseNext(f, this); if (chunk == nullptr) { break; } @@ -7574,7 +7687,7 @@ QList PRS1Loader::ParseFile(const QString & path) } -PRS1DataChunk::PRS1DataChunk(QFile & f) +PRS1DataChunk::PRS1DataChunk(QFile & f, PRS1Loader* in_loader) : loader(in_loader) { m_path = QFileInfo(f).canonicalFilePath(); } @@ -7588,10 +7701,10 @@ PRS1DataChunk::~PRS1DataChunk() } -PRS1DataChunk* PRS1DataChunk::ParseNext(QFile & f) +PRS1DataChunk* PRS1DataChunk::ParseNext(QFile & f, PRS1Loader* loader) { PRS1DataChunk* out_chunk = nullptr; - PRS1DataChunk* chunk = new PRS1DataChunk(f); + PRS1DataChunk* chunk = new PRS1DataChunk(f, loader); do { // Parse the header and calculate its checksum. diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h index d6e32500..033fa2be 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.h +++ b/oscar/SleepLib/loader_plugins/prs1_loader.h @@ -1,6 +1,6 @@ /* SleepLib PRS1 Loader Header * - * Copyright (c) 2019 The OSCAR Team + * Copyright (c) 2019-2020 The OSCAR Team * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -60,8 +60,8 @@ struct PRS1Waveform { * \brief Representing a chunk of event/summary/waveform data after the header is parsed. */ class PRS1DataChunk { - friend class PRS1DataGroup; public: + /* PRS1DataChunk() { fileVersion = 0; blockSize = 0; @@ -77,7 +77,8 @@ public: m_filepos = -1; m_index = -1; } - PRS1DataChunk(class QFile & f); + */ + PRS1DataChunk(class QFile & f, class PRS1Loader* loader); ~PRS1DataChunk(); inline int size() const { return m_data.size(); } @@ -123,7 +124,7 @@ public: inline quint64 hash(void) const { return ((((quint64) this->calcCrc) << 32) | this->timestamp); } //! \brief Parse and return the next chunk from a PRS1 file - static PRS1DataChunk* ParseNext(class QFile & f); + static PRS1DataChunk* ParseNext(class QFile & f, class PRS1Loader* loader); //! \brief Read and parse the next chunk header from a PRS1 file bool ReadHeader(class QFile & f); @@ -213,6 +214,8 @@ public: bool ParseEventsF5V3(void); protected: + class PRS1Loader* loader; + //! \brief Add a parsed event to the chunk void AddEvent(class PRS1ParsedEvent* event); @@ -345,8 +348,15 @@ protected: bool UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t); bool m_currentSliceInitialized; QVector::const_iterator m_currentSlice; - qint64 m_statIntervalStart, m_statIntervalEnd; + qint64 m_statIntervalStart, m_prevIntervalStart; + QList m_lastIntervalEvents; + qint64 m_lastIntervalEnd; + EventDataType m_intervalPressure; + //! \brief Write out any pending end-of-slice events. + void FinishSlice(); + //! \brief Record the beginning timestamp of a new stat interval, and do related housekeeping. + void StartNewInterval(qint64 t); //! \brief Identify statistical events that are reported at the end of an interval. bool IsIntervalEvent(PRS1ParsedEvent* e); @@ -422,7 +432,6 @@ class PRS1Loader : public CPAPLoader QHash sesstasks; - QMap unknownCodes; protected: QString last; @@ -459,6 +468,16 @@ class PRS1Loader : public CPAPLoader //! \brief PRS1 Data files can store multiple sessions, so store them in this list for later processing. QHash new_sessions; + + // TODO: This really belongs in a generic location that all loaders can use. + // But that will require retooling the overall call structure so that there's + // a top-level import job that's managing a specific import. Right now it's + // essentially managed by the importCPAP method rather than an object instance + // with state. + QMutex m_importMutex; + QSet m_unexpectedMessages; +public: + void LogUnexpectedMessage(const QString & message); }; diff --git a/oscar/SleepLib/machine.cpp b/oscar/SleepLib/machine.cpp index 7ecf542f..6320f097 100644 --- a/oscar/SleepLib/machine.cpp +++ b/oscar/SleepLib/machine.cpp @@ -88,7 +88,10 @@ Machine::Machine(Profile *_profile, MachineID id) : profile(_profile) day.clear(); highest_sessionid = 0; m_unsupported = false; - m_untested = false; + m_suppressUntestedWarning = false; + // TODO: Have the machine write m_suppressUntestedWarning and m_previousUnexpected + // to XML (along with the current OSCAR version number) so that they persist across + // application launches (but reset with each new OSCAR version). if (!id) { srand(time(nullptr)); diff --git a/oscar/SleepLib/machine.h b/oscar/SleepLib/machine.h index f6610b19..fb1cdda3 100644 --- a/oscar/SleepLib/machine.h +++ b/oscar/SleepLib/machine.h @@ -179,8 +179,9 @@ class Machine bool unsupported() { return m_unsupported; } void setUnsupported(bool b) { m_unsupported = b; } - bool untested() { return m_untested; } - void setUntested(bool b) { m_untested = b; } + bool warnOnUntested() { return m_suppressUntestedWarning == false; } + void suppressWarnOnUntested() { m_suppressUntestedWarning = true; } + QSet & previouslySeenUnexpectedData() { return m_previousUnexpected; } inline MachineType type() const { return info.type; } inline QString brand() const { return info.brand; } @@ -249,7 +250,8 @@ class Machine MachineInfo info; bool m_unsupported; - bool m_untested; + bool m_suppressUntestedWarning; + QSet m_previousUnexpected; //! \brief Contains a secondary index of day data, containing just this machines sessions QMap day; diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index 25f651fb..d2f61b91 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -61,6 +61,16 @@ Profile::Profile(QString path) Set(STR_GEN_DataFolder, QString("{home}/Profiles/{UserName}")); + // Reset import warnings when running a new version of OSCAR + init(STR_PREF_VersionString, VersionString); + QString prefVersion = (*this)[STR_PREF_VersionString].toString(); + if (prefVersion != VersionString) { + qDebug() << " Resetting import warnings: version" << prefVersion << "to" << VersionString; + Set(STR_PREF_VersionString, VersionString); + this->Erase(STR_IS_WarnOnUntestedMachine); + this->Erase(STR_IS_WarnOnUnexpectedData); + } + doctor = new DoctorInfo(this); user = new UserInfo(this); cpap = new CPAPSettings(this); diff --git a/oscar/SleepLib/profiles.h b/oscar/SleepLib/profiles.h index 706dd766..96bbf116 100644 --- a/oscar/SleepLib/profiles.h +++ b/oscar/SleepLib/profiles.h @@ -350,6 +350,8 @@ const QString STR_IS_CompressSessionData = "CompressSessionData"; const QString STR_IS_IgnoreOlderSessions = "IgnoreOlderSessions"; const QString STR_IS_IgnoreOlderSessionsDate = "IgnoreOlderSessionsDate"; const QString STR_IS_LockSummarySessions = "LockSummarySessions"; +const QString STR_IS_WarnOnUntestedMachine = "WarnOnUntestedMachine"; +const QString STR_IS_WarnOnUnexpectedData = "WarnOnUnexpectedData"; // UserSettings Strings @@ -653,6 +655,8 @@ class SessionSettings : public PrefSettings m_ignoreOlderSessions = initPref(STR_IS_IgnoreOlderSessions, false).toBool(); m_ignoreOlderSessionsDate=initPref(STR_IS_IgnoreOlderSessionsDate, QDateTime(QDate::currentDate().addYears(-1), daySplitTime()) ).toDateTime(); m_lockSummarySessions = initPref(STR_IS_LockSummarySessions, true).toBool(); + m_warnOnUntestedMachine = initPref(STR_IS_WarnOnUntestedMachine, true).toBool(); + m_warnOnUnexpectedData = initPref(STR_IS_WarnOnUnexpectedData, true).toBool(); } inline QTime daySplitTime() const { return m_daySplitTime; } @@ -665,6 +669,8 @@ class SessionSettings : public PrefSettings inline bool ignoreOlderSessions() const { return m_ignoreOlderSessions; } inline QDateTime ignoreOlderSessionsDate() const { return m_ignoreOlderSessionsDate; } inline bool lockSummarySessions() const { return m_lockSummarySessions; } + inline bool warnOnUntestedMachine() const { return m_warnOnUntestedMachine; } + inline bool warnOnUnexpectedData() const { return m_warnOnUnexpectedData; } void setDaySplitTime(QTime time) { setPref(STR_IS_DaySplitTime, m_daySplitTime=time); } void setPreloadSummaries(bool b) { setPref(STR_IS_PreloadSummaries, m_preloadSummaries=b); } @@ -676,11 +682,14 @@ class SessionSettings : public PrefSettings void setIgnoreOlderSessions(bool b) { setPref(STR_IS_IgnoreOlderSessions, m_ignoreOlderSessions=b); } void setIgnoreOlderSessionsDate(QDate date) { setPref(STR_IS_IgnoreOlderSessionsDate, m_ignoreOlderSessionsDate=QDateTime(date, daySplitTime())); } void setLockSummarySessions(bool b) { setPref(STR_IS_LockSummarySessions, m_lockSummarySessions=b); } + void setWarnOnUntestedMachine(bool b) { setPref(STR_IS_WarnOnUntestedMachine, m_warnOnUntestedMachine=b); } + void setWarnOnUnexpectedData(bool b) { setPref(STR_IS_WarnOnUnexpectedData, m_warnOnUnexpectedData=b); } QTime m_daySplitTime; QDateTime m_ignoreOlderSessionsDate; bool m_preloadSummaries, m_backupCardData, m_compressBackupData, m_compressSessionData, m_ignoreOlderSessions, m_lockSummarySessions; + bool m_warnOnUntestedMachine, m_warnOnUnexpectedData; double m_combineCloseSessions, m_ignoreShortSessions; }; diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 4a679b20..ec91e8a5 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -508,7 +508,12 @@ test { tests/sessiontests.h } -# On macOS put a custom Info.plist into the bundle that disables dark mode on Mojave macx { + # On macOS put a custom Info.plist into the bundle that disables dark mode on Mojave QMAKE_INFO_PLIST = "../Building/MacOS/Info.plist.in" + + # Add a dist-mac target to build the distribution .dmg. + QMAKE_EXTRA_TARGETS += dist-mac + dist-mac.commands = QT_BIN=$$[QT_INSTALL_PREFIX]/bin $$_PRO_FILE_PWD_/scripts/create_dmg OSCAR OSCAR.app $$_PRO_FILE_PWD_/../Building/MacOS/README.rtfd + dist-mac.depends = $${TARGET}.app/Contents/MacOS/$${TARGET} } diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index 54a1154f..c9306d36 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -165,6 +165,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : } else { ui->IgnoreLCD->display(STR_TR_Off); } ui->LockSummarySessionSplitting->setChecked(profile->session->lockSummarySessions()); + ui->warnOnUntestedMachine->setChecked(profile->session->warnOnUntestedMachine()); + ui->warnOnUnexpectedData->setChecked(profile->session->warnOnUnexpectedData()); // macOS default system fonts are not in QFontCombobox because they are "private": // See https://github.com/musescore/MuseScore/commit/0eecb165664a0196c2eee12e42fb273dcfc9c637 @@ -799,6 +801,8 @@ bool PreferencesDialog::Save() AppSetting->setUserEventPieChart(ui->showUserFlagsInPie->isChecked()); profile->session->setLockSummarySessions(ui->LockSummarySessionSplitting->isChecked()); + profile->session->setWarnOnUntestedMachine(ui->warnOnUntestedMachine->isChecked()); + profile->session->setWarnOnUnexpectedData(ui->warnOnUnexpectedData->isChecked()); AppSetting->setOpenTabAtStart(ui->openingTabCombo->currentIndex()); AppSetting->setOpenTabAfterImport(ui->importTabCombo->currentIndex()); diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index bf5b6dcf..f56d58e4 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -568,7 +568,7 @@ OSCAR can keep a copy of this data if you ever need to reinstall. Memory and Startup Options - + Bypass the login screen and load the most recent User Profile @@ -591,7 +591,7 @@ OSCAR can keep a copy of this data if you ever need to reinstall. - + <html><head/><body><p>This setting keeps waveform and event data in memory after use to speed up revisiting days.</p><p>This is not really a necessary option, as your operating system caches previously used files too.</p><p>Recommendation is to leave it switched off, unless your computer has a ton of memory.</p></body></html> @@ -611,14 +611,14 @@ OSCAR can keep a copy of this data if you ever need to reinstall. - + Automatically load last used profile on start-up - + <html><head/><body><p>Cuts down on any unimportant confirmation dialogs during import.</p></body></html> @@ -628,6 +628,26 @@ OSCAR can keep a copy of this data if you ever need to reinstall. + + + + <html><head/><body><p>Provide an alert when importing data from any machine model that has not yet been tested by OSCAR developers.</p></body></html> + + + Warn when importing data from an untested machine + + + + + + + <html><head/><body><p>Provide an alert when importing data that is somehow different from anything previously seen by OSCAR developers.</p></body></html> + + + Warn when previously unseen data is encountered + + + diff --git a/oscar/scripts/create_dmg b/oscar/scripts/create_dmg new file mode 100755 index 00000000..c829f204 --- /dev/null +++ b/oscar/scripts/create_dmg @@ -0,0 +1,47 @@ +#!/bin/bash +# Usage: create_dmg target_name file1 [file2...] + +# TODO: add background image and symlink to /Applications, once we have a signed app and no longer need the README + +STAGING_DIR="./Staging" + +# Extract the target name +TARGET="$1" +shift + +# Look for the .app in the files to be added to the .dmg +APP="" +for src in "$@" +do + [[ "$src" == *.app ]] && APP="$src" +done + +if [[ ${APP} != "" ]]; then + if [[ -z "$QT_BIN" ]]; then + echo "Error: QT_BIN must be defined" + exit 1 + fi + + # Create deployable application bundle (if it hasn't been already been done) + if [[ ! -d "${APP}/Contents/Frameworks/QtCore.framework" ]]; then + echo "${QT_BIN}"/macdeployqt "${APP}" + "${QT_BIN}"/macdeployqt "${APP}" || exit + fi + + # TODO: add version number to target .dmg filename + # 1. Set the version in the Info.plist during build. + # 2. Get the version from ${APP}/Contents/Info.plist +fi + +mkdir "${STAGING_DIR}" || exit + +for src in "$@" +do + echo "Copying ${src}" + cp -a "$src" "${STAGING_DIR}/." +done + +echo "Creating .dmg" +hdiutil create -srcfolder "${STAGING_DIR}" -volname "${TARGET}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDZO -imagekey zlib-level=9 -o "${TARGET}.dmg" -ov + +rm -rf "${STAGING_DIR}" diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp index 28752eb6..f00eddb7 100644 --- a/oscar/tests/prs1tests.cpp +++ b/oscar/tests/prs1tests.cpp @@ -1,6 +1,6 @@ /* PRS1 Unit Tests * - * Copyright (c) 2019 The OSCAR Team + * Copyright (c) 2019-2020 The OSCAR Team * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the source code @@ -79,9 +79,8 @@ void parseAndEmitSessionYaml(const QString & path) qDebug() << path; // This mirrors the functional bits of PRS1Loader::OpenMachine. - // Maybe there's a clever way to add parameters to OpenMachine that - // would make it more amenable to automated tests. But for now - // something is better than nothing. + // TODO: Refactor PRS1Loader so that the tests can use the same + // underlying logic as OpenMachine rather than duplicating it here. QStringList paths; QString propertyfile; @@ -109,7 +108,10 @@ void parseAndEmitSessionYaml(const QString & path) delete session; delete task; - } + } + if (s_loader->m_unexpectedMessages.count() > 0) { + qWarning() << "*** Found unexpected data"; + } } void PRS1Tests::testSessionsToYaml() @@ -141,11 +143,16 @@ static QString byteList(QByteArray data, int limit=-1) { int count = data.size(); if (limit == -1 || limit > count) limit = count; + int first = limit / 2; + int last = limit - first; QStringList l; - for (int i = 0; i < limit; i++) { + for (int i = 0; i < first; i++) { l.push_back(QString( "%1" ).arg((int) data[i] & 0xFF, 2, 16, QChar('0') ).toUpper()); } if (limit < count) l.push_back("..."); + for (int i = count - last; i < count; i++) { + l.push_back(QString( "%1" ).arg((int) data[i] & 0xFF, 2, 16, QChar('0') ).toUpper()); + } QString s = l.join(" "); return s; } diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp index 303984e9..589e357f 100644 --- a/oscar/tests/sessiontests.cpp +++ b/oscar/tests/sessiontests.cpp @@ -1,6 +1,6 @@ /* Session Testing Support * - * Copyright (c) 2019 The OSCAR Team + * Copyright (c) 2019-2020 The OSCAR Team * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the source code @@ -144,11 +144,16 @@ static QString eventChannel(ChannelID i) static QString intList(EventStoreType* data, int count, int limit=-1) { if (limit == -1 || limit > count) limit = count; + int first = limit / 2; + int last = limit - first; QStringList l; - for (int i = 0; i < limit; i++) { + for (int i = 0; i < first; i++) { l.push_back(QString::number(data[i])); } if (limit < count) l.push_back("..."); + for (int i = count - last; i < count; i++) { + l.push_back(QString::number(data[i])); + } QString s = "[ " + l.join(",") + " ]"; return s; } @@ -156,11 +161,16 @@ static QString intList(EventStoreType* data, int count, int limit=-1) static QString intList(quint32* data, int count, int limit=-1) { if (limit == -1 || limit > count) limit = count; + int first = limit / 2; + int last = limit - first; QStringList l; - for (int i = 0; i < limit; i++) { + for (int i = 0; i < first; i++) { l.push_back(QString::number(data[i] / 1000)); } if (limit < count) l.push_back("..."); + for (int i = count - last; i < count; i++) { + l.push_back(QString::number(data[i] / 1000)); + } QString s = "[ " + l.join(",") + " ]"; return s; }