Commit Graph

2637 Commits

Author SHA1 Message Date
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
Seeker4
575b9a5372 More refactoring and re-organizing. 2019-06-12 13:32:22 -07: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
564d6a4784 Merge branch 'Seeker4/OSCAR-code-Statistics' into HEAD
Auto fast-forward failed at gitlab.com.
2019-06-11 10:10:44 -04:00
Seeker4
610c935191 Correct error in calculating number of periods in monthly report. 2019-06-11 06:28:34 -07: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
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
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
Seeker4
269daffaac Merge branch 'master' into titlebar 2019-06-02 10:31:21 -07:00
Seeker4
b2a5c4d48e Slight reformatting of instructions for submitting a merge so I can find it in the document more easily! 2019-06-02 10:28:55 -07:00
Seeker4
f4f1a4a002 Clearly separate build data from run-time data. 2019-06-02 10:24:17 -07:00
Norman Heino
af31b87889 Graph combo box: always adjust size to contents
Fixes 0000021
2019-06-02 07:51:11 +02:00
Seeker4
59270e00c6 Add Help/System Information to display full build information, active graphics engine, and data directory. 2019-06-01 19:51:18 -07:00
Seeker4
9561e56ad9 Make xxxBuildInfo functions to create and return build information. 2019-06-01 15:12:38 -07:00
Seeker4
86d0c11ddd Remove GIT revision and graphics engine from titlebar (info remains in debug log). Retain [Branch] and [LegacyGFX] for a BrokenGL build. 2019-06-01 07:57:28 -07:00
Seeker4
91bf0d097e Write build and other identifying information to the beginning of the debug log. 2019-05-31 21:15:56 -07:00
Seeker4
a2232d4b61 Merge branch 'master' into Legacy 2019-05-31 16:04:33 -07:00
Seeker4
fdb46b621f Remove legacy editing script as shift key when OSCAR launch will force software graphics engine. 2019-05-31 16:02:55 -07:00
Seeker4
98df2c9a46 Force use of Software graphics engine (aka LegacyGFX) if shift key held down during program start or --legacy command line parameter present. 2019-05-31 15:50:16 -07:00
sawinglogz
bc3b93cf9c Merge branch 'master' into prs1-split-parsing 2019-05-30 16:33:55 -04:00
sawinglogz
f62d99bb31 Add machines to tested PRS1 list, alert user if their machine is untested.
This introduces a very slight change UI behavior, where the user
will receive an alert if their machine has a supported family/version
but is a model number for which we don't have any test data.

Also, the user alert for an unsupported machine has been updated
to align with the actual underlying parsing limitations. It's
possible this will create some new warnings, but it doesn't seem
like any such machines would have worked anyway, in which case
an explanatory message is an improvement.

The "untested" alert will happen on import once per launch of OSCAR.
Ideally this would only happen the first time an untested machine is
imported, but that will require figuring out how to serialize an
additional value in the user's machine profile.
2019-05-30 16:32:57 -04:00
Seeker4
76e6f44991 Calculate compliance as number of compliant days / total number of days (instead of days used) so statistics matches overview calculation. 2019-05-29 19:35:19 -07:00
sawinglogz
135ac25c1e Add YAML output for PRS1DataChunks.
Also move a data check from PRS1Import::ImportSummary to PRS1DataChunk::ParseSummary
to prevent crashing in regression tests.
2019-05-29 12:11:53 -04:00
sawinglogz
ea008273ab Add PRS1DataChunk::ParseEvents for testing and future unification. 2019-05-29 11:20:20 -04:00
sawinglogz
d0150d18ef Limit raw data in PRS1/Session YAML to 100 bytes per entry.
This changes the reference output, compared to prior versions, but
it runs much faster and doesn't affect user-observable behavior.
2019-05-28 21:09:17 -04:00
sawinglogz
1892ceda85 Clean PRS1ParsedEvents and reorder PRS1Import::Parse*Events for more consistency, no functional changes. 2019-05-28 18:25:08 -04:00
sawinglogz
7c949fc843 Convert PRS1ParsedEvent enums to static constants, update switch statements. 2019-05-28 16:05:23 -04:00
Seeker4
c438ef3872 Merge branch 'master' into Statistics 2019-05-27 11:24:18 -07:00
Seeker4
020678f2f1 Documentation additions. 2019-05-27 11:22:38 -07:00
sawinglogz
3b4a5b4dd6 Clean up PRS1Import::ParseF*Events functions in preparation for merging, no functional changes. 2019-05-27 12:38:55 -04:00
sawinglogz
685527b993 Remove unused ParseSummaryF* functions, move ParseSummary from PRS1Import to PRS1DataChunk. 2019-05-27 11:14:55 -04:00
sawinglogz
e47c4934ef Merge PRS1Import::ParseSummaryF* functionality into PRS1Import::ImportSummary.
Only PRS1Import::ParseSummaryF0V23 has disappeared, being merged into
ImportSummary. The only change it needed to subsume the functionality of
all other variants was the addition of one extra setting.

