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
2,806 Commits 1 Branch 56 Tags 66 MiB
84f1389d51
Commit Graph

395 Commits

Author SHA1 Message Date
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