chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-16 18:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,912 Commits 1 Branch 56 Tags 66 MiB
4c0677fca1
Commit Graph

585 Commits

Author SHA1 Message Date
Guy Scharf
e7ce6f00f1 DeVilbiss BLUE (DV6x) loader 
Backups complete and Build from Backup works
Low resolution graphs corrected
 2021-06-18 13:31:56 -07:00
Phil Olynyk
83f80f44d2 Backup either tgt or json Ident file 2021-06-07 13:58:04 -04:00
Phil Olynyk
024c0daf49 Parse identification.json for AS11 2021-06-06 22:57:52 -04:00
sawinglogz
ec403a0c75 Remove unused comments and code in PRS1 loader. 2021-05-31 21:35:31 -04:00
sawinglogz
c5175b20d2 Move PRS1 file parsing into separate parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 21:32:18 -04:00
sawinglogz
6fc41537e2 Move remaining PRS1 chunk parsing into separate parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 21:23:03 -04:00
sawinglogz
7864d509cc Move PRS1 F5 parsing into separate F5 parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 21:02:11 -04:00
sawinglogz
26ce41927b Move PRS1 F3V03 parsing into separate F3 parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 20:54:24 -04:00
sawinglogz
ded4ea4d8f Move PRS1 F3V6 parsing into separate F3 parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 20:52:43 -04:00
sawinglogz
e5e3700c71 Move PRS1 F0V23 parsing into separate F0 parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 20:41:44 -04:00
sawinglogz
7b0e732ae5 Move remaining PRS1 F0V4 parsing into separate F0 parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 20:39:44 -04:00
sawinglogz
f74c38d512 Move PRS1 F0V45 parsing into separate F0 parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 20:34:50 -04:00
sawinglogz
2a326c816f Move PRS1 F0V6 parsing into separate parser file. 
No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 20:24:09 -04:00
sawinglogz
daaed2de79 Move PRS1DataChunk into parser header and clean up dependencies. 
Also move some previously static functions into their associated classes,
which lets us remove a few unnecessary wrapper functions used for testing.

No change in functionality.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 14:53:23 -04:00
sawinglogz
0a996cde73 Move PRS1 parser event definitions into new parser cpp/h files. 
No change in functionality.

This is almost entirely copy/paste, with the main exception of moving the
contents() method definitions out of the class definitions and moving the
needed TYPE definitions out of the header file.

Use git blame dd9a087 to follow the history before this refactoring.
 2021-05-31 13:18:39 -04:00
sawinglogz
dd9a087a86 Merge branch 'master' into prds2 2021-05-25 16:00:23 -04:00
sawinglogz
efeb9ed248 Fix some bugs in the DreamStation 2 wrapper and add some known values for testing. 2021-05-25 15:57:09 -04:00
sawinglogz
0737ad9b10 Performance improvements for PRS1 regression tests. 
Most of the gains were from replacing endl with '\n', which avoids
unnecessary flushing. But there were a few hot functions whose
inefficiency ended up having a significan impact.
 2021-05-23 21:26:17 -04:00
Phil Olynyk
caec63576d The i in Sızıntı has no dot ! 2021-05-23 18:00:19 -04:00
sawinglogz
b2ca5f708e Improve debug and user-visible messages for unsupported PRS1 machines. 2021-05-23 15:36:09 -04:00
sawinglogz
793a621b4d Fix some crashes that result from an invalid PR properties file. 2021-05-23 15:02:01 -04:00
sawinglogz
f1e31282bb Add wrapper around DreamStation 2 files to read their header and provide an interface to their data. 2021-05-23 12:43:31 -04:00
Phil Olynyk
f32d1da51a Add Turkish PLD, SAD signal names 2021-05-22 15:15:52 -04:00
Phil Olynyk
4a43aaabd4 Add Turkish STR signal names 2021-05-22 14:54:52 -04:00
kappa44
497cf8e5c4 Fix compile errors on Centos 7 2021-05-16 13:57:44 +10:00
sawinglogz
505264a200 Detect DreamStation 2 cards and alert the user. 2021-05-13 16:46:44 -04:00
sawinglogz
66e06af211 Add 700X130 to the list of tested machines. 2021-05-13 10:15:57 -04:00
Phil Olynyk
6b5443e6b8 Fix conflict by allowing comment 2021-05-02 08:16:32 -04:00
Phil Olynyk
edf3d95225 Comment out all the debugging stuff, and add a terminating event when 
a PLD.edf signal value is out of range.
 2021-05-02 08:05:49 -04:00
