diff --git a/OSCR_QT.pro b/OSCAR_QT.pro similarity index 53% rename from OSCR_QT.pro rename to OSCAR_QT.pro index a7b2f34c..df4e72bb 100644 --- a/OSCR_QT.pro +++ b/OSCAR_QT.pro @@ -1,12 +1,12 @@ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { - message("You need to Qt 5.9 or newer to build OSCR with Help Pages") + message("You need to Qt 5.9 or newer to build OSCAR with Help Pages") lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,7) { - error("You need Qt 5.7 or newer to build OSCR") + error("You need Qt 5.7 or newer to build OSCAR") } } TEMPLATE = subdirs -SUBDIRS += oscr +SUBDIRS += oscar CONFIG += ordered diff --git a/oscar/docs/about.html b/oscar/docs/about.html index ce82d8cd..73310ecf 100644 --- a/oscar/docs/about.html +++ b/oscar/docs/about.html @@ -4,42 +4,42 @@


-

- Welcome to Open Source CPAP Reviewer

-


-

+

+ Welcome to Open Source CPAP Analysis Reporter

+


+

This software has been designed to assist you in reviewing the data produced by your CPAP machines and related equipment.

-


+


-

+

PLEASE READ CAREFULLY

-


-

+


+

OSCR is NOT a substitute for competent medical guidance from your Doctor.

-


-

+


+

Due to the lack of documentation released by manufacturers regarding file formats, accuracy of data displayed in OSCR can not in any way be guaranteed.

-


-

+


+

Any reports generated are for PERSONAL USE ONLY, and are NOT IN ANY WAY fit for compliance or medical diagnostic purposes.

-


-

+


+

Use of this software is entirely at your own risk. The authors will not be held liable for anything related to the use or misuse of this software.

-


+


-

+

OSCR is free (as in freedom) software, released under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose.

-


-

+


+

OSCR is copyright ©2011-2018 Mark Watkins

-

+

and portions ©2019 Nightowl Software

-


+


diff --git a/oscar/docs/changelog.txt b/oscar/docs/changelog.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index 2226acb4..92a8099a 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -20,216 +20,9 @@

-Changes and fixes in SleepyHead v1.1.0-unstable-0 - -

  • New help browser with indexing and multilanguage support -
  • Killed off dependency on Webkit... (or as I prefer to call it "murderalized with extreme prejudice"!)
    • -
  • Combined release notes and about into mega dialog
    • -
  • Added brand new live Profile switcher and cleaned up a lot of forced restart conditions
    • -
  • [DeVilbiss] Added DV6 Import capability (Thanks Heynes and Brian)
    • -
  • [PR Dreamstation] Added spuport for newer 960T (DF3 F5V3) and 1030 (DFV3 F3V3) machines
    • -
  • Fix language change glitch affecting Channel names
    • -
  • Fix a heap of miscellanious crash conditions
    • -
  • Cleaned up Welcome page removing what could be constituted as dodgy advice
    • -
  • Added Afrikaans language support
    • -
  • Applied a bunch of bugfixes that were provided by the community (Thanks Pholy, h-uchiy, François Revol & Kevin Lewis)
    • - +OSCAR is based on SleepyHead v1.1.0-unstable-0 +Which was written and copyright 2011-2018 © Mark Watkins

    -
    -

    -Changes and fixes in v1.0.0-beta-2 - -

  • [PR S1/Dreamstation Importer] Periodic Breathing/CSR was not Doubling on F0V4 560 machines
    • -
  • [Core Program] Fix program crash on changing language or profile
    • -
  • [PR S1/Dreamstation Importer] Added PRS1 BiPAP AutoSV 960T F5V2 support
    • -
  • [ResMed Importer] EPR erroneously shown as OFF instead of 3
    • -
  • Redesign autoupdater so it parses Qt Installer Frameworks XML structures
    • -
  • Reset Channel names on language change
    • -
  • Improve Tooltip timeouts in preferences
    • -
  • Fix some untranslateable strings and spelling mistakes
    • -
  • Fix a couple of minor Time at Pressure chart/tooltip glitches
    • - -

    -
    - -

    -Changes and fixes in v1.0.0-beta-1 - -

  • Added AirCurve/AirSense machine settings
    • -
  • Replaced the By Pressure text abomination with a proper Time at Pressure chart
    • -
  • Redid Unintentional Leaks calcluations using a simple Mask Profile in Preferences
    • -
  • Make Release Notes welcome message translate-able (should the changelog be too?)
    • - -

    -
    - -

    -Changes and fixes in v1.0.0-beta-0 - -

  • Tons of other bug fixes
    • -
  • Fix dodgy PRS1 ASV pressure settings
    • -
  • Resolve duplicate RX changes issue
    • -
  • PRS1 1060P support... (No flow waveform on these, but still pretty good) -
  • Philips Respironics DreamStation support (Thanks for your assistance JediBob and PaleRider, and everyone who shared their data!) -
  • AirCurve pressure reporting glitches
    • -
  • Fix F&P Import hang
    • -
  • Pinch to zoom support
    • -
  • Timezone/UTC fixes (Thanks Reznet!) -
  • Various ResMed region specific fixes
    • - -

    -
    - -

    -Bug fixes in v0.9.8-1 - -

  • Made daily view left panel, and the right sidebar size changes persitent
    • -
  • Windows build related fixes
    • -
  • Increase brightness steps between barchart segments
    • -
  • Put Export CSV back
    • -
  • Do not save over machine.xml if profiles has an machines section but machines.xml is present
    • -
  • Fix PRS1 model numbers not ending in 'P' refusing to import
    • -
  • Show Model number in rx changes list instead of loader name
    • -
  • Only Resmed CPAP/APAP modes have EPR
    • -
  • Fix PRS1 4x0P models accidentally being called Plus instead of Pro
    • -
  • Fix Profile delete not removing row properly
    • - -

    -
    - -

    -New features & bug fixes in v0.9.8-0 - -

  • Rework of Records box
    • -
  • Initial support for Philips Respironics System One Oximetry attachment
    • -
  • Removed old unused Mask Preferences and other junk
    • -
  • Complete Overview SummaryChart overhaul
    • -
  • Prescription changes now caches to disk to save having to reload all data every time
    • -
  • Implemented Demand loading for SleepyHead Summary data files
    • - -

    -
    - -

    -New features & bug fixes in v0.9.7 - -

  • Experimental ResMed AirSense S10 import support
    • -
  • F&P Icon timestamp fix, thanks to Roy Stone for the patch!
    • -
  • New Feature: Create independant temporary Graph Clones, which you can explore seperately, even carry over to another day
    • -
  • Split events and waveforms up in preferences, and sorted by machine type
    • -
  • Removed the old graph tab in preferences, as it's no longer needed
    • -
  • Graph YAxis scaling can now be adjusted easily in the right click menu
    • -
  • New Feature: Added toggle-able linechart Event-flag overlays
    • -
  • New Feature: Added toggle-able Graph Plots when multiple plots present
    • -
  • New Feature: Added toggle-able Dotted lines for each graph for various purposes
    • -
  • New Feature: Added right-click popup menu in Y-Axis and title graph area
    • -
  • Support for importing from CMS50F and CMS50I via cable. Thanks François Revol and Michael Masterson for their amazing help! -
  • Fix duplicate Ti/Te graphs on VPAP Adapt
    • -
  • New Graph: Time at Pressure
    • -
  • Less ugly code hardwiring and more automatic smarts, plus better channel color and name consistencies underneath.
    • -
  • Daily panel (left) Sidebar can be toggled on/off with F9
    • -
  • Calendar can now be toggled on/off with f10, your preferences will be kept
    • -
  • Fixed screenshot in non fullscreen on Windows & Linux.. now autohides the calendar and right sidebar.
    • -
  • Press Alt-B while selecting in daily view to quickly add a bookmark without having to zoom in
    • -
  • New Feature: Can now edit channel information, including names, colors, etc. in preferences
    • -
  • Tooltips showing relevenat information when hovering over events on daily charts
    • -
  • New Feature: Large Leak flagging where not present, using redline threshold
    • -
  • New Feature: Can switch off individual daily view linechart event overlays in a combo box down the bottom left
    • -
  • New Feature: Events are now visible on all daily charts in line cursor mode
    • -
  • Fix an issue that caused some burried PRS1 session data to not be imported
    • -
  • Fix a lot of pressure and pressure relief strings
    • -
  • New Feature: Added (very experimental) Weinmann SOMNOsoft2 Import importer
    • -
  • Fixed inverted CMS50 .spoR file pulse and spo2 -
  • Added CMS50i .spo2 file import support
    • -
  • New Feature: Added a Welcome page to make things a little friendlier
    • -
  • Fixes another issue that caused session dupplicates on ResMed machines
    • -
  • Improved support for Intellipap BiLevel machines
    • -
  • New Feature: Press Ctrl-L (Cmd-L on Mac) to switch on/off a "line cursor", and display current graph information above graphs while hovering over graphs
    • -
  • New Feature: Preference option to Realign machine detected codes and fix dodgy PRS1 durations using user event flagging.
    • -
  • New Feature: Added second set of User Flags detection and preferences.
    • -
  • New Feature: Hit Escape key to go back through previous graph selection history
    • -
  • New Feature: Hold Alt while selecting a graph area with the mouse, pauses till you release the key, to allow you to take another attempt.
    • -
  • Fixed changing languages clobbering graph settings
    • -
  • Import now remembers last place you imported from
    • -
  • Lock files are now used to help protect the same profiles being open multiple times
    • -
  • Fixed a rare PRS1 duplicate session issue affecting multi-chunk files
    • -
  • Fixed ResMed STR.edf DST crossover bug causing duplicate sessions
    • -
  • Added PRS1 SD Card automatic backup functionality
    • -
  • Stopped faulty statistics calculations where only summary data was present (For now it should show zero where calculations are impossible)
    • -
  • Added .spo2 file import support for firmware 3.7 CMS50F oximeters.
    • -
  • Some pre-v3.7 firmware CMS50 oximeter serial importer improvements
    • -
  • Fixed ResMed AutoSet minimum pressure not displaying correctly
    • -
  • Fix ResMed EPR setting display
    • -
  • Restore display of MaskPressureHi plots when available
    • -
  • Fix wiki URL's thanks to sourceForge forcing move of SleepyHead's wiki
    • -
  • Fix ResMed importer crashes, finished rewriting stage2 multithreading code
    • -
  • Made database upgrade/purge process a bit more friendly (Keep your backups switched on!)
    • -
  • Fixed a SleepyHead summary error that prevented count indexes from being stored properly
    • -
  • Some other minor fixed and stuff
    • - -

    -
    - -

    -New features & bugs fixes in v0.9.6 - -

  • Threadsafety improvements to debug/logger
    • -
  • Multithreaded PRS1 and ResMed loader improvements
    • -
  • Minor user interface tweaks
    • -
  • Added ChoiceMMed MD300W1 Oximeter file import support
    • -
  • Graph Preferences min/max settings are now honoured correctly
    • -
  • Complete Rewrite of CMS50 Importer
    • -
  • Completely redesigned Oximetry with new Import Wizard
    • -
  • Improved data Purge and Reimport from backup abilities
    • -
  • Improved ResMed STR.edf summary import support
    • -
  • Several Fisher & Paykel Icon improvements (including automatic backup)
    • -
  • Switched from raw OpenGL to Qt QPainter wrapped backend
    • -
  • Switched to Qt's pixmap caching engine
    • -
  • Fix ResMed session grouping bug that caused session double-ups
    • -
  • Fix EDF importer glitch on windows builds that led to faulty graph displays
    • -
  • Fixed CPAP card autoscanner on Windows platform
    • -
  • Added timeout dialog to CPAP card autoscanner
    • -
  • Microsoft compiler fixes
    • - -

    -
    - -

    -New features & bugs fixes since v0.9.5 - -

  • Added ability to pin graphs to keep them on screen
    • -
  • Fixed tranlation loading on Mac
    • -
  • Updated Dutch Tranlsations (Thanks Arie)
    • -
  • Fixed overview graph legends showing wrong details
    • -
  • F12 to Screenshot restored on Apple Mac platform
    • -
  • Added CSV importer for Somnopose iOS Sleep Position application data
    • -
  • Added user information to Statistics page
    • -
  • Datacard autodetection ability
    • -
  • Philips Respironics 60 series fixes
    • - -

    -
    - -

    -New features & bugs fixes since v0.9.3 - -

  • Retina display fixes for Mac platform
    • -
  • Introduced yAxis Scaling modes
    • -
  • Cleaned up mouse handling underneath
    • -
  • Better ResMed SD card backups
    • -
  • New Profile selection screen
    • -
  • Fixed inconsistency with graph legend markers
    • -
  • Improved CMS50 Oximetry serial importing, including support for CMS50E & F models
    • -
  • The foundations of loadable translations for non-English speakers
    • -
  • Better Fisher & Paykel ICON support
    • -
  • Printing works on Mac OSX 10.8.x again
    • -
  • Support for the PRS1 Series 60, in large part due to a patch from Keary Griffin.
    • -
  • A bunch of small PRS1 fixes, especially for the AutoSV.
    • -
  • Added Flow Limit to the summary and overview screens. This can be a useful indicator in certain types of apnea.
    • -
  • Some 64-bit fixes, and some other bugfixes mainly useful to those building from source, especially on linux.
    • -
  • Fixed some issues with the prescription changes table with certain machines.
    • - -

    diff --git a/oscar/help/help_en/SleepyHeadGuide_en.qhp b/oscar/help/help_en/OSCAR_Guide_en.qhp similarity index 100% rename from oscar/help/help_en/SleepyHeadGuide_en.qhp rename to oscar/help/help_en/OSCAR_Guide_en.qhp diff --git a/oscar/help/help_nl/SleepyHeadGuide_nl.qhp b/oscar/help/help_nl/OSCAR_Guide_nl.qhp similarity index 100% rename from oscar/help/help_nl/SleepyHeadGuide_nl.qhp rename to oscar/help/help_nl/OSCAR_Guide_nl.qhp diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 037d1110..f873c96e 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -5,11 +5,11 @@ #------------------------------------------------- lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { - message("You need Qt 5.9 to build OSCR with Help Pages") + message("You need Qt 5.9 to build OSCAR with Help Pages") DEFINES += helpless } lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,7) { - error("You need Qt 5.7 or newer to build OSCR"); + error("You need Qt 5.7 or newer to build OSCAR"); } QT += core gui network xml printsupport serialport widgets help @@ -20,9 +20,9 @@ contains(DEFINES, helpless) { DEFINES += QT_DEPRECATED_WARNINGS DEFINES += NO_UPDATER -#OSRC requires OpenGL 2.0 support to run smoothly +#OSCAR requires OpenGL 2.0 support to run smoothly #On platforms where it's not available, it can still be built to work -#provided the BrokenGL DEFINES flag is passed to qmake (eg, qmake [specs] /path/to/OSCR_QT.pro DEFINES+=BrokenGL) (hint, Projects button on the left) +#provided the BrokenGL DEFINES flag is passed to qmake (eg, qmake [specs] /path/to/OSCAR_QT.pro DEFINES+=BrokenGL) (hint, Projects button on the left) contains(DEFINES, NoGL) { message("Building with QWidget gGraphView to support systems without ANY OpenGL") DEFINES += BROKEN_OPENGL_BUILD @@ -51,7 +51,7 @@ contains(DEFINES, STATIC) { } } -TARGET = Oscr +TARGET = Oscar unix:!macx:!haiku { TARGET.path=/usr/bin } @@ -82,6 +82,13 @@ QMAKE_EXTRA_TARGETS += gitinfotarget message("Finished generating help files"); } +QMAKE_TARGET_PRODUCT = Oscar +QMAKE_TARGET_COMPANY = Nightowl Software +QMAKE_TARGET_COPYRIGHT = Copyright (c)2011-2018 Mark Watkins & (c) 2019 Nightowl Software +QMAKE_TARGET_DESCRIPTION = "OpenSource CPAP Analysis Reporter" +VERSION = 1.0.0 +# RC_ICONS = ./icons/logo-v3.0.ico + macx { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 LIBS += -lz @@ -96,13 +103,6 @@ macx { DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this LIBS += -lsetupapi - QMAKE_TARGET_PRODUCT = Oscr - QMAKE_TARGET_COMPANY = Nightowl Software - QMAKE_TARGET_COPYRIGHT = Copyright (c)2011-2018 Mark Watkins & (c) 2019 Nightowl Software - QMAKE_TARGET_DESCRIPTION = "OpenSource CPAP Review" - VERSION = 1.0.0 - RC_ICONS = ./icons/logo-v3.0.ico - INCLUDEPATH += $$PWD INCLUDEPATH += $$[QT_INSTALL_PREFIX]/../src/qtbase/src/3rdparty/zlib @@ -401,7 +401,7 @@ DISTFILES += help/default.css \ help/help_nl/tipsntricks.html \ help/help_en/reportingbugs.html \ win_icon.rc \ - help/help_nl/OSCR_Guide_nl.qhp \ - help/help_en/OSCR_Guide_en.qhp \ + help/help_nl/OSCAR_Guide_nl.qhp \ + help/help_en/OSCAR_Guide_en.qhp \ help/index.qhcp }