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,099 Commits 1 Branch 56 Tags 66 MiB
99badd40c3
Commit Graph

668 Commits

Author SHA1 Message Date
Seeker4
c1b4137857 Remove some qDebug statements that aren't needed. 2019-08-28 16:31:56 -07:00
Seeker4
be147fee0a Always allow import cpap and oximetry. Allow Daily, Overview, and Statistics only if there is some data present. 2019-08-28 15:23:13 -07:00
Seeker4
091253f03d Show machine (rx) changes only if there are CPAP machines in this profile. 2019-08-28 15:22:31 -07:00
Seeker4
22a8303836 Trim blanks from user name before checking username is not empty 2019-08-26 23:10:58 -07:00
Seeker4
4fe0869816 On Overview page do not save CUSTOM range selection on exit. (CUSTOM was restoring to a broken state. Now, it is just not saved and default LAST 3 MONTHS applies on restart. 2019-08-26 16:11:09 -07:00
Seeker4
61270ae83e Refactor getRangeString for date line at bottom of Overview page 2019-08-25 07:46:48 -07:00
Seeker4
61142830ae Correct date problems on bottom of Overview page. Remove UTC conversions. Improve date formatting for 1 day and more than a year. 2019-08-24 17:47:22 -07:00
Seeker4
9010ca5ae4 Update release notes for progress bar and overview improvements 2019-08-23 12:44:25 -07:00
Seeker4
d7a4bcc78b Update release notes for this merge 2019-08-23 11:43:43 -07:00
Seeker4
79e34d067a Add a progressbar when opening an overview with a large number of days 2019-08-23 11:41:42 -07:00
Seeker4
36acc7bd2f Fix problem that could cause CProgressBar to hang and not close 2019-08-23 11:40:52 -07:00
Seeker4
a8dc05c3f5 1.1.0-testing-4 plus fix to overview graph 2019-08-22 19:59:51 -07:00
Seeker4
87d4d0f7b2 1.1.0-testing-4 build number and release notes 2019-08-22 15:17:01 -07:00
Seeker4
1613e20d22 Update release notes for Overview changes 2019-08-22 02:37:51 -07:00
Seeker4
842052addb Merge branch 'master' into overview 2019-08-22 02:34:56 -07:00
Seeker4
92136e7a63 Fix problem with overview charts all starting at left edge when they should not. 2019-08-22 02:33:18 -07:00
Seeker4
1c304eb13e Add some documentation to graph modules. 2019-08-22 02:31:33 -07:00
Seeker4
1904e50500 Change green/black and red/black toggle buttons to checkboxes 2019-08-22 02:27:55 -07:00
Seeker4
28326f4ec8 Refactoring overview, add more documentation. 2019-08-22 02:26:33 -07:00
Seeker4
335af79076 Fix spelling error. 2019-08-22 02:24:47 -07:00
Seeker4
ffda65300d Fix spelling errors. 2019-08-22 02:17:44 -07:00
sawinglogz
42f0745666 Improve settings interpretation for F3V6, though still not exactly right. 
The next step will be to split parsing from mode interpretation, so that
we can at least accurately identify all of PRS1's modes. Then we can
work on mapping that to OSCAR's notion of modes, which probably then needs
to be augmented.
 2019-08-20 12:48:15 -04:00
sawinglogz
ecb71e5706 Calculate PRS1 F3V6 pressure support settings, since we currently display them. 2019-08-20 12:08:24 -04:00
sawinglogz
0c816c7d4c Avoid pos++ in PRS1 DreamStation parsers to that events can be issued independently of parsing order. 2019-08-20 11:38:55 -04:00
sawinglogz
38409f6fbf Merge branch 'master' into fix-stale-translations 2019-08-19 17:02:50 -04:00
sawinglogz
42685cfbb6 Only copy current .qm files during build, rather than everything in the temporary directory. 2019-08-19 17:00:31 -04:00
Seeker4
4e52261439 Fix building of oscar_qt_xx.qm file names to be in lower case. 2019-08-19 13:14:07 -07:00
Seeker4
acd7b04b7b In translations.cpp, add new language names, revise loading of qm files into translator, add debug messages, all qm files are now together in translations directory 2019-08-19 12:36:23 -07:00
Seeker4
9527aadb66 In oscar.pro, add new language files in translations/qt directory. Remove Mac handling for QT files in a different directory. 2019-08-19 12:35:21 -07:00
Seeker4
48c0387125 Release notes for language changes, other minor changes 2019-08-19 12:34:18 -07:00
Seeker4
af2fc6f9c3 Automatically convert IS language code to HE on startup (new code for Hebrew) 2019-08-19 12:32:26 -07:00
sawinglogz
6c85195b39 Remove unused variable that clang missed. 2019-08-19 12:23:45 -04:00
sawinglogz
bed88b1546 Merge branch 'master' into deprecate-series 2019-08-18 17:38:48 -04:00
sawinglogz
65f3f53686 Add model number to printed daily report. 2019-08-18 17:30:52 -04:00
sawinglogz
31fc47a5c5 Remove "series" from display in UI and on reports. 2019-08-18 17:27:21 -04:00
sawinglogz
928e50fcc1 Use actual product names for PRS1 instead of mangled approximations. 2019-08-18 17:03:52 -04:00
sawinglogz
66d9340cbb Don't mangle the model name for ResMed machines. 2019-08-18 16:56:41 -04:00
Seeker4
f3605803e1 Remove languages from translations.qrc. Update release notes for post-1.1.0-testing-3 2019-08-15 23:23:22 -07:00
sawinglogz
ad09695531 Copy QT and OSCAR translation files into Mac .app bundle. 
They are stored in two separate locations (Contents/translations
for QT and Contents/Resources/translations) because
QLibraryInfo::location(QLibraryInfo::TranslationsPath) returns
the former only after macdeployqt has run, and returns Qt's
installed location prior to that.

And Contents/Resources/translations is the better location,
so we use it where we can.
 2019-08-15 23:07:54 -04:00
sawinglogz
84b900ca90 Remove the m_machopened flag from Profile, which caused newly created profiles 
to act differently from profiles after a subsequent application launch.

It was only getting set at the end of Profile::OpenMachines, which was only
called by the Profile constructor, and which wouldn't succeed on a newly created
profile, having no files to open. Therefore, the only way for the flag to be set
was to quit and re-launch the application after creating the profile.

The flag's only remaining use was to make sure that OpenMachines() wasn't
getting called twice and trampling an existing list of machines, so the check
there was changed from looking at a brittle flag to looking at the actual list
of machines.

A critical warning was also added to the check, since OpenMachines() is
only getting called from the Profile constructor and therefore can't
be invoked twice unless a new bug has been introduced.
 2019-08-15 16:56:44 -04:00
sawinglogz
e3e67438ea Fix the incomplete cleanup in Profile::UnloadMachineData that was resulting in 
duplicate sessions being added when making preference changes to a brand new
profile with existing data.

Preference changes trigger a reload, see PreferencesDialog::Save and
needs_reload, leading to MainWindow::reloadProfile -> MainWindow::CloseProfile
-> Profile::UnloadMachineData.

This is the root cause of the duplicate sessions, but the fact that it only
happened with newly created profiles, rather than on subsequent launches,
demonstrates an inconsistency in state of Profile. It should be identical when
initially created and when loaded via subsequent application launch.
 2019-08-15 16:28:07 -04:00
sawinglogz
6f7a49f949 Add a critical warning and skip when attempting to add a duplicate session to a Machine object. 
This prevents duplicate sessions from being added to Day during a rebuild, but is still not
the root cause. The next step will be to address the attempted duplication in Machine.
 2019-08-15 16:18:23 -04:00
sawinglogz
7d72f71fb4 Add a critical warning when a duplicate session is added to a Day object. 
This is one step closer to the root cause of the crash, in which duplicate
sessions were being created during a rebuild.
 2019-08-15 16:14:54 -04:00
sawinglogz
6d735a5733 Add Day::removeMachine to detect and clean up dangling references rather than 
crashing when rebuilding data.

This doesn't yet address the root cause, but it will prevent crashing if other
similar bugs exist.
 2019-08-15 15:49:40 -04:00
Seeker4
7786161a4d Merge branch 'master' into overview 2019-08-14 11:36:18 -07:00
Seeker4
4a7a14c301 Set Windows file version to 0.0.0.0 (make it obviously wrong), improve Windows properties for installer info. 2019-08-14 11:32:08 -07:00
Seeker4
56584bd601 Make 100% zoom work properly on Overview page. 2019-08-14 11:29:26 -07:00
sawinglogz
0b8f89036a Merge branch 'master' into prs1-f0v6 2019-08-14 09:15:39 -04:00
sawinglogz
675f6d4361 Resolve remaining F0V6 event 3 debug messages in sample data. 2019-08-13 23:03:20 -04:00
sawinglogz
cc80a3ef09 Remove F0V6 logic from PRS1DataChunk::ParseEventsF0V234, no functional change. 2019-08-13 21:09:55 -04:00
sawinglogz
3eee72390e Clean up PRS1DataChunk::ParseEventsF0V6, no change in functionality. 2019-08-13 17:29:05 -04:00
sawinglogz
73dfdac81b Add debug logging for PRS1 F0V6 event 3. 2019-08-12 21:51:37 -04:00
Seeker4
4b67af970f Update release notes for recent changes. 2019-08-12 16:26:35 -07:00
Seeker4
e315baf6df Test builds use settings key of oscar-test, branch builds oscar-branch, and release builds just oscar. Default data directory named similarly. 2019-08-12 16:02:53 -07:00
Seeker4
3492323216 Change Romanian name to Românește, clarify which translation file qDebug statements refer to. 2019-08-12 15:59:47 -07:00
sawinglogz
3de32dd21b Fix F0V6 PB starting time, and probably LL and PS as well. 2019-08-12 17:20:25 -04:00
sawinglogz
946293b67d Split PRS1Import::ParseF0Events into ParseEventsF0V6, no changes yet. 2019-08-12 16:58:27 -04:00
Seeker4
edfbb692e9 Tweak format of date bar on Daily page slightly. 2019-08-09 23:14:32 -07:00
Seeker4
cd30fd73ab Release notes for Daily page date bar change 2019-08-09 23:00:17 -07:00
Seeker4
d375ab38f8 Merge branch 'master' into dateformat 2019-08-09 22:56:45 -07:00
Seeker4
83a01fa203 Date bar on bottom of Daily graph now in local time when no line cursor displayed, and formatting updated 2019-08-09 22:54:00 -07:00
Seeker4
83a1767789 Merge branch 'master' into graphs 2019-08-09 15:34:59 -07:00
Seeker4
fc3ec0d485 View/Reset Graphs now additionally enables all graphs and all event flags 2019-08-09 15:32:37 -07:00
harre
998eab6180 Another fix for deprecated-copy 2019-08-09 12:35:29 +02:00
Seeker4
a08798cda2 Merge branch 'master' into dateformat 2019-08-08 16:26:02 -07:00
Seeker4
ceba1e81eb Make date in calendar on Daily page format per regional settings. 2019-08-08 16:24:30 -07:00
harre
77ccd417a3 Fix deprecated-copy errors and made deprecated-declarations just a warning 2019-08-06 23:49:51 +02:00
sawinglogz
d99e397cb3 Update PRS1 parser for 500X, 600X, and 700X events. 2019-08-06 15:47:36 -05:00
Seeker4
5cf6e14816 Fix problems resulting in compiler warning messages 2019-08-06 12:33:48 -07:00
Seeker4
5e16e18b4c Merge branch 'master' into dateformat 2019-08-06 11:04:14 -07:00
Seeker4
75c0a9950a Format dates per national settings. 2019-08-06 10:51:14 -07:00
sawinglogz
7dd891df31 Add more F0V6 events based on remaining 400X sample data. 2019-08-05 21:37:19 -05:00
sawinglogz
64309f366a Add PRS1 model 562P to list of tested machines. 2019-08-05 20:46:05 -05:00
sawinglogz
84f1389d51 Support more F0V6 events based on all sessions from a single 400X machine. 2019-08-05 15:22:22 -05:00
sawinglogz
4e863ba484 Add first confirmed F0V6 events from sample data. 2019-08-04 21:09:42 -05:00
sawinglogz
bcce5f698d Merge branch 'fix-warnings' into prs1-f0v6 2019-08-04 20:26:03 -05:00
sawinglogz
6831af489c Fix warning where #include had different case from filename. 2019-08-04 20:22:24 -05:00
sawinglogz
d6da63bf8c Always treat warnings as errors, even (especially!) in release. 
Also rename the debug GUI build to "memdebug" to avoid colliding with
Qt's built-in debug build.
 2019-08-04 20:21:02 -05:00
sawinglogz
e0d4872f6b Create placeholder event parser for PRS1 F0V6, separate from other F0 machines. 2019-08-04 19:36:40 -05:00
Seeker4
3ec75dec09 Merge branch 'master' into progress 2019-08-04 08:39:37 -07:00
Seeker4
5697ac53e6 Use new CProgressBar class instead of QProgressDialog 2019-08-04 08:36:34 -07:00
Seeker4
686d83d5ab Update file list for new CProgressBar class 2019-08-04 08:35:40 -07:00
Seeker4
38a9d71560 Add C[onditional]ProgressBar class. 2019-08-04 08:33:32 -07:00
sawinglogz
2f2cb0e605 Add debug GUI build to track down crashes. 2019-08-03 15:09:41 -05:00
Seeker4
3c425d66e4 Correct computation of what AHI values are considered "close" 2019-08-01 12:55:21 -07:00
Seeker4
bd3c078dfb Merge branch 'master' into welcome 2019-08-01 11:59:32 -07:00
Seeker4
c2e95d51f6 Update 1.1.0-testing-3 release notes for recent changes 2019-08-01 11:57:24 -07:00
Seeker4
ec239edf69 Correct labels in Records tab of right sidebar 2019-08-01 11:56:28 -07:00
Seeker4
a7103efee0 Merge branch 'master' into graphs 2019-08-01 11:24:05 -07:00
Seeker4
8d7e5c7479 Simplify ResMed SD card lock message. 2019-08-01 11:21:57 -07:00
Phil Olynyk
f7227b7316 Don't create (summary) sessions when maskon == maskoff 2019-08-01 13:30:11 -04:00
Seeker4
c602fa7dcb Correct 7-day average calculations on Welcome page. 2019-07-31 10:31:08 -07:00
Seeker4
3b1414c37d When reverting to original graph order, reset any pins. 2019-07-31 08:40:20 -07:00
Seeker4
4532b22fc6 Add View/Reset Graphs to put graphs in original order and heights. Overlays and dotted lines are not yet reset. 2019-07-30 19:59:01 -07:00
Seeker4
d31095318a OSCAR 1.1.0-testing-3 Release notes and build number 2019-07-28 09:13:54 -07:00
Seeker4
eb756fd2c8 Improve RXChanges progress bar so it displays only if estimated time to completion is more than 4 seconds 2019-07-28 08:18:59 -07:00
Seeker4
fa875ed5ca Merge branch 'master' into progress 2019-07-28 07:08:27 -07:00
sawinglogz
9a1bccff57 Merge branch 'master' into prs1-improvements 2019-07-27 15:05:33 -04:00
sawinglogz
8ef4766efd Fix F3V6 imported channels to match reports. 2019-07-27 15:04:20 -04:00
sawinglogz
46a077cb43 Clean up remaining F3V6 import messages. 2019-07-26 22:53:15 -04:00
sawinglogz
5835e6de9c Remove commented-out F3V6 event code. 2019-07-26 22:29:23 -04:00
sawinglogz
56684de3bc Add support for more F3V6 events based on more sample sessions. 2019-07-26 22:13:26 -04:00
sawinglogz
eedd41efdf First pass at parsing F3V6 events, largely based on F5V3 and revised based on a sample session. 2019-07-25 21:44:36 -04:00
Seeker4
5eac97808e Add missing item to release docs for 1.1.0-testing-2 2019-07-25 14:57:25 -07:00
Seeker4
9a957e75e1 Merge branch 'master' into defaults 2019-07-25 06:32:05 -07:00
Seeker4
96ba683599 Show progress bar if recomputing rxchanges cache and looking at more than 180 days of data 2019-07-25 06:27:02 -07:00
Seeker4
f635302058 Improve performance of enabling or disabling pie chart option 2019-07-25 06:26:19 -07:00
Seeker4
751df7652a Diagnostic changes for a future feature 2019-07-25 06:25:03 -07:00
Seeker4
7785d7fc9c Change height and weight decimals displayed, BMI digits displayed 2019-07-25 06:23:24 -07:00
Seeker4
acd078cc82 OSCAR 1.1.0-testing-2 release notes and build number 2019-07-25 06:21:30 -07:00
Seeker4
d04c2ae8ba Add tooltip to Weight field to explain BMI calculation 2019-07-24 23:18:09 -07:00
sawinglogz
a2bcbf1b00 Fix pressure gain for F3V6 events and waveforms. 
Also change fileVersion == 3 tests to appropriate familyVersion for ASV and ventilators, respectively.
 2019-07-24 22:42:00 -04:00
sawinglogz
d33e7585bf Remove broken original F3V6 summary parser. 2019-07-24 16:51:50 -04:00
sawinglogz
9e54b98cf6 First pass at actual F3V6 (1030X, 1130X) summary and settings support based on sample data. Events are still broken. 2019-07-24 16:50:51 -04:00
Seeker4
4ffb621d09 Make decimal point more visible in BMI display on Daily/Notes tab 2019-07-24 09:17:59 -07:00
Seeker4
16200b46ca Change metric height in profile dialog to show it is measured in cm, not in meters. 2019-07-24 09:14:13 -07:00
Seeker4
844b33a4c3 Show indices for all events even if flags for an event is disabled 2019-07-24 09:12:05 -07:00
Seeker4
166ffa4970 Show BMI label and calculated value only when both weight and height are non-zero 2019-07-24 01:48:18 -07:00
Seeker4
376d04803a Show commit id in title bar for all except Release versions. 2019-07-24 01:47:15 -07:00
sawinglogz
872fe74008 Add stub F3V3 summary parser so that events and waveforms will still get loaded. 2019-07-23 20:54:39 -04:00
sawinglogz
83b80cb252 Restrict the current PRS1 F3 summary parser to F3V6, which is all it could (badly) handle anyway. 2019-07-23 20:54:25 -04:00
sawinglogz
1f56927695 Recognize additional PRS1 900X settings. 2019-07-23 12:52:41 -04:00
Phil Olynyk
1953a20cdd Added Romanian translation file 2019-07-22 17:21:11 -04:00
Seeker4
2568f79a99 Default right sidebar off, calendar off, pie chart off with new OSCAR folder. 2019-07-19 06:43:53 -07:00
Seeker4
b4a64fa8e6 Hide pie chart when taking screen capture. Refactor code in daily.cpp to make use clearer and save html for possible future use. 2019-07-18 22:39:08 -07:00
Seeker4
9d25359138 Version code and release notes for Oscar-1.1.0-testing-1 2019-07-18 22:37:53 -07:00
Seeker4
3f42053a1d Yet another attempt to calculate the number of months for Statistics page monthly view 2019-07-18 22:36:07 -07:00
Phil Olynyk
6fcc4e9af1 Add number of years times 12 to lastmonth - then trim to 12 max 2019-07-18 21:16:05 -04:00
Phil Olynyk
4ad282768c Merge branch 'master' into fix-png-profile 2019-07-15 16:55:19 -04:00
Phil Olynyk
335737259f Use mogrify to clean up png color profile for logo files 2019-07-15 16:42:08 -04:00
Seeker4
f6941843e8 Merge branch 'master' into defaults 2019-07-14 20:28:06 -07:00
Seeker4
11f2fb5d3f Change GraphSnapshots to ShowPieChart in code, UI, and preferences. Convert any existing GraphSnapshots preferences to ShowPieChart. 2019-07-14 20:25:49 -07:00
Seeker4
48b4d754b3 Add utility to rename a preference setting 2019-07-14 20:23:23 -07:00
Seeker4
39542ba7db Move Pie Chart option from Preferences dialog to View menu. 2019-07-13 14:53:57 -07:00
sawinglogz
d45c9f1449 Fix tests broken by 67ef9f29. 2019-07-13 09:59:57 -04:00
Seeker4
14611bd591 Change default order of graphs on Daily page. 2019-07-12 19:29:33 -07:00
Seeker4
8f5ed48ae8 Make sure tool buttons on Welcome page are repainted after a font change. 2019-07-12 19:28:57 -07:00
Seeker4
e2f5899fb8 Comment out a qDebug statement that is not normally needed and very voluminous when used. 2019-07-12 19:28:02 -07:00
Phil Olynyk
67ef9f291e Clean up by deleting unused threading code and re-grouping declarations 2019-07-12 15:58:14 -04:00
Phil Olynyk
b497b3ccbb QT 5.7 doesn't like comparison of naked chars - construct a QLatin1Char instead 2019-07-12 15:26:05 -04:00
Seeker4
5bf71e2a55 Fix problem with null font name. Forced default font for Mac will be Helvetica. 2019-07-10 21:35:14 -07:00
Seeker4
01f98d1583 Merge branch 'master' into fonts 2019-07-10 15:15:14 -07:00
Seeker4
be9ce5085b Do not allow private font to be used for other than Application on MacOS 2019-07-10 15:13:27 -07: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
a382733d7c Make Resmed card warning responsive to application font changes. 2019-07-09 07:14:00 -07:00
Seeker4
7dab22133b Merge branch 'master' into fonts 2019-07-05 14:30:26 -07:00
Seeker4
dbabc4cd58 Suppress duration on tooltip and event list if duration is zero (which usually means unknown duration as CPAP machine did not report it) 2019-07-05 10:29:57 -07: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
a424a1903e Add font validation and setting methods. Call at startup or after preference changes to force fonts to be acceptable to operating system and to set application font. 2019-07-04 18:21:16 -07:00
Seeker4
86d5c074a4 Set tool button fonts correctly if application font is changed. 2019-07-04 18:20:19 -07:00
Seeker4
087b18545f Centralize all font validation and setting into new functions in common.cpp. Add registry key to System Info (call it App Key for cross-platform compatibility). 2019-07-04 18:14:41 -07:00
Seeker4
94f71ad4c2 Make tool buttons in middle of screen respond to change in application font 2019-07-04 18:11:12 -07:00
Seeker4
e0c70bf082 Update date display on Overview page when font is changed in Preferences dialog 2019-07-02 08:25:47 -07:00
Seeker4
a464c5c2ca Refresh various displays to reflect any font changes made in preference settings. 2019-07-02 08:04:43 -07:00
Seeker4
5b047af0e3 After preference setting, update font of timestamp at bottom of graphs 2019-07-02 08:01:20 -07:00
Seeker4
3e30850b75 Fix some incorrect HTML 2019-07-01 21:47:09 -07:00
Seeker4
358830d364 Remove HTML font settings so font is controlled by application settings and not a hard-coded font. 2019-07-01 21:45:01 -07:00
Seeker4
a9c3b363b9 Add some qDebug() statements for invalid start dates 2019-06-30 08:59:29 -07:00
Seeker4
6a7661f516 Fix crash in CPAP rebuild byt ignoring Day entry with first = 0. 2019-06-30 08:57:16 -07:00
Seeker4
85efcace3e Add a qDebug() statement if start date for an EDF file is zero. 2019-06-28 19:53:46 -07:00
Seeker4
21c9730888 Cosmetic changes to qDebug() statements. 2019-06-28 19:52:25 -07:00
Seeker4
828a8705ab Improve qWarning to have more data when discarding a session with first=0 2019-06-28 19:51:14 -07:00
Seeker4
b943356619 Add some qDebut statements for version mismatch. 2019-06-28 19:50:23 -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
43462f39d3 Correct typo in comment 2019-06-24 10:12:43 -07:00
Seeker4
a30aa74099 Improve qWarning message to show timestamps causing the warning. 2019-06-24 10:08:53 -07:00
Seeker4
eaa93a2ff9 Improve error message on Statistics page when no data is found. 2019-06-24 10:07:40 -07:00
Seeker4
775eefee71 Allow a Windows path with drive letter to be used as an argument for --datadir 2019-06-24 10:05:58 -07:00
Seeker4
641ebbde54 Merge branch 'master' into printing 2019-06-22 18:22:57 -07:00
Seeker4
461abde2e6 Better qDebug messages when rebuilding data 2019-06-21 22:09:19 -07:00
Seeker4
bee6364c5e Write date and time OSCAR started to debug log 2019-06-21 22:08:44 -07:00
sawinglogz
43ec3ab4af Fix a few PRS1 unused variable warnings that only gcc catches. 2019-06-21 21:04:16 -04:00
sawinglogz
581515e595 Merge branch 'master' into prs1-fixes-2 2019-06-21 15:26:57 -04:00
Seeker4
1b87dda460 Improve qdebug statement identifying printer font 2019-06-21 11:57:22 -07:00
Seeker4
6a4c947569 Merge branch 'master' into printing 2019-06-21 11:06:53 -07:00
sawinglogz
2e6cdd6de9 Fix conflict between private fonts and QFontComboBox. 
This fixes an issue where the default application font on macOS
would get reset if a user saved their preferences.
 2019-06-21 11:49:55 -04:00
Phil Olynyk
e210813156 Remove Q_WS_X11 from main.cpp and change it to Q_OS_LINUX in reports.cpp 2019-06-21 11:02:35 -04:00
Phil Olynyk
41efbcab38 Remove bash file that chanced PlaceholderText to Text 2019-06-21 09:23:39 -04:00
Phil Olynyk
cb68e48bda Remove colorrole PlaceholderText from mainwindow.ui 2019-06-21 09:20:51 -04:00
Seeker4
7003afcc64 Force fonts for Statistics page and printing. 2019-06-20 16:13:04 -07:00
sawinglogz
ea638cdbbb Update PRS1 series detection to use model name. 
Also fix an issue with initializing the model names, since QObject::tr
won't work at global initialization time. And series detection needs
the untranslated names anyway.
 2019-06-20 00:09:28 -04:00
sawinglogz
5a71e96ed6 Remove unused PRS1 code, add series to model names where missing. 2019-06-19 23:23:15 -04:00
sawinglogz
628ddda472 Fill out remaining PRS1 names as shown on official reports. 
Also clean up brick detection.

The official names don't yet appear anywhere, since there's a question
of how to juggle manufacturer, series, and model name in the various
places they're (inconsistently) displayed.

Series is also used to pick the machine icon.
 2019-06-19 22:19:16 -04:00
sawinglogz
423bfccc5a Add a few comments for future 900X improvements. 2019-06-19 17:50:41 -04:00
sawinglogz
ec73958b4a Add leak to 900X, clean up summary stats and old implementation. 2019-06-19 17:28:42 -04:00
sawinglogz
d9152436de Add missing 900X events based on sample data. 
They're not all fully understood, such as a pressure adjustment
variant and  several different hypopnea variants, one of which
has an extra data field.
 2019-06-19 16:23:28 -04:00
sawinglogz
264ff2f2fa Add comments to 900X parsing based on sample review and discussions. 2019-06-17 17:33:39 -04:00
Seeker4
d7cad5471f Minor tweaks to cell and row spacing to improve printed report. Negligible effect on screen view. 2019-06-16 15:30:39 -07:00
sawinglogz
a7f249218f Fix start time for 900X TB, PB, and LL. 
It turns out OSCAR silently treats span events' timestamps as
and end time when drawing.
 2019-06-15 21:45:58 -04:00
sawinglogz
4e5174343e First pass at 900X event parsing and clean up F5V3 pressure gain throughout. 
This fixes the mask pressure graph as well as many of the events.
There are still some issues with presentation: some of the events are
being drawn at the wrong time, and certain events and statistics
don't really behave the way they're displayed.

Also several events have yet to be encountered in sample data.
 2019-06-15 21:04:09 -04:00
Phil Olynyk
8b6d11f6f4 Merge branch 'master' into fix-cms50dplus 2019-06-15 19:11:06 -04:00
Seeker4
aabd97d537 Correct loss of previous changes. 2019-06-15 15:09:04 -07:00
Phil Olynyk
3f555177c4 Tweak the oximeter import ui for the CMS50D+ 2019-06-15 15:59:11 -04:00
Phil Olynyk
73a225556a Fix date and time handling for new CMS50Dplus model 2019-06-15 15:42:47 -04:00
Seeker4
41c7d43f7b Print Statistics report with pagination, larger font on landscape orientation. 2019-06-15 11:58:02 -07:00
Seeker4
aa8e3bd9e5 Partial code for printing in blocks of html. 2019-06-14 21:17:43 -07:00
sawinglogz
fcd7f8d463 Finish cleaning up 900X summary parsing. 
There are still unknown values, but they'll need to be tracked down
after events are cleaned up. They no longer emit warnings.
 2019-06-13 22:20:34 -04:00
sawinglogz
b1d76becab Fill in some 900X summary statistics values. 2019-06-13 21:29:43 -04:00
sawinglogz
2634aa0d16 Initial support for 900X summary. 
Pressure settings are now properly being found and decoded, but there are lots
of unknown fields to figure out.

It turns out it uses the same humidifier setting encoding as F0V6, and the first
several slices seem to be the same. But pressure encodings are different, with
a gain of 0.125 instead of 0.1, presumably to allow for a maximum pressure of
30 cmH2O.
 2019-06-13 20:31:21 -04:00
Phil Olynyk
589eec69ec Merge branch 'master' into fix-cms50dplus 2019-06-13 14:09:51 -04:00
Phil Olynyk
cef3827658 Merge branch 'master' into fix-linux-stats 
Get all of sawinglogz PRS changes.
 2019-06-13 13:41:09 -04:00
Phil Olynyk
917890e077 Fix errors in linux conditional code 2019-06-12 23:27:46 -04:00
sawinglogz
36c4277556 Merge branch 'master' into prs1-fixes 2019-06-12 22:31:07 -04:00
Seeker4
c1d73636a2 Merge branch 'master' into printing 2019-06-12 18:38:54 -07:00
Seeker4
6dfb8fda6e Change #ifdef Q_WS_X11 to Q_OS_LINUX. 2019-06-12 18:37:06 -07:00
sawinglogz
52fd3a46d3 Merge branch 'master' into prs1-fixes 2019-06-12 20:37:26 -04:00
sawinglogz
4527a7091d Clean up remaining DreamStation parsing warnings. 2019-06-12 20:37:04 -04:00
Seeker4
575b9a5372 More refactoring and re-organizing. 2019-06-12 13:32:22 -07:00
sawinglogz
d0903ce3bd Add initial support for DreamStation Auto-Trial and CPAP-Check modes. 
This resolves many of the unexpected value warnings in the sample
data, but there are still a bunch to tackle.
 2019-06-11 21:26:40 -04:00
Seeker4
a628e2a9ff Move statistics printing code from mainwindow.cpp to statistics.cpp. Abandon printing of Help subsystem pages. 2019-06-11 16:43:13 -07:00
Seeker4
a4abb7d5d6 Break monolithic statistics page html into separable components. 2019-06-11 11:34:00 -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
b6427de247 Add moule name to debug, force tab enable after import 2019-06-11 10:30:51 -04:00
Seeker4
610c935191 Correct error in calculating number of periods in monthly report. 2019-06-11 06:28:34 -07:00
sawinglogz
99cbe89f3e Merge branch 'master' into prs1-fixes 2019-06-10 20:59:25 -04:00
sawinglogz
2383c11be2 Minor clean up of F0V6 summary parsing, fix GUI build bug. 2019-06-10 20:57:05 -04:00
sawinglogz
96815cb068 Add support for 700X summary data. 2019-06-10 20:30:05 -04:00
sawinglogz
4e8a6514ef Add support for 600X summary data. 2019-06-10 15:30:22 -04:00
sawinglogz
92f029a5f4 Add support for 502G summary data. 
Not many changes, just some new unknown settings, and warning
when there's a 0-length slice.
 2019-06-10 15:07:20 -04:00
sawinglogz
a66dd145b8 Add support for 500X summary data. 
This one's slice 8 is shorter than anything else we've seen before!

Also add support for a new slice type and noted possible values
for other data, including a possible lead on the CPAP mode.
 2019-06-10 14:30:50 -04:00
sawinglogz
2120289792 Add support for 400G summary data. 
Interestingly, it looks like settings and other slices can be of
varying length, even on the same machine. Stranger still, sometimes
the list of possible slices can change on the same machine.
 2019-06-08 21:36:51 -04:00
Phil Olynyk
d3c10ca745 Add shell file to fix UI files for old QT versions - uses sed (Linux only) 2019-06-08 17:48:36 -04:00
sawinglogz
08ad973a6a Wrap up of 400X summary for now. 
Mostly this is commenting out warnings about values that are different
for every session. They can be sorted out later.

Humidifier status and tube temperature are cleaned up as well.
 2019-06-08 14:45:57 -04:00
sawinglogz
2a82ee09d6 Refinement of 400X summary data. 
Fixed a bug in the ramp pressure setting, identified the mask resistance
setting, and found the summary equivalent of the humidifier setting change
slice.
 2019-06-08 14:21:54 -04:00
sawinglogz
e41515891b First pass at fixing 400X summary data. 
This is mostly a cut-and-paste of the ParseComplianceF0V6,
but the some of the slice codes and sizes are different.

Also start adding machine names for tested models.
 2019-06-07 22:05:52 -04:00
sawinglogz
c93932664c Use decimal session IDs for chunk YAML file names, add original file path to YAML. 2019-06-07 21:12:55 -04:00
sawinglogz
2ace7d3a6d First pass at PRS1 200X humidifier settings. 
Some of the values still aren't known, and OSCAR doesn't yet define
a channel for heated tube temperature.
 2019-06-07 16:40:26 -04:00
sawinglogz
250566f3f2 Refinement of 200X compliance data. 
The new slice type appears when humidifier settings have changed during
the session, and includes a timestamp. The session time now matches
reports.

Otherwise just comments to indicate other values seen in the sample data,
including a lead on humidifier encoding.
 2019-06-07 16:03:20 -04:00
sawinglogz
ff4ec4fdab Create slices for 200X compliance data, along with first confirmed settings. 
There's a new slice type to be examined and additional settings remain
that vary within the sample data.
 2019-06-07 14:32:53 -04:00
sawinglogz
ca23791414 First pass at 200X compliance data. 
Lots of debug messages and unknown values, but the structure seems right.

This is largely based on a combination of the mainblock parsing for fileVersion 3
as found in ParseSummary() and the switch statements of ParseSummaryF0V6,
based on our understanding of slices from F0V23. The slice types here
come from sample 200X files.
 2019-06-07 14:32:00 -04:00
Seeker4
c684eebca7 Change method of identifying the graphics engine currently in use. 2019-06-07 05:14:07 -07:00
Seeker4
b92502ac63 Make pointer to data directory in System Information message box be clickable to open the directory. 2019-06-07 05:00:23 -07:00
sawinglogz
7a00009a56 Add result of parsing/importing to PRS1 chunk and session YAML. 2019-06-06 16:50:40 -04:00
sawinglogz
330bdb6fb3 Split ParseCompliance into F0V23 and F0V6. 
Also add some debug messages to FV3 parsing. It's clear the current
approach is wrong. This looks a lot like the slices seen earlier,
since hbdata values appear more than once in a given file.

Also turn off summary YAML since the next bit of work will focus on
parsing.
 2019-06-06 16:08:40 -04:00
sawinglogz
ce38fbcdde Restore session end time to previous behavior, with better logging and documentation. 
It turns out the session end time was intentionally not being set in ParseSummary,
probably due to its unreliability. This may be revisited once things are more
stable, but for now the old behavior is retained.
 2019-06-05 17:08:45 -04:00
sawinglogz
fd6f3c3f0a Resolve new PRS1 warning messages, add the missing session end time in ParseSummary. 2019-06-05 11:12:08 -04:00
sawinglogz
092d46be33 Add debug messages for exceptional events in PRS1Import::ParseSession. 
Lots of new warnings that were being silently eaten!
 2019-06-05 10:24:32 -04:00
sawinglogz
8fa5df5f89 Fix PRS1 typo, resolve use of multiple event lists and refine warning. 2019-06-05 10:00:11 -04:00
sawinglogz
44d134dee5 Fix a sign error and don't consider 1-second gaps to be BND events in PRS1. 
Presumably due to clock drift, there are occasionally 1-second discontinuities
in waveform data, in either direction. These will need to be addressed.
 2019-06-05 08:34:36 -04:00
sawinglogz
c2b8699ee9 Chase down all unusual values in F0V23 summary sample data. 
Chunk parsing is now a lot quieter, and PS for non-auto bilevel has been fixed.
 2019-06-04 23:19:35 -04:00
sawinglogz
d80426af5e Add slices to PRS1 F0V23 summaries. 
This doesn't have much observable effect, other than reducing a
day's total usage time if there are periods with no breathing
detected. Most of the shortcomings were obscured by information
gleaned from the events and waveform files.
 2019-06-04 20:26:43 -04:00
sawinglogz
5ac6745eef Fix PRS1 F0V23 PB parsing bug that triggered unordered data warnings. 
A PB event obviously can't start so late that its duration ends in the future!
The fix hasn't been applied to F0V4 or F0V6 yet, since those haven't been
tested yet.

Also fix a sign bug in EventList::AddEvent when there *is* unordered data.
 2019-06-04 20:11:50 -04:00
sawinglogz
2021e91426 Fix parsing PRS1 F0V2 settings and add value checks based on a few sample sessions. 2019-06-04 12:18:20 -04:00
sawinglogz
27c169e61e Report parsing failure when PRS1 sanity checks fail. 
Remarkably, this resulted in nearly no changes to the test output.
Only one session with 0 duration had its start/end times reset to 0,
since it will no longer get imported.
 2019-06-03 22:01:02 -04:00
sawinglogz
26f6e15a75 Add YAML output for session slices. 2019-06-03 20:56:40 -04:00
sawinglogz
1a0a4bbf52 Convert compliance "slices" to events with a starting delta. 
Also fix the related enums and add more value checks.
Also add YAML output of the cumulative mask-on slice time.
 2019-06-03 20:12:17 -04:00
sawinglogz
a6455b6b05 Add sanity check for presumed humidifier setting in compliance. 
Also suppress "untested" user alerts for a known bogus model number.
 2019-06-03 14:21:06 -04:00
sawinglogz
66585d939e Chase down all unusual values in 251P compliance sample data. 
The big discovery is that slices aren't slices with durations,
they're events with a starting delta.
 2019-06-02 21:50:45 -04:00
Seeker4
8dd04397cc Show hours/day that defines compliance on Statistics screen. Update Welcome message to show usage in red if hours less than profile setting (was less than 4). 2019-06-02 17:48:27 -07:00