Phil Olynyk
6d4836c18a Use channel lables instead of hex ID 2021-04-26 20:51:48 -04:00
sawinglogz
9cbd0d7b24 Fix multiple regressions that broke compilation with clang. 
e633a82: overloaded virtual method errors
0022510: inconsistent missing override error
e358d31: unused private fields
3591f11: unused private fields
 2021-04-26 20:10:37 -04:00
Phil Olynyk
e20518e84c Don't skip the first 40 seconds of ResMed low-rate pressure data. 2021-04-24 16:52:25 -04:00
kappa44
e633a82de4 Consistent multi-file import for non-CPAP loaders (Viatom, Somnopose, Zeo, Dreem) 2021-04-24 17:44:27 +10:00
Guy Scharf
5a64262ff6 Minor fix to #ifdefs in DV6 loader 2021-04-13 17:48:39 -06:00
Guy Scharf
4234cb34a4 Fix problem with truncated per-minute data in graphs. 2021-04-09 14:05:54 +10:00
Guy Scharf
3114cf517d Improve file identification in Icon loader 
Will no longer attempt to process SleepStyle data with Icon loader
   A new loader for SleepStyle machines is forthcoming.
 2021-04-04 04:56:39 -07:00
Phil Olynyk
a92646faae working on missing graph 2021-04-02 19:01:24 -04:00
Guy Scharf
e358d31f26 Add logic to read rolling files created by DeVilbiss BLUE CPAPs 2021-04-01 21:39:06 -07:00
kappa44
00ad97ff70 Update loader version change comment 2021-03-23 09:43:14 +11:00
kappa44
2d502f6a68 Revert viatom data version to avoid purge 2021-03-23 09:42:47 +11:00
sawinglogz
be1d3d878b Add 1130X200 to the list of tested machines. 
Also update warnings based on new test data and correctly
label the rise time lock setting on some 1030X sessions.
 2021-03-04 17:34:05 -05:00
sgearhart
31bd10590f modified: oscar/SleepLib/loader_plugins/viatom_loader.cpp 
modified:   oscar/SleepLib/loader_plugins/viatom_loader.h
	modified:   oscar/mainwindow.ui
 2021-02-22 15:30:04 -05:00
Phil Olynyk
1b727eff76 Use 2010-1-1 as invalid date, and fix the test for it 2021-02-21 20:42:13 -05:00
kappa44
6b10cb665d Make somnopose csv more flexible - data fields are optional and include movement. Make data persistent 2021-02-22 09:33:43 +11:00
Guy Scharf
fbfc830015 Compensate for error message from linux compilers in DeVilbiss loader. 2021-01-26 12:37:27 -07:00
Guy Scharf
24e7d34aee DeVilbiss DV6x loader 
Mostly complete
  Backup facility is incomplete
 2021-01-25 19:56:59 -07:00
Phil Olynyk
d16c4f4aed Add Auto as option for Ramp-Enable 2021-01-22 11:36:17 -05:00
sawinglogz
09ba58669a Add support for Target Time humidifier setting on DreamStation Go. 2020-12-29 20:23:37 -05:00
sawinglogz
e336e85aac Add 500G120 and 500X140 to the list of tested machines. 
Also update warnings based on new test data.
 2020-12-29 17:38:00 -05:00
Guy Scharf
38d8b84266 Intellipap DV64 loader now imports the most recent day 
Previous code had an off-by-one error and was not importing the last day in the file.
 2020-12-14 00:20:29 +00:00
Guy Scharf
4276765bf2 ResMed loader no longer checks for maskoff dates beyond current time 
Loader was checking that maskoff time was not greater than current time.  This
produced problems when CPAP machine was set to DST but computer was set to standard
time. This also could cause problems trying to import files created in a different
timezone.
Added a separate check for maskon and maskoff times were in legal range (0-24*60).
Updated release notes.
 2020-11-19 13:51:01 -07:00
Guy Scharf
1af5d3ec40 Improve some qWarning messages. 
resmed_loader: include all timestamps in "time in future" error messages
mainwindow: add qWarning message if first journal session is null pointer
 2020-11-04 10:12:19 -07:00
