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

858 Commits

Author SHA1 Message Date
sawinglogz
a9b16f26bd Add an error message to PRS1 loader. 2020-03-09 13:03:28 -04:00
sawinglogz
910be1f6af Move PRS1Loader::Open to use the new scanner. 
Also update Detect to retain its original behavior of letting the user
select the P-Series folder instead of the root.

Also fix what looked like a hang when backing up PRS1 files. The
progress bar still doesn't update during backup, but at least it
now says that it's backing up and the UI remains responsive.
 2020-03-09 12:47:54 -04:00
sawinglogz
0124cdbf1f Move PRS1 card detection and info presentation to the new scanner. 2020-03-09 11:17:59 -04:00
sawinglogz
485be366aa Make search for PRS1 "P-Series" folder truly case-insensitive. 2020-03-09 10:48:10 -04:00
sawinglogz
c8520c8449 Move PRS1 test card scanning into PRS1Loader. 
Also reverse the chronological order of tests to provide the most complete output.

The loader itself doesn't yet use the new machine scanner.
 2020-03-09 10:28:34 -04:00
sawinglogz
53525a7949 Refactor PRS1 test card scanning in preparation for unifying with loader. 
This splits out scanning the directories from processing them, which
also allows for sorting.
 2020-03-08 20:58:36 -04:00
sawinglogz
d4fd330a31 Fix regression introduced by cb57643. 
The Test1/2 channels were no longer initialized. As a result, all
Test1/2 data got merged into channel 0.
 2020-03-08 16:27:18 -04:00
Phil Olynyk
aaaaef0d41 Minor updates to the doc files 2020-03-04 15:23:22 -05: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
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
Guy Scharf
03adef372c Merge branch 'master' into preferences 2020-02-17 16:22:31 -07:00
sawinglogz
7fddb47dbc Fix regression in e698879 that prevented detection of shift key on launch. 2020-02-17 17:26:00 -05:00
Guy Scharf
634a139b29 Merge branch 'master' into preferences 2020-02-17 15:25:44 -07:00
Guy Scharf
40644b859d Move engine settings from Appearance to General page in Preferences Dialog 
Also changed layout on various pages so that spacing is not disturbed when stretching vertically
    This was an attempt to shrink total dialog height, but that is so far not successful.
 2020-02-17 14:42:49 -07: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
sawinglogz
e698879e17 Move graphic engine configuration before creation of QApplication. 
Qt was emitting console warnings about attempts to change
Qt::AA_UseDesktopOpenGL after creating the QApplication.
 2020-02-17 10:59:26 -05:00
sawinglogz
bba5f93795 Comment out unused slots in MainWindow. 2020-02-17 09:39:38 -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
sawinglogz
498451df4a Fix Windows file dialog for loading Viatom files. 2020-02-16 21:02:30 -05:00
sawinglogz
b96f22bcd9 Fix double import progress window. 2020-02-16 20:12:25 -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
Guy Scharf
3886543c40 Make Windows build process work without GIT 2020-02-12 19:45:12 -07:00
sawinglogz
0ee827b294 Add Resmed-specific settings channels to YAML. 2020-02-10 23:48:23 -05:00
Phil Olynyk
014a9c7944 Merge master containing testing changes 2020-02-10 22:18:39 -05:00
sawinglogz
bd68525246 Turn off backups in Resmed regression tests. 2020-02-10 20:58:49 -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
Phil Olynyk
1b105c1588 Delete profile settings moved to profiles.cpp 2020-02-07 16:00:58 -05:00
sawinglogz
a497c0f317 Update Viatom loader based on newly observed O2Ring data in the header. 2020-02-07 13:54:28 -05:00
Guy Scharf
77e2975ab2 Rework update_gitinfo.bat 
There was a strange interaction between git rev-parse and git diff-index when run in a batch file.
    Reworked to change the way rev-parse command was handled.
    Also added check to make sure git.exe was in the path.
 2020-02-07 08:46:56 -07: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
58a7f3f13d add no-error=strict-aliasing for old compilers 2020-02-06 17:25:43 -05:00
Phil Olynyk
b178dba420 add timezone test for invalid datetimes 2020-02-06 17:17:08 -05:00
Guy Scharf
34c545bb48 Merge branch 'master' into deploy3 2020-02-06 12:00:47 -07:00
Guy Scharf
20495e4475 Third time's the charm -- fix "-plus" notation for Windows 2020-02-06 11:59:17 -07: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
Guy Scharf
ef26ab5e46 Fix, again, the "-plus" notation in Windows build process. 2020-02-02 22:19:23 -07: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
Guy Scharf
2a03ff6c57 Fix "-pluis" notation on Windows builds 2020-02-01 19:07:47 -07: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
e0b50a5680 Improve purging UI for oximeters. 
The imported data doesn't list a brand, so the UI needs to fall back
on the loader name. Also, the purge menu wasn't getting updated
after an oximetry import.
 2020-01-31 15:35:36 -05:00
