chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,124 Commits 1 Branch 56 Tags 66 MiB
cf4b86b99a
Commit Graph

131 Commits

Author SHA1 Message Date
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
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
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
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
b35cd921c1 Compare maskevents to session count to all re-import on same day - added debug trace 2020-08-08 14:17:54 -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
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
16cd85ab02 More tidying up 2020-05-16 16:16:10 -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
Phil Olynyk
2da3a9cd86 Track down zero time that led to future sessions 2020-05-07 16:43:52 -04:00
Phil Olynyk
1b453e2fa5 Always creaste Backup/DATALOG folder before ScanFiles 2020-05-04 19:59:59 -04:00
Phil Olynyk
c1f986921d Clean up memory leak I created 2020-04-29 19:51:32 -04:00
Phil Olynyk
cf316e83e9 Revert "Clean up memory leak I created" 
This reverts commit 832d905d04.
 2020-04-29 19:49:27 -04:00
Phil Olynyk
832d905d04 Clean up memory leak I created 2020-04-29 19:42:26 -04:00
Phil Olynyk
33e5561ad3 Rename STR files to use 8 digit date 2020-04-29 13:57:10 -04:00
Phil Olynyk
16c2784915 Always read STR.edf file from BACKUP folder. 
Use real date for STR files in STR_Backup folder, and
only keep the longest file if the dates are the same.
 2020-04-26 20:59:23 -04:00
sawinglogz
41fdcd0bd3 Fix pressure relief display in statistics page. 
Also revert 691aafd as that change is no longer necessary with this fix.
 2020-04-11 15:52:32 -04:00
Phil Olynyk
0d25d31049 Add ifdef around -Adding STR.edf information...- 2020-04-11 11:26:03 -04:00
Phil Olynyk
691aafda25 Change EPRLevel text back to xcmH2O so they show in Stats page 2020-04-11 11:01:24 -04:00
Phil Olynyk
512a65c772 Change labels to use new LOOKUP behaviour 2020-03-30 20:38:22 -04:00
Phil Olynyk
ca78954471 Don't use mask on/off times to set session start and end 
They will be updated according to the edf file times.
 2020-03-24 10:34:50 -04:00
Phil Olynyk
fd142ec40c Always include sthe series name in the model name - 
Also ignore (for now) the new file type and signals of the 36039.
 2020-03-23 14:41:31 -04:00
Phil Olynyk
eb2ef1cbb9 Move S9 to front of model name 2020-03-19 17:54:48 -04:00
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
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
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
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
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
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
Phil Olynyk
f903a26d11 Force use of systems Standard Time Zone by QDateTime 2020-02-02 14:29:23 -05:00
Phil Olynyk
6624738f67 Clean up EDFInfo class to avoid memory leaks 2020-01-30 19:54:53 -05:00
Phil Olynyk
ccba19b3d2 Conditionalize debug output with DEBUG_SESSION and DEBUG_IDENT 2019-12-30 11:14:05 -05:00
Phil Olynyk
031989e300 Final re-arrangement of resmed import code 2019-12-23 21:44:10 -05:00
Phil Olynyk
eeed7c29bc Split resmedEDFinfo class into new files 2019-11-17 16:41:47 -05:00
Phil Olynyk
433c60f195 Add tr(..) call to updateMessage 2019-11-11 21:10:43 -05:00
Phil Olynyk
6d338ac88f Clean up some debug messages 2019-09-25 07:25:44 -04:00
Phil Olynyk
6896bfd50b Add missing brace to previous commit 2019-09-22 17:49:00 -04:00
Phil Olynyk
3edff07151 Merge master, fix unreadable and zero-length file conflict 2019-09-22 17:32:09 -04:00
Seeker4
aaf5627891 Ignore zero-length files and add qWarning messages for ignored files. 2019-09-16 11:53:27 -07:00
Phil Olynyk
47719a4d09 Merge master back in, prior to push 2019-09-04 13:24:52 -04:00
Phil Olynyk
3055e1fe37 More work in progress 2019-08-30 13:22:19 -04:00
Phil Olynyk
5ee8feb37c Still work in progress 2019-08-27 23:59:51 -04:00
Phil Olynyk
4c121cc53a Started on adding firstImportDay, need to fix scanFiles and PaerseSTR 2019-08-23 09:56:17 -04:00
sawinglogz
66d9340cbb Don't mangle the model name for ResMed machines. 2019-08-18 16:56:41 -04:00
Phil Olynyk
b518461f8c Factor out buildEventList 2019-08-16 22:17:47 -04:00
Phil Olynyk
f5f0d62611 Factor out checkSummaryDay 2019-08-16 19:50:09 -04:00
Phil Olynyk
3e87d9d5e0 Factor out backupSTRfiles 2019-08-16 18:05:25 -04:00
Phil Olynyk
e5d1723c27 Use new annotations in EVE and CSL loaders 2019-08-15 20:30:54 -04:00
Phil Olynyk
b80ae70525 Changed class EDFParser to EDFInfo, and changed member names to show usage. 
Added an Annotaions list member to avoid reparsing.
Skipping directories before ignore-before date.
Added a new app to dump STR.edf files.
Still not complete.
 2019-08-03 10:59:08 -04:00
Phil Olynyk
f7227b7316 Don't create (summary) sessions when maskon == maskoff 2019-08-01 13:30:11 -04:00
Phil Olynyk
37c9e615e4 Don't create (summary) session with maskon == maskoff 2019-08-01 12:34:06 -04:00
Phil Olynyk
531edc6ad2 Interim commit - resmed_loader still needs work 2019-07-31 14:36:40 -04:00
Phil Olynyk
ed6464e924 an Interim commit... 2019-07-22 17:01:47 -04:00
Phil Olynyk
8c11751b2b Re-arrange edf-parser code - and fix it 2019-07-18 19:36:35 -04:00
sawinglogz
74de65778e Fix memory bug in ResMed loader. 2019-07-10 12:37:40 -04:00
sawinglogz
c1aa016a46 Add trivial unit tests for ResMed loader. 2019-07-10 12:33:00 -04:00
Seeker4
0d0a5550d0 Do not add 10 to Hypopnea duration as was done in SleepyHead. ResMed does not report Hypopnea duration so we should not invent it. 2019-07-05 10:28:15 -07:00
Seeker4
d58bdc9452 Discard sessions with first timestamp of 0 to fix phantom date problem. 2019-06-25 06:23:04 -07:00
Seeker4
24258ea4e3 Correctly identify Climate setting as Auto or Manual in Machine Settings on Daily page. 2019-06-11 10:20:03 -07:00
Phil Olynyk
581086783e Start on debugging I:E ratio output 2019-04-05 14:00:37 -04:00
Phil Olynyk
108e0354d9 Change OSCR to OSCAR in cpp, h, ui, and html files 2019-02-23 19:58:25 -05:00
Phil Olynyk
17b53482bd Change folder and file name from oscr to oscar 2019-02-22 19:23:39 -05:00