Guy Scharf
bf458fa1d5 Clairfy code for checking for str.edf or str.edf.gz depending on compression settings 2020-10-06 09:37:29 -07:00
Guy Scharf
6c8d9d6751 Fix two issues in ResMed loader: 
1) If data compression option is set, loader will now try the str.edf.gz file first, with fallback to str.edf
2) Mixed Windows and Unix separators are now allowed in --datadir, which was previously causing data loss when rebuilding CPAP data.
 2020-10-06 01:36:15 +00:00
Guy Scharf
34700fd9f9 Fix two issues in ResMed loader: 
1) If data compression option is set, loader will now try the str.edf.gz file first, with fallback to str.edf
2) Mixed Windows and Unix separators are now allowed in --datadir, which was previously causing data loss when rebuilding CPAP data.
 2020-10-06 01:36:15 +00:00
sawinglogz
2563e5c4f0 Fix gcc compiler error introduced by d98a76a. 2020-09-14 14:58:11 -04:00
sawinglogz
d98a76aa22 Recognize low MV alarm on 1030X and update warnings based on test data. 2020-09-13 19:28:00 -04:00
sawinglogz
d1985c9dc2 Add support for all current Dorma 501V test data. 2020-09-13 19:27:59 -04:00
sawinglogz
c8b10e31a7 Add initial support for PRS1 Dorma 501V. 2020-09-13 19:27:59 -04:00
sawinglogz
53de4f0f49 Add older 450P to the list of tested machines. 
Also update warnings based on test data.
 2020-09-13 19:27:59 -04:00
sawinglogz
ffc4b897f8 Improve import of rare 950P events; update warnings based on test data. 
Rare hypopnea variants weren't being recognized, and timestamps were
slightly off after a mid-session humidification change.
 2020-09-02 11:23:36 -04:00
Guy Scharf
23036ec8cd Fix compile problem with QT 5.9; change Patient Access to Essentials 
- Values of "On" and "Plus" will be shown for this field.
- Field name will remain Patient Access until a new profile is created or language is changed.
 2020-08-31 22:02:32 -07:00
Guy Scharf
ce18739d14 ResMed and Oximetry loader enhancements 
- Oximetry loader from file now remembers last directory data was imported from.
- ResMed loader loads from last day or oldest purge date if a day was purged since last import.
  purgeDate added to MachineInfo to implement this.  Purge date set when a day is purged and cleared after an import.
 2020-08-23 15:30:38 -07:00
Guy Scharf
5e5af1b541 Cleaen up some debug messages 2020-08-19 17:12:41 -07:00
Guy Scharf
134a30624f Improve file open diagnostic messages 2020-08-19 10:14:38 -07:00
Guy Scharf
4e0d8d33fd Changes to ResMed loader: 
- Fix possible problem with rebuilding CPAP data
- Change re-import to look just at last day (full re-import will be re-added later)
- Improve detection of when a day needs to be rebuilt on re-import
- Improve some diagnostic messages
 2020-08-19 10:14:02 -07:00
sawinglogz
13e8a1947d Add 452P and 650P to the list of tested machines. 
Also improve support for rare F0V23 events and update other warnings based
on new test data.
 2020-08-16 21:19:11 -04:00
Guy Scharf
bf6dd5c615 Improvements to ResMed loader for re-importing days 
o Now compares all days, not just starting from last day imported
o Compares number of non-identical MaskOn/Off events with session count
o Hid most qDebug messages behind #define STR_EDF
o Added qWarning to open() and close() calls for improved diagnostics
o Fixed some copy() calls that were not working
 2020-08-13 16:32:34 -07:00
Guy Scharf
8f3971cb09 Fix maskon/off vs session count comparison for deciding when to re-import a day 2020-08-12 17:26:14 -07:00
Phil Olynyk
d46dd3d144 Remove existing backups before second import; also change double to qint64 in LoadEVE and LoadCSL 2020-08-09 17:17:21 -04:00
Phil Olynyk
a89b5f8cdd Merge branch 'master' into test-dataflow 2020-08-08 14:22:16 -04:00
Phil Olynyk
b35cd921c1 Compare maskevents to session count to all re-import on same day - added debug trace 2020-08-08 14:17:54 -04:00
sawinglogz
f73ef02380 Update 1030X and 1130X warnings based on new test data. 2020-08-08 11:04:34 -04:00
sawinglogz
0960384b20 Add support for compliance records from PRS1 60 Series bricks. 
Add 261CA to the list of tested machines.
 2020-08-04 20:59:51 -04:00