sawinglogz
ea66563521 Allow purging of any machine, not just CPAP. 
Otherwise there was no way to purge and re-import Somnopose or
hypnogram data, nor oximetry apart from one day at a time.
 2020-01-31 15:16:31 -05:00
sawinglogz
a585b6dcfe Refactor PopulatePurgeMenu in advance of supporting more machines. 2020-01-31 14:35:15 -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
sawinglogz
20b5ae454c Fix pinch gestures so that spreading fingers zooms in. 2020-01-27 15:04:54 -05:00
sawinglogz
f865b37102 Remap PRS1 pressure average channel to EPAP, which it most closely matches. 
Technically it's "flex pressure" and not true EPAP, since it's provided for
non-bi-level modes, but Flex is pretty close to bi-level.
 2020-01-27 14:57:53 -05:00
sawinglogz
ef0cb253cd Add CPAP_PressureSet/EPAPSet/IPAPSet to daily statistics view. 
Also add a breadcrumb for fixing average calculation for these channels.
 2020-01-27 14:28:25 -05:00
sawinglogz
7a42caeccf Create new Troubleshooting submenu under Help and move a bunch of items there. 
Also change "archive" to "zip" in the menu and prompts for sending diagnostic data.
 2020-01-27 14:13:41 -05:00
sawinglogz
6d47210c95 Ask the user where to save screenshots (by default). 
There's a new preference to turn this off.

Also update the release notes post-beta-1.
 2020-01-27 14:00:41 -05:00
sawinglogz
5122524df7 Leave a breadcrumb for future work on Purge Oximetry, which only half works. 2020-01-27 12:37:10 -05:00
sawinglogz
277b2a5422 Infer the serial number from Viatom directory if possible. 2020-01-27 12:26:35 -05:00
sawinglogz
780a703f18 Tweak the unexpected data warning for Viatom now that we can import more than just single files. 2020-01-27 09:15:15 -05:00
sawinglogz
e11bdf2633 Update Viatom tests to process folders of test data. 2020-01-26 20:05:14 -05:00
sawinglogz
4ebc7d3681 Rename POS_Motion channel to POS_Movement to match Viatom report terminology. 
Also move database updates to Open() rather than at each file imported.
 2020-01-26 19:50:18 -05:00
sawinglogz
3548b083fe Move Viatom unexpected data warning to Open() instead of each file. 2020-01-26 18:28:10 -05:00
sawinglogz
8951068895 Add support for importing a whole folder of Viatom files. 2020-01-26 18:13:09 -05:00
sawinglogz
b6f7ebac6f Move Viatom filename pattern matching into loader. 2020-01-26 17:51:56 -05:00
sawinglogz
c06057ef14 Skip previously imported Viatom sessions. 2020-01-26 17:20:58 -05:00
sawinglogz
5e07187860 Fix the Viatom loader's mysteriously missing sessions. 
It looks like SaveSummaryCache() would occasionally get called elsewhere
under certain circumstances, which would cause sessions to occasionally
save, but unpredictably. Now the summary cache gets saved consistently.
 2020-01-25 17:35:58 -05:00
sawinglogz
c727e78d45 Add support for discontinuous Viatom data. 
This now correctly shows gaps in the oximetry data when there are
invalid samples, rather than holding the previous values.
 2020-01-25 16:55:32 -05:00
sawinglogz
2f7b39f808 Deduplicate Viatom 2s files to their true 4s resolution. 2020-01-25 14:50:45 -05:00
sawinglogz
61333aff07 Rewrite the Viatom header parsing to read all data and warn about unexpected data. 
It turns out the 2s-resolution files are actually 4s resolution with
each sample reported twice! Fixing that is next.
 2020-01-24 20:16:57 -05:00
sawinglogz
21e7ae8b61 Set event list rate based on step, fix Viatom header size. 2020-01-24 15:25:36 -05:00
sawinglogz
70de112192 Split Viatom parsing from importing, no functional change. 2020-01-24 15:20:00 -05:00
sawinglogz
ae8ce0e9d6 Remove tabs in Viatom loader and normalize whitespace to OSCAR convensions. 
Also change from using sprintf/QDateTime::fromString to using Qt native objects.
No change in output.
 2020-01-23 19:25:06 -05:00