The rest of the now-unused variants will be removed next.
2019-05-27 11:05:34 -04:00
sawinglogz
44e4b25471 Move PRS1Import::ParseSummaryF0V23 in preparation for merge; no changes. 2019-05-27 10:28:14 -04:00
sawinglogz
4d1b947e22 Split PRS1Import::ParseSummary into ImportSummar/ParseSummary. 2019-05-27 10:25:57 -04:00
sawinglogz
e3a4edaca2 Add PRS1ModelInfo to manage the set of supported and tested machines.
Also move an extra unsupported check out of PRSImport::ImportSummary
into CreateMachineFromProperties, where it should intervene before
reaching PRS1Import. Leave a warning debug message in its place.
2019-05-27 10:05:16 -04:00
Norman Heino
d2eccabbc7 Fix disabling dark mode on macOS Mojave 2019-05-27 05:51:44 +02:00
sawinglogz
739ba7d5d5 Clean up ParseSummaryF5V3 to align more closely with all other summary parsers. 2019-05-26 19:02:08 -04:00
sawinglogz
44558e4c06 Merge redundant code into single PRS1DataChunk::ParseHumidifierSetting function. 2019-05-26 18:46:26 -04:00
sawinglogz
d13b417d5b Fix regression from eb758602 that was missed by the initial testing. 2019-05-26 17:43:10 -04:00
sawinglogz
923fb7bf86 Merge redundant code into single PRS1DataChunk::ParseFlexSetting function. 2019-05-26 17:36:12 -04:00
sawinglogz
53f1a881a3 Split parsing from importing for compliance (brick) data.
This isn't fully tested yet, since I don't currently have fileVersion 2 samples.
It has been tested with 200X devices and doesn't change behavior there,
but the slice parsing immediately bails, so it's not really being exercised.

It seems very weird that "slices", whatever they are, would only show
up on bricks, the least capable devices. This needs more investigation.
2019-05-26 14:17:58 -04:00
Norman Heino
6b7fe4c8f2 Fix use-after-free in Profile::UnloadMachineData 2019-05-26 17:18:42 +02:00
sawinglogz
eb75860221 Split parsing from importing for F0V2 and F0V3 summaries. 2019-05-25 21:57:29 -04:00
sawinglogz
7a153a6516 Split parsing from importing for F0V4 summaries. 2019-05-25 21:25:56 -04:00
sawinglogz
e49c947b6b Split parsing from importing for F0V6 summaries. 2019-05-25 21:08:53 -04:00
sawinglogz
b6c35c7610 Split parsing from importing for F3 (probably V6) summaries.
This looks discouragingly redundant at first glance, but eventually
the import stage will probably be unified across all families, leaving
the parsers the only difference. That'll happen after all summary
importers have been split.
2019-05-25 19:43:35 -04:00