sawinglogz
cfca48e505 Reconcile differences in PRS1 compliance vs. summary for F0V23 and F0V6. 
Propagated a bug-fix in some variations that avoiding crashing on
zero-length data.
 2020-08-04 17:12:14 -04:00
sawinglogz
93a056b252 Add 462P and 400X120 to the list of tested machines. 
Also update F0V4 warning based on new test data.
 2020-08-03 14:18:25 -04:00
Phil Olynyk
961fdb13db Clean up formatting, add debug and warnings, fix STR length test to allow multiple daily imports. 2020-08-03 14:01:04 -04:00
sawinglogz
eaf4ab69cf Update 700X warning based on new test data. 2020-07-24 12:51:22 -04:00
sawinglogz
11dfa09c7b Add preliminary support for rare time-adjustment event observed on PRS1 550P. 
Also add 900X150 to the list of tested machines, and update other warnings
based on new test data.
 2020-06-26 12:53:52 -04:00
sawinglogz
cdec75b94b Update 500G warnings based on new test data. 2020-06-04 10:01:26 -04:00
sawinglogz
d01c183ae3 Add 400X130 to the list of tested machines. 2020-05-29 12:38:39 -04:00
sawinglogz
4507f8d7a8 Fix crash when trying to import Weinmann SOMNObalance e. 
This patch only addresses the crash, it doesn't add support for the machine.
 2020-05-28 22:11:28 -04:00
sawinglogz
47ea2bbf91 Tweak copy constructors to fix build errors in CentOS. 
Thanks to johanfh.

Fixes #19.
 2020-05-23 11:22:59 -04:00
Phil Olynyk
2ad6a5c980 Fix debug output text 2020-05-19 14:47:54 -04:00
Phil Olynyk
ee3a79af7e Copy new STR.edf to Backup after Backup_STR scan 2020-05-18 17:42:37 -04:00
Phil Olynyk
2d4598d5e7 Fix type in procedure name 2020-05-18 13:59:10 -04:00
Phil Olynyk
b9cccdc746 Clean up, and copy Backup/STR.edf to Backup?STR_Backup/STR_yyyymmdd.edf 
before copying import/STR.edf to Backup/STR.edf.
 2020-05-17 19:24:31 -04:00
Phil Olynyk
cf32639b06 Clean up comments and trim file paths 2020-05-16 17:31:18 -04:00
Phil Olynyk
53d0c0fbe4 Merge branch 'master' into error-message-cleanup 2020-05-16 16:18:27 -04:00
Phil Olynyk
16cd85ab02 More tidying up 2020-05-16 16:16:10 -04:00
sawinglogz
922515b3c9 Update PRS1 900X and 500G warnings based on new test data. 2020-05-16 10:09:00 -04:00
Phil Olynyk
209998fe34 Re-arrange code to backup STR.edf before other files 2020-05-15 21:27:08 -04:00
Phil Olynyk
ebd518a9f5 Make sure STR.edf is copied to Backup folder during import 2020-05-15 19:58:11 -04:00
Phil Olynyk
5b87ad6640 Comment out extra debug statements 2020-05-15 12:44:29 -04:00
Phil Olynyk
71e156dfed Change setMin/Max to updateMin/Max in LoadEDF procedures 2020-05-14 21:10:03 -04:00
sawinglogz
759ae84f65 Update PRS1 900X and oximetry warnings based on new test data. 2020-05-13 13:40:54 -04:00
sawinglogz
2a92569393 Add 461CA and 700X120 to the list of tested machines, and refine 
unexpected data warnings.
 2020-05-12 14:08:24 -04:00
sawinglogz
5270fcd09b Update PRS1 400X-700X warnings based on new test data. 2020-05-12 13:26:45 -04:00
sawinglogz
346208140e Revise VS2 index to match official reports. 
The VS2 channel is unique in that it only appears (as a flag)
when there are nonzero snores during a 2-minute period. However, the
VS index isn't the number of events (nonzero intervals) per hour,
but rather the number of snores per hour.
 2020-05-07 17:36:31 -04:00
Phil Olynyk
c43479672a Pick up some PRS changes 2020-05-07 16:45:17 -04:00