chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-23 22:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,245 Commits 1 Branch 56 Tags 66 MiB
aaaaef0d41
Commit Graph

459 Commits

Author SHA1 Message Date
Phil Olynyk
f077353a01 Kludge fix for missing Ti and Te segments 2020-03-03 16:47:55 -05:00
Phil Olynyk
11b1d9a045 Roll the VAuto TrigCycEvent into the S0 VPAP-S RespEvent type 2020-02-21 21:41:00 -05:00
Phil Olynyk
b4bbdd9a54 update dumpSTR to use the standard edfparser files 2020-02-21 11:29:00 -05:00
sawinglogz
a80134e7db Remove redefinition of nullptr that caused compilation errors under Qt 5.14. 
Thanks to mjphyi for tracking this down!

gcc didn't provide very useful error messages, saying that
error: invalid conversion from ‘long int’ to ‘QDebug::Stream*’
was in qglobal.h.

But it really had to do with a few scattered #defines in OSCAR changing
nullptr to NULL (an int). Since OSCAR now requires C++11, and nullptr
is a keyword in C++11, these #defines can go.

Resolves issue #5.
 2020-02-18 15:22:51 -05:00
sawinglogz
d75a2e9fca Fix debug message when skipping short sessions. 
The session ID is not a date on all machines.
 2020-02-17 11:04:48 -05:00
Phil Olynyk
99de650018 Merge branch 'master' into sanity-check-STR-file 2020-02-16 21:42:09 -05:00
Phil Olynyk
c671e873a3 Make Open return error when sanity fails 2020-02-16 21:41:56 -05:00
Phil Olynyk
bd4918dc30 Remove version update from importCPAP 2020-02-16 21:33:01 -05:00
Phil Olynyk
3df1ba50df Merge branch 'master' into update-machine-db-version 2020-02-16 21:19:00 -05:00
Phil Olynyk
6fed69e71c Update database version in loader, not profiles 2020-02-16 21:12:54 -05:00
Phil Olynyk
a094aee728 Add sanity check for STR file 2020-02-14 15:18:25 -05:00
Phil Olynyk
1a258eae34 Update machine.info.version after upgrade re-import 2020-02-13 20:37:52 -05:00
sawinglogz
c5c6f779f7 Fix Zeo and Dreem loaders' mysteriously missing sessions. 
This was the same issue seen in the Viatom loader, fixed at 5e07187,
and the same fix works here.
 2020-02-13 14:31:32 -05:00
Phil Olynyk
014a9c7944 Merge master containing testing changes 2020-02-10 22:18:39 -05:00
sawinglogz
7701694b14 Add support for YAML output by Resmed loader for regression testing. 2020-02-10 16:04:03 -05:00
Phil Olynyk
d27f9232d4 Set timezone to localNoDST and set session->first & last and fix typo 2020-02-09 23:45:31 -05:00
Phil Olynyk
084cff026c code cleaup in edfparser 2020-02-09 23:42:31 -05:00
Phil Olynyk
7f3cda6893 Add some additional debug text for clarity 2020-02-09 23:41:35 -05:00
Phil Olynyk
81eee97ec1 Change pass-by-value to pass-by-ref in BackupSTR 2020-02-07 20:16:47 -05:00
Phil Olynyk
1148d1b69e Merge master and clean up Open code 2020-02-07 16:20:53 -05:00
sawinglogz
a497c0f317 Update Viatom loader based on newly observed O2Ring data in the header. 2020-02-07 13:54:28 -05:00
Phil Olynyk
0afaec53b5 In Preferences, ask if ResMed when no machines; force ResMed prefs when yes. Also in ResMed loader 2020-02-06 21:34:04 -05:00
Phil Olynyk
b178dba420 add timezone test for invalid datetimes 2020-02-06 17:17:08 -05:00
Phil Olynyk
bd6dabd3e5 Add debugging for missing session info 2020-02-06 09:13:16 -05:00
sawinglogz
c83de24dec Update PRS1 loader based on peculiar EZ-Start sample data. 
It doesn't do anything differently yet, but it won't alert the user
about untested data, now that we have a sample.
 2020-02-04 12:26:42 -05:00
sawinglogz
f40428f9fe Identify previously unknown Viatom vibration field. 2020-02-03 15:37:37 -05:00
sawinglogz
cdeba58c5d Fix minor cleanup bugs in the Resmed regression tests that were causing crashes. 2020-02-03 11:43:13 -05:00
Phil Olynyk
da29e35766 Merge master with tidy-edf-parser 2020-02-02 14:52:02 -05:00
Phil Olynyk
f903a26d11 Force use of systems Standard Time Zone by QDateTime 2020-02-02 14:29:23 -05:00
sawinglogz
39e243a36d Comment out set but otherwise unused variables. 
g++ warns about this, which we treat as an error.
 2020-01-31 17:18:01 -05:00
sawinglogz
ad9ac16f80 Add support for discontinuous hyponogram data in ZEO loader. 
Also support sleep stage 6 ("Deep (2)") and adjust scale of chart
so that deep sleep is more visible.

And adjust scale of Dreem chart to match.
 2020-01-31 13:31:49 -05:00
sawinglogz
492908f538 Add support for discontinuous hyponogram data in Dreem loader. 2020-01-31 12:44:41 -05:00
Phil Olynyk
6624738f67 Clean up EDFInfo class to avoid memory leaks 2020-01-30 19:54:53 -05:00
Phil Olynyk
0fd25f2f4e Add delete (obj) to clean up memory leaks 2020-01-30 19:52:37 -05:00
sawinglogz
ab9d5e87c5 Flip the sleep stage data to negative so that the chart is drawn in the right orientation. 
Ideally graphs would be able to invert their Y axis without this hack, but
it works for now. It would also be good to support non-numeric labels
in the graph legend.
 2020-01-30 13:45:55 -05:00
sawinglogz
62880d1a00 Comment and whitespace cleanup in Dreem, Viatom, and Zeo loaders. 2020-01-30 13:17:51 -05:00
sawinglogz
156215b729 Clean up Zeo loader using techniques from the Dreem loader. 
Also speed up skipping previously imported sessions by bailing
earlier. No other change in functionality.
 2020-01-30 12:25:35 -05:00
sawinglogz
32ffcc4f94 First pass at Dreem CSV loader. 
Something's not quite right about the hypnogram timestamps, since
there are more than would fit within the start/stop times.
 2020-01-29 20:00:33 -05:00
sawinglogz
f33dd654f8 Add generic CSV reader class and switch ZEO loader to it. 
No change in functionality for ZEO files.

Resolves crashing (assertion failure) on non-ZEO CSV files.
 2020-01-29 17:05:03 -05:00
sawinglogz
8ef068af7e Fix ZEO loader to handle MyZeo 0.3.1 date formatting. 
Also make the UI more informative and fix up the regression test output.
 2020-01-29 16:21:42 -05:00
sawinglogz
448bfa048c Refactor ZEO loader to allow for testing, add regression tests. 2020-01-29 15:47:11 -05:00
sawinglogz
b82d5dc971 Fix memory leak in PRS1 loader. 2020-01-29 10:43:58 -05:00
sawinglogz
cb576437ab Clean up noise and memory leaks in unit tests. 2020-01-29 09:10:29 -05:00
sawinglogz
077f51178f Split PRS1 oximetry data so that invalid samples show up as gaps on the charts. 2020-01-28 17:36:02 -05:00
sawinglogz
15e6f1eadf Refactor PRS1 oximetry import to prepare for discontinuous data. 
Also remove some return values that were unused.
 2020-01-28 16:04:34 -05:00
sawinglogz
0358386cd3 Fix PRS1 tube diameter display. 
It was being parsed correctly, but the mapping to display was wrong.
 2020-01-28 14:07:58 -05:00
sawinglogz
ba81370fb6 Update PRS1 warnings based on new sample data, add 500X130 to list of tested madels. 2020-01-28 13:19:45 -05:00
sawinglogz
5fedd8349a Fix Bi-Flex labeling for PRS1 DreamStation 600X and 700X machines. 2020-01-28 12:02:03 -05:00
sawinglogz
c6169da7e0 Fix regression in f865b371: the pressure average channel is truly the pressure average for bi-level modes. 
This changes the parsing to distinguish between the "flex pressure" reported
by single-pressure modes (which remains effectively EPAP) and the average
pressure reported by bi-level modes (which returns to its former average
pressure channel).
 2020-01-28 11:26:31 -05:00
sawinglogz
369275988b Clean up error reporting when parsing PRS1 data chunks. 
Also remove some error-handling code that we can't verify and probably
never worked correctly.
 2020-01-28 09:34:02 -05:00