Merge master, fix IE conflicts

2025-04-04 18:20:42 +00:00 · 2023-06-11 17:54:11 -04:00 · 2023-06-11 17:54:11 -04:00 · 539b276e21
commit 539b276e21
parent e1488fd546 7e069126a8
139 changed files with 78103 additions and 43172 deletions
--- a/Building/Windows/BUILD-WIN.md
+++ b/Building/Windows/BUILD-WIN.md
@ -5,16 +5,25 @@ This document is intended to be a brief description of how to install the necess

 On my computers, I have QT installed in E:\\QT and the OSCAR code base in E:\\oscar\\oscar-code. On another computer, they are on the F: drive. All references in the deploy.bat file are relative, so it should run with Oscar-code installed at any location.

-**Required Programs**
+The deploy.bat file is required to build release and install versions of Oscar using QtCreator or with buildall.bat. The buildall.bat compiles , builds Oscar and calls deploy.bat to create release and install version of Oscar.
+
+There are three sections to this documentation.
+
+1) Required Programs
+2) Start Developing using batch files
+3) Start Developing using QtCreator
+
+## Required Programs

 The following programs and files are required to create Windows installers:
-
-   Inno Setup 6.0.3 from <http://www.jrsoftware.org/isdl.php>. Download and install innosetup-qsp-6.0.3.exe.
-    
-   GIT for windows, from <https://gitforwindows.org/>. GIT for Windows adds itself to your path.
-    
-   QT Open Source edition from <https://www.qt.io/download>. I use the latest patch version in the 5.12 LTS series -- version 5.12.8 at the date this was last updated. More recent versions in the 5.12 series should also work.
-    
+-   Inno Setup 6.0.3 from <http://www.jrsoftware.org/isdl.php>.
+    Download and install innosetup-qsp-6.0.3.exe.
+-   GIT for windows, from <https://gitforwindows.org/>.
+    GIT for Windows adds itself to your path.
+    -   Gawk is required.
+        You can use the version included with Git for Windows or install Gawk for Windows from <http://gnuwin32.sourceforge.net/packages/gawk.htm>. The deployment batch file will use the Git for Windows version if gawk.exe is not in your PATH.
+-   QT Open Source edition from <https://www.qt.io/download>.
+    I use the latest patch version in the 5.12 LTS series -- version 5.12.8 at the date this was last updated. More recent versions in the 5.12 series should also work.

 **Installing Inno Setup 6**

@ -29,7 +38,7 @@ Run the installer, accepting options to install inno script studio (for possible
 Go to <https://gitforwindows.org/> and click on the Download button. Run the installer, which presents lots of options:

 -   Select whichever editor you desire.
-   Select “Use Git from the command line and also from 3rd-party software.” 
+-   Select “Use Git from the command line and also from 3rd-party software.”
 -   Select “Use the OpenSSL library.”
 -   Select “Checkout Windows-style, commit Unix-style line endings.”
 -   Select “Use Windows’ default console window.” I find the Windows default console to be satisfactory on Windows 10.
@ -40,6 +49,10 @@ GIT for Windows adds itself to your path.

 Create SSH key and upload to GitLab--See https://docs.gitlab.com/ce/ssh/README.html.

+**Installing Gawk (if Git for Windows’ gawk is not used)**
+
+From <http://gnuwin32.sourceforge.net/packages/gawk.htm>, download setup for “Complete package, except sources”. When downloaded, run the setup program. Accept default options and location. The deployment batch file assumes that gawk.exe is in your PATH, so either add c:\\Program Files (x86)\\gnuwin32\\bin to your PATH or copy the executables to some other directory already in your PATH.
+
 **Installing QT**

 Go to QT at <https://www.qt.io/download> and download the Open Source edition of the Windows online installer, qt-unified-windows-x86-3.1.1-online.exe. Run the installer:
@ -49,26 +62,124 @@ Go to QT at <https://www.qt.io/download> and download the Open Source edition of
 -   Click Next to download meta information (this takes a while).

 -   Choose your installation directory (I picked E:\\Qt, but there are no dependencies on where QT is located)
-    
+
 -   Select components:

-    -   In QT 5.12.*x*:
+   -   In QT 5.12.*x*:

-        -   MinGW 7.3.0 32-bit
+   -   MinGW 7.3.0 32-bit
 -   MinGW 7.3.0 64-bit
-        -	Sources
-		-	QT Debug Information Files
-	
+   -   Sources
+   -   QT Debug Information Files
+
 -   In Developer and Designer Tools:
-    
-    -   QT Creator 4.11.2 CDB Debug
-    -   Debugging Tools for Windows
-    -   MinGW 7.3.0 32-bit
-    -   MinGW 7.3.0 64-bit
+
+   -   QT Creator 4.11.2 CDB Debug
+   -   Debugging Tools for Windows
+   -   MinGW 7.3.0 32-bit
+   -   MinGW 7.3.0 64-bit

 And complete the installation (this also takes a while).

-**Getting Started Developing Oscar in QT Creator**
+## Start Developing using batch files
+
+-   Requires Qt , Git and Inno setup described in above section.
+-   Batch files buildall.bat and deploy.bat are used.
+-   buildall.bat creates a build folder, compiles and executes deploy.bat
+-   Supports both 32 and 64 bit version with an option to build brokenGl
+-   Supports Qt 5.9.x 5.12.x 5.15.x
+-   Auto detection for which compiler to use.
+-   buildall.bat supports command Line options
+-   deploy.bat creates a release version and an install version.
+-   deploy.bat is also used by QtCreator
+-   The release folder contains OSCAR.exe and all other files necessary to run OSCAR
+-   The install folder contains the installable version of OSCAR...exe
+-   Lists the release and install versions of OSCAR in the build folder.
+
+#### Validate the installed software.
+
+-   Verify Qt
+   -   \<QtVersion\> will be in the form N.N.N  example 5.15.2
+   -   For example: if Qt is installed at D:\\Qt then
+   -   The \<QtFolder\> must contain the following folders: \<QtVersion\> Tools
+   -   -   \<QtFolder\> is D:\\Qt
+-   Verify Git and Inno are installed
+   -   Note: Inno is used to create the Install version of OSCAR
+   -   Git for windows provides GAWK.
+
+#### Examples use the following assumptions
+
+Except for Inno, Git, Qt, and OSCAR may be located in different locations.
+
+-   Inno installed:
+   -   "C:\\Program Files (x86)\\Inno Setup 6"
+-   Git installed:
+   -   "C:\\Program Files\\Git"
+-   Qtinstalled:
+   -   "D:\\Qt"
+-   OSCAR installed:
+   -   "D:\\OSCAR"
+
+#### Building Commands
+
+-  Build install version for OSCAR for 32 and 64 bit versions
+    -   D:\\OSCAR\OSCAR-code\\Building\\Windows\buildall.bat D:\\Qt
+-  Build install version for OSCAR for 64 bit version
+    -   D:\\OSCAR\OSCAR-code\\Building\\Windows\buildall.bat D:\\Qt 64
+-  Build Just release version for OSCAR for 64 bit version
+    -   D:\\OSCAR\OSCAR-code\\Building\\Windows\buildall.bat D:\\Qt 64 skipInstall
+-  Build release version for OSCAR for 64 bit version - without deleting build folder first
+    -   D:\\OSCAR\OSCAR-code\\Building\\Windows\buildall.bat D:\\Qt 64 skipInstall remake
+-  The current folder is not used by the buildall.bat
+-  There is a pause when the build completes.
+-  This insure that the user has a chance to read the build results.
+-  Allows using windows shortcuts to build OSCAR and see results.
+
+Note: The default folder of Qt is C:\\Qt
+If the Qt is located at the default folder then the \<QtFolder\> is not required as a command line option.
+
+#### Windows Shortcuts
+-   Windows shortcuts can be used to execute the build commands or run OSCAR.
+-   Create shortcut to buildall.bat
+-   rename shortcut to indicate its function
+-   edit the short cut property and add options to the Target
+-   Create a shortcut to release version of OSCAR.exe
+-   For offical OSCAR release should not use remake or skipInsall options
+-   Should add skipInstall options for developement, testing, verification
+-   Suggestion is to create the following shortcut example.
+   -   use options  \<qtfolder\> 64 skipInstall
+   -   - shortcut name: "OSCAR Fresh build"
+   -   use options  \<qtfolder\> 64 skipInstall remake
+   -   - shortcut name: "OSCAR quick rebuild"
+   -   Create Shortcut to release version of OSCAR.exe   (not the install version)
+   -   - shortcut name: "RUN OSCAR"
+
+
+#### Buildall.bat options.
+-   A full list of options can be displayed using the help option.
+    **32**   Build 32 bit versions
+
+    **64**   Build 64 bit versions
+
+    32 and 64 bit version are built if both 32 and 64 are used or both not used
+    **brokenGL** (special option) to build brokenGL version
+
+    **make**   The default option. removes and re-creates the build folder.
+
+    **remake**   Execute Make in the existing build folder. Does not re-create the Makefile. Should not be used for Offical OSCAR release
+
+    **skipInstall** skips creating the Install version saving both time and disk space
+
+    **skipDeploy** skips executing the deploy.bat script. just compiles oscar.
+
+There is a pause when the build completes. This insure that the user has a chance to read the build results.
+This also allows building using windows shortcuts.
+1) create a shortcut to buildall.bat
+   edit shortcut's property add the necessary options: D:\\Qt 64 remake skipInstall
+2) create and shortcut for the make option.
+3) create a shortcut to the **release** version of OSCAR.exe
+
+## Start Developing Oscar in Qt Creator

 In browser, log into your account at gitlab.com. Select the Oscar project at https://gitlab.com/pholy/OSCAR-code. Clone a copy of the repository to a location on your computer.

--- a/Building/Windows/buildall-515.bat
+++ b/Building/Windows/buildall-515.bat
@ -0,0 +1,66 @@
+setlocal
+:::@echo off
+::: You must set these paths to your QT configuration
+set qtpath=C:\Qt
+set qtVersion=5.15.2
+
+::: This file has been updated to work with Qt 5.15.2 and mingw 8.1.0
+:::
+::: Build 32- and 64-bit versions of OSCAR for Windows.
+::: Includes code to build BrokenGL (LegacyGFX) versions, but that option is not currently used
+::: Uses Timer 4.0 - Command Line Timer - www.Gammadyne.com - to show time it takes to compile.  This could be removed.
+::: timer /nologo
+
+:::call :buildone 32 brokengl
+
+call :buildone 64
+
+call :buildone 32
+
+:::call :buildone 64 brokengl
+::: timer /s /nologo
+goto :eof
+
+::: Subroutine to build one version
+:buildone
+setlocal
+::: timer /nologo
+
+set QTDIR=%qtpath%\%qtversion%\mingw81_%1
+echo QTDIR is %qtdir%
+
+set PATH=%qtpath%\Tools\mingw810_%1\bin;%qtpath%\%qtVersion%\mingw81_%1\bin;%PATH%
+::: echo %PATH%
+
+set savedir=%cd%
+
+: Construct name of our build directory
+set dirname=build-oscar-win_%1_bit
+if "%2"=="brokengl" (
+    set dirname=%dirname%-LegacyGFX
+    set extraparams=DEFINES+=BrokenGL
+)
+echo Build directory is %dirname%
+
+set basedir=..\..
+if exist %basedir%\%dirname%\nul rmdir /s /q %basedir%\%dirname%
+mkdir %basedir%\%dirname%
+cd %basedir%\%dirname%
+
+%qtpath%\%qtVersion%\mingw81_%1\bin\qmake.exe ..\oscar\oscar.pro -spec win32-g++ %extraparams% >qmake.log 2>&1 && %qtpath%\Tools\mingw810_%1\bin\mingw32-make.exe qmake_all >>qmake.log 2>&1 
+%qtpath%\Tools\mingw810_%1\bin\mingw32-make.exe -j8 >make.log 2>&1 || goto :makefail
+  
+call ..\Building\Windows\deploy.bat
+
+::: timer /s /nologo
+echo === MAKE %1  %2 SUCCESSFUL ===
+cd %savedir%
+endlocal
+exit /b
+
+:makefail
+endlocal
+::: timer /s /nologo
+echo *** MAKE %1  %2 FAILED ***
+pause
+exit /b
--- a/Building/Windows/buildall.bat
+++ b/Building/Windows/buildall.bat
@ -1,60 +1,392 @@
+@echo off
 setlocal
-:::@echo off
-::: You must set these paths to your QT configuration
-set qtpath=E:\Qt
-set qtVersion=5.12.12
+:: todo add help / descriptions

+::: This script assumes that it resides OSCAR-data/Building/Windows
+::: You must defined the path to QT configuration or passit as a parameter
+::: The version is detected based on the path
+::: The compiler to use is based on the qt verson.
+::: @echo off
+::: CONFIGURATION SECTION
+
+set QtPath=C:\Qt
+
+::: END CONFIGURATION SECTION
+:::============================================
 :::
-::: Build 32- and 64-bit versions of OSCAR for Windows.
-::: Includes code to build BrokenGL (LegacyGFX) versions, but that option is not currently used
-::: Uses Timer 4.0 - Command Line Timer - www.Gammadyne.com - to show time it takes to compile.  This could be removed.
-timer /nologo
+::: START INITIALIZATIO SECTION
+echo Command line: %0 %*
+call :parse %*
+if NOT %ERRORLEVEL%==0 goto :endProgram

-:::call :buildone 32 brokengl
+set buildErrorLevel=0

-call :buildone 64
+::: basedir is OSCAR-code folder - contains folders Building , oscar , ...
+::: parentdir is the folder that contains OSCAR-code.
+::: change relative paths into absolute paths
+::: Get path to this script. then cd parent folder. %cd% retunrs absolute pathname.
+cd %~dp0  & cd ../../../
+set parentdir=%cd%
+set basedir=%parentdir%\OSCAR-code
+IF NOT "%basedir%"=="%basedir: =%" (
+	call :configError absolute path of OSCAR-code contains a space - not handled by Qt.
+	echo %basedir%
+	goto :endProgram)
+IF NOT exist "%basedir%\Building" 	(
+	call :notfound2 OSCAR-code: "%basedir%"
+	goto :endProgram)
+set baseBuildName=%basedir%\build-oscar-win
+set OSCARPRO=%basedir%\oscar\oscar.pro
+set requiredOutSideOscar=
+IF %doOutSide%==1 (
+	set baseBuildName=%parentdir%\build-oscar-win
+	set OSCARPRO=%basedir%\OSCAR_QT.pro
+	set requiredOutSideOscar=oscar\
+	)
+::: Construct name of our build directory
+::: Build Directory can be based on the directories the QtCreator uses for either OSCAR_QT.pro or oscar.pro
+::: For OSCAR_QT.pro  is at parentDir\OSCAR-code\OCASR_QT.pro the build will be at  parentDir\BuildDir
+::: For oscar.pro  is at OSCAR-code\oscar\oscar.pro the build will be at  OSCAR-code\BuildDir

-call :buildone 32
+:: check if QtPath from parameters list
+set defaultQtPath=%QtPath%
+if NOT "%requestQtPath%"=="" (set QtPath=%requestQtPath%)

-:::call :buildone 64 brokengl
-timer /s /nologo
+:: check valid qt folder to find version and tool folders
+IF NOT exist %QtPath%\nul (
+	call :configError InvalidPath to Qt. QtPath:%QtPath%
+	echo The QtPath can be added as a parameter to %~nx0
+	call :helpInfo
+	goto :endProgram
+	)
+	
+set foundQtVersion=
+set foundQtToolsDir=
+set foundQtVersionDir=
+
+for /d %%i in (%QtPath%\*) do (call :parseQtVersion %%i)
+if  "%foundQtVersion%"==""  (
+	echo :configError %QtPath% is not a valid Qt folder. Must contain version 5.xx.xx or 6.xx.xx folder
+	echo Please enter a valid Qt Path as a parameter
+	call :helpInfo
+	goto :endProgram
+	)
+if  "%foundQtToolsDir%"=="" (
+.	echo :configError %QtPath% is not a valid Qt folder. Must contain a Tools folder
+	echo Please enter a valid Qt Path as a parameter
+	call :helpInfo
+	goto :endProgram
+	)	
+echo Using QtVersion %foundQtVersion%
+set qtVersion=%foundQtVersion%
+set QtVersionDir=%QtPath%\%qtVersion%
+set QtToolsDir=%QtPath%\Tools
+
+::: Compiler Tools for creating Makefile (linux qmake features)
+if "5.15."=="%qtVersion:~0,5%" (	
+	:: For qt release 5.15
+	set mingwQmakeVersion=mingw81
+	set mingwQmakeTools=mingw810
+) else (
+	:: For qt previous releases
+	set mingwQmakeVersion=mingw73
+	set mingwQmakeTools=mingw730
+)
+::: END INITIALIZATIO SECTION
+
+
+:::============================================
+:main
+::: Start BUILDING ON WINDOWS
+
+call :startTimer   "Start  Time is"
+
+if %do32%==1 (
+	call :buildone 32	|| goto :finished
+	if %doBrokenGl%==1 (
+		call :elapseTime   "Elapse Time is"
+		call :buildone 32 brokengl		|| goto :finished
+	)
+)
+
+
+if %do64%==1 (
+	if %do32%==1 (call :elapseTime   "Elapse Time is")
+	call :buildone 64 	|| goto :finished
+	if %doBrokenGl%==1 (
+		call :elapseTime   "Elapse Time is"
+		call :buildone 64 brokengl		|| goto :finished
+	)
+)
+
+	
+:finished
+
+:: this does work. dir %baseBuildName%*_bit\Installer\OSCAR*.exe
+echo Start  Time is %saveStartTime%
+call :endTimer   "End    Time is"
+
+FOR /D %%j in ("%baseBuildName%*") do (call :sub1 %%j)
+goto :endProgram
+::: return to caller
+:endProgram
+pause
+exit /b
+
+
+
+:::============================================
+:sub1
+	FOR /F %%i in ("%1\%requiredOutSideOscar%Installer\") do (call :sub2  %%i )
+	FOR /F %%i in ("%1\%requiredOutSideOscar%Release\") do (call :sub2  %%i  	)
+goto :eof
+:sub2
+::	echo PLACE 2 %1
+	FOR  %%k in ("%1*.exe") do (call :sub3 %%k  	)
+goto :eof
+:sub3
+	echo %~t1  %1
+goto :eof
+
+:parseQtVersion
+	set tmpf=%~nx1
+	if "5."=="%tmpf:~0,2%"	call :gotVersion %1 %tmpf% & goto :eof
+	if "6."=="%tmpf:~0,2%"	call :gotVersion %1 %tmpf% & goto :eof
+	if "Tools"=="%tmpf%"	call :gotTools %1 %tmpf% & goto :eof
+	goto :eof
+:gotTools
+::	if NOT "%foundQtToolsDir%"=="" 	(echo Duplicate Qt Versions %1 and %foundQtToolsDir% Error & exit /b 101)
+	set foundQtToolsDir=%1
+::	echo Found QtTools %1
+	goto :eof
+:gotVersion
+::	if NOT "%foundQtVersion%"=="" 	(echo Duplicate Qt Versions %1 and %foundQtVersion% Error & exit /b 101)
+	set foundQtVersion=%2
+	set foundQtVersionDir=%1
+::	echo Found QtVersion %foundQtVersion%
+	goto :eof
+
+:::============================================
+:parse
+set do32=0
+set do64=0
+set doBrokenGl=0	
+set doOutSide=1
+set useExistingBuild=0
+set skipCompile=0
+set skipDeploy=0
+set requestQtPath=
+set toggleEcho="off"
+set skipInstallCommand=
+:parseLoop
+IF "%1"=="" GOTO :exitParseLoop
+set arg=%1
+::: echo ^<%arg%^>
+IF "%arg%"=="32"   (set do32=1 & GOTO :endLoop )
+IF "%arg%"=="64"   (set do64=1 & GOTO :endLoop )
+IF /I "%arg:~0,2%"=="br"   (set doBrokenGl=1 & GOTO :endLoop )
+IF /I "%arg:~0,5%"=="SKIPD" (set skipDeploy=1 & GOTO :endLoop )
+IF /I "%arg:~0,5%"=="SKIPC" (
+	set useExistingBuild=1
+	set skipCompile=1
+	GOTO :endLoop )
+IF /I "%arg:~0,2%"=="OU" (set doOutSide=1 & GOTO :endLoop )
+echo windows cmd.exe workaround 1>nul
+IF /I "%arg:~0,5%"=="SKIPI" (
+	set skipInstallCommand=skipInstall
+	GOTO :endLoop )
+IF /I "%arg:~0,2%"=="re" (set useExistingBuild=1 & GOTO :endLoop )
+IF /I "%arg:~0,2%"=="ve" ( echo on & GOTO :endLoop )
+IF exist %arg%\Tools\nul IF exist %arg%\Licenses\nul (	
+	set requestQtPath=%arg%
+	GOTO :endLoop)
+IF NOT "%arg:~0,2%"=="he" (
+	echo _
+	echo Invalid argument '%arg%'
+	) else (
+	echo _
+	)
+call :helpInfo
+exit /b 123
+:endLoop
+SHIFT
+GOTO :parseLoop
+:exitParseLoop
+:: echo requestQtPath ^<%requestQtPath%^>
+set /a sum=%do32%+%do64%
+if %sum% == 0 (set do32=1 & set do64=1 )
 goto :eof

-::: Subroutine to build one version
-:buildone
-setlocal
-timer /nologo
-set QTDIR=%qtpath%\%qtversion%\mingw73_%1
-echo QTDIR is %qtdir%
-set path=%qtpath%\Tools\mingw730_%1\bin;%qtpath%\%qtversion%\mingw73_%1\bin;%qtpath%\Tools\mingw730_%1\bin;%PATH%
+
+:::============================================
+::: Timer functions
+:::	Allows personalization of timer functions.
+::: defaults displaying the curr	ent time
+::: Could  Use Timer 4.0 - Command Line Timer - www.Gammadyne.com - to show time it takes to compile.
+:startTimer
+	set saveStartTime=%TIME%
+	:: timer.exe /nologo
+	echo %~1 %saveStartTime%
+	goto :eof
+:elapseTime
+	:: timer.exe /r /nologo
+	echo %~1 %TIME%
+	goto :eof
+:endTimer
+	:: timer.exe /s /et /nologo
+	echo %~1 %TIME%
+	goto :eof
+
+:::===============================================================================
+
+:configError
+set buildErrorLevel=24
+echo *** CONFIGURATION ERROR ***
+echo %*
+goto :eof
+
+:notfound
+echo *** CONFIGURATION ERROR ***
+set buildErrorLevel=25
+echo NotFound %*
+goto :eof
+
+
+
+:::===============================================================================
+:: Subroutine to "build one" version
+:buildOne
+setLocal
+set bitSize=%1
+set brokenGL=%2
+echo Building %1 %2
+::: echo do not remove this line - batch bug? 1>nul:::
+
+set QtVersionCompilerDir=%qtVersionDir%\%mingwQmakeVersion%_%bitSize%
+if NOT exist %QtVersionCompilerDir%\nul 	(
+	call :buildOneError 21 notfound QtCompiler: %QtVersionCompilerDir%
+	goto :endBuildOne
+	)
+
+set QtToolsCompilerDir=%QtToolsDir%\%mingwQmakeTools%_%bitSize%
+if NOT exist %QtToolsCompilerDir%  (
+	call :buildOneError 22 notfound   QTToolCompiler: %QtToolsCompilerDir%
+	goto :endBuildOne
+	)
+
+set path=%QtToolsCompilerDir%\bin;%QtVersionCompilerDir%\bin;%PATH%
+:: echo ===================================
+:: echo %path%
+:: echo ===================================
+:::goto :eof
+
+::: Verify all configuration parameters
 set savedir=%cd%
-: Construct name of our build directory
-set dirname=build-oscar-win_%1_bit
-if "%2"=="brokengl" (
+
+set dirname=%baseBuildName%
+if "%brokenGL%"=="brokengl" (
    set dirname=%dirname%-LegacyGFX
    set extraparams=DEFINES+=BrokenGL
 )
-echo Build directory is %dirname%
+set buildDir=%dirname%_%bitSize%_bit

-set basedir=..\..
-if exist %basedir%\%dirname%\nul rmdir /s /q %basedir%\%dirname%
-mkdir %basedir%\%dirname%
-cd %basedir%\%dirname%

-%qtpath%\%qtversion%\mingw73_%1\bin\qmake.exe ..\oscar\OSCAR.pro -spec win32-g++ %extraparams% >qmake.log 2>&1 && %qtpath%/Tools/mingw730_%1/bin/mingw32-make.exe qmake_all  >>qmake.log 2>&1
-mingw32-make.exe -j8 >make.log 2>&1 || goto :makefail
+:: allow rebuild without removing build when a parameter is "SKIP"
+if NOT exist %buildDir%\nul goto :makeBuildDir
+if %useExistingBuild%==1 goto :skipBuildDir
+rmdir /s /q %buildDir%
+IF NOT %ERRORLEVEL%==0 (
+	call :buildOneError %ERRORLEVEL% error removing Build Folder:  %buildDir%
+	GOTO :endBuildOne )
+
+:makeBuildDir
+mkdir %buildDir% 		||  (
+	call :buildOneError 23 mkdir %buildDir% failed %ERRORLEVEL%
+	goto :endBuildOne )
+echo created %buildDir%
+:skipBuildDir
+cd %buildDir%
+if %skipCompile%==1 goto :doDeploy
+
+
+
+if NOT exist %buildDir%\Makefile goto :createMakefile
+if %useExistingBuild%==1 goto :skipMakefile
+if NOT exist %OSCARPRO% {
+	call :buildOneError 24 notfound oscar.pro is not found.
+	goto :endBuildOne)
+
+:createMakefile
+echo Creating Oscar's Makefile	
+%QtVersionCompilerDir%\bin\qmake.exe %OSCARPRO% -spec win32-g++ %extraparams% >qmake.log 2>&1 || (
+	call :buildOneError 25 Failed to create Makefile part1
+	type qmake.log
+	goto :endBuildOne)
+%QtToolsCompilerDir%/bin/mingw32-make.exe qmake_all  >>qmake.log 2>&1  || (
+	call :buildOneError  26 Failed to create Makefile part2
+	type qmake.log
+	goto :endBuildOne)
+:skipMakefile
+
+:: Always compile build
+echo Compiling Oscar
+mingw32-make.exe -j8 >make.log 2>&1 || (
+	call :buildOneError  27 Make Failed
+	type qmake.log
+	goto :endbuildOne
+	)
+
+
+::: echo skipDeploy: %skipDeploy%
+:doDeploy
+if %skipDeploy%==1 goto :endBuildOne
+
+echo Deploying and Creating Installation Exec in %cd%
+call "%~dp0\deploy.bat" %skipInstallCommand%
+set buildErrorLevel=%ERRORLEVEL%
+
+
+if %buildErrorLevel% == 0 	(
+	echo === MAKE %bitSize%  %brokenGL% SUCCESSFUL ===
+	goto :endBuildOne
+) else (
+	call :buildOneError %buildErrorLevel%  DEPLOY FAILED
+	goto :endBuildOne
+)
+:buildOneError
+echo *** MAKE %bitSize%  %brokenGL% FAILED ***
+echo %*
+exit /b %1
+:endBuildOne
+cd %savedir%	1>nul 2>nul
+endLocal
+exit /b %buildErrorLevel%
+:::============================================
+:helpInfo
+echo _
+echo The %~nx0 script file creates Release and Install 32 and 64 bit versions of Oscar.
+echo The %~nx0 has parameters to configure the default options.
+echo %~nx0 can be executed from the File Manager
+echo Parameter can be added using a short cut and adding parameters to the shortcut's target.
+echo _	
+echo OPTIONS        DESCRIPTION
+echo br[okenGl]     Builds the brokenGL versions of OSCAR
+echo 32             Builds just 32 bit versions
+echo 64             Builds just 64 bit versions
+echo ^<QtPath^>       Overrides the default path (C:\Qt) to QT's installation - contains Tools, License, ... folders
+echo ou[tside]      Default: Build is located outside of git repository. Same as building with OSCAR_QT.pro
+echo in[side]       Build is located inside of git repository. Same as building with oscar.pro
+echo he[lp]         Display this help message
+echo _	
+echo The offical builds of OSCAR should not use the following options. These facilate development and testing
+echo re[make]       Skips recreating Makefile, but executes make in existing build folder
+echo skipC[ompile]  Skips all compiling. Leaves build folder untouched.
+echo skipD[eploy]   Skip calling deploy.bat. Does not create Release or install versions.
+echo ve[rbose]      Start verbose logging
+echo _
+echo ^<Anything^>     Displays invalid parameter message and help message then exits.
+goto :eof
+

-call ..\Building\Windows\deploy.bat

-timer /s /nologo
-echo === MAKE %1  %2 SUCCESSFUL ===
-cd %savedir%
-endlocal
-exit /b

-:makefail
-endlocal
-timer /s /nologo
-echo *** MAKE %1  %2 FAILED ***
-pause
-exit /b
--- a/Building/Windows/deploy-515.bat
+++ b/Building/Windows/deploy-515.bat
@ -0,0 +1,100 @@
+:::
+::: Build Release and Installer subdirectories of the current shadow build directory.
+::: The Release directory contains everything needed to run OSCAR.
+::: The Installer directory contains a single executable -- the OSCAR installer.
+:::
+::: DEPLOY.BAT should be run as the last step of a QT Build Release kit.
+::: QT Shadow build should be specified (this is the QT default).
+::: A command line parameter is optional.  Any text on the command line will be appended
+::: to the file name of the installer.
+:::
+::: Requirements:
+:::     Inno Setup 6 - http://www.jrsoftware.org/isinfo.php, installed to default Program Files (x86) location
+:::     gawk - somewhere in the PATH or in Git for Windows installed in its default lolcation
+:::
+::: Deploy.bat resides in .../OSCAR-code/Nuilding/Windows, along with
+:::     buildinstall.iss -- script for Inno Setup to create installer
+:::     getBuildInfo.awk -- gawk script for extracting version fields from various files
+:::     setup.ico -- Icon to be used for the installer.    
+:::
+::: When building a release version in QT, QT will start this batch file which will prepare
+::: additional files, run WinDeployQt, and create an installer.
+:::
+@echo off
+setlocal
+
+::: toolDir is where the Windows install/deploy tools are located
+set toolDir=%~dp0
+:::echo tooldir is %toolDir%
+
+::: Set shadowBuildDir and sourceDir for oscar_qt.pro vs oscar\oscar.pro projects
+if exist ..\oscar-code\oscar\oscar.pro (
+    ::: oscar_QT.pro
+    set sourceDir=..\oscar-code\oscar
+    set shadowBuildDir=%cd%\oscar
+) else (
+    ::: oscar\oscar.pro
+    set sourceDir=..\oscar
+    set shadowBuildDir=%cd%
+)    
+echo sourceDir is %sourceDir%
+echo shadowBuildDir is %shadowBuildDir%
+
+::: Now copy the base installation control file
+
+copy %toolDir%buildInstall.iss %shadowBuildDir% || exit 45
+copy %toolDir%setup.ico %shadowBuildDir% || exit 46
+:::copy %toolDir%use*.reg %shadowBuildDir% || exit 47
+
+:::
+::: If gawk.exe is in the PATH, use it.  If not, add Git mingw tools (awk) to path. They cannot
+::: be added to global path as they break CMD.exe (find etc.)
+where /q gawk.exe || set PATH=%PATH%;%ProgramW6432%\Git\usr\bin
+
+::: Create and copy installer control files
+::: Create file with all version numbers etc. ready for use by buildinstall.iss
+::: Extract the version info from various header files using gawk and
+::: #define fields for each data item in buildinfo.iss which will be 
+::: used by the installer script.
+where /q gawk.exe || set PATH=%PATH%;%ProgramW6432%\Git\usr\bin
+echo ; This script auto-generated by DEPLOY.BAT >%shadowBuildDir%\buildinfo.iss
+gawk -f %toolDir%getBuildInfo.awk %sourcedir%\VERSION >>%shadowBuildDir%\buildInfo.iss || exit 60
+gawk -f %toolDir%getBuildInfo.awk %sourcedir%\git_info.h >>%shadowBuildDir%\buildInfo.iss || exit 62
+echo %shadowBuildDir% | gawk -f %toolDir%getBuildInfo.awk >>%shadowBuildDir%\buildInfo.iss || exit 63
+echo #define MySuffix "%1" >>%shadowBuildDir%\buildinfo.iss || exit 64
+:::echo #define MySourceDir "%sourcedir%" >>%shadowBuildDir%\buildinfo.iss
+
+::: Create Release directory and subdirectories
+if exist %shadowBuildDir%\Release\*.* rmdir /s /q %shadowBuildDir%\Release
+mkdir %shadowBuildDir%\Release
+cd %shadowBuildDir%\Release
+copy %shadowBuildDir%\oscar.exe .  || exit 71
+:::copy %shadowBuildDir%\use*.reg .  || exit 72
+
+::: Now in Release subdirectory
+::: If QT created a help directory, copy it.  But it might not have if "helpless" option was set
+if exist Help\*.* rmdir /s /q Help
+mkdir Help
+if exist ..\help\*.qch copy ..\help Help
+
+if exist Html\*.* rmdir /s /q Html
+mkdir Html
+copy ..\html html  || exit 80
+
+if exist Translations\*.* rmdir /s /q Translations
+mkdir Translations
+copy ..\translations Translations || exit 84
+
+::: Run deployment tool
+windeployqt.exe --force --compiler-runtime --no-translations --verbose 1 OSCAR.exe || exit 87
+
+::: Clean up unwanted translation files
+:::For unknown reasons, Win64 build copies the .ts files into the release directory, while Win32 does not
+if exist Translations\*.ts del /q Translations\*.ts
+
+::: Create installer
+cd ..
+:::"%ProgramFiles(x86)%\Inno Setup 6\compil32" /cc BuildInstall.iss
+"%ProgramFiles(x86)%\Inno Setup 6\iscc" /Q BuildInstall.iss
+
+endlocal
--- a/Building/Windows/deploy.bat
+++ b/Building/Windows/deploy.bat
@ -1,98 +1,225 @@
-:::
-::: Build Release and Installer subdirectories of the current shadow build directory.
-::: The Release directory contains everything needed to run OSCAR.
-::: The Installer directory contains a single executable -- the OSCAR installer.
-:::
-::: DEPLOY.BAT should be run as the last step of a QT Build Release kit.
-::: QT Shadow build should be specified (this is the QT default).
-::: A command line parameter is optional.  Any text on the command line will be appended
-::: to the file name of the installer.
-:::
-::: Requirements:
-:::     Inno Setup 6 - http://www.jrsoftware.org/isinfo.php, installed to default Program Files (x86) location
-:::     gawk - somewhere in the PATH or in Git for Windows installed in its default lolcation
-:::
-::: Deploy.bat resides in .../OSCAR-code/Nuilding/Windows, along with
-:::     buildinstall.iss -- script for Inno Setup to create installer
-:::     getBuildInfo.awk -- gawk script for extracting version fields from various files
-:::     setup.ico -- Icon to be used for the installer.    
-:::
-::: When building a release version in QT, QT will start this batch file which will prepare
-::: additional files, run WinDeployQt, and create an installer.
-:::
-@echo off
-setlocal
-
-::: toolDir is where the Windows install/deploy tools are located
-set toolDir=%~dp0
-:::echo tooldir is %toolDir%
-
-::: Set shadowBuildDir and sourceDir for oscar_qt.pro vs oscar\oscar.pro projects
-if exist ..\oscar-code\oscar\oscar.pro (
-    ::: oscar_QT.pro
-    set sourceDir=..\oscar-code\oscar
-    set shadowBuildDir=%cd%\oscar
-) else (
-    ::: oscar\oscar.pro
-    set sourceDir=..\oscar
-    set shadowBuildDir=%cd%
-)    
-echo sourceDir is %sourceDir%
-echo shadowBuildDir is %shadowBuildDir%
-
-::: Now copy the base installation control file
-
-copy %toolDir%buildInstall.iss %shadowBuildDir% || exit 45
-copy %toolDir%setup.ico %shadowBuildDir% || exit 46
-:::copy %toolDir%use*.reg %shadowBuildDir% || exit 47
-
-:::
-::: If gawk.exe is in the PATH, use it.  If not, add Git mingw tools (awk) to path. They cannot
-::: be added to global path as they break CMD.exe (find etc.)
-where /q gawk.exe || set PATH=%PATH%;%ProgramW6432%\Git\usr\bin
-
-::: Create and copy installer control files
-::: Create file with all version numbers etc. ready for use by buildinstall.iss
-::: Extract the version info from various header files using gawk and
-::: #define fields for each data item in buildinfo.iss which will be 
-::: used by the installer script.
-where /q gawk.exe || set PATH=%PATH%;%ProgramW6432%\Git\usr\bin
-echo ; This script auto-generated by DEPLOY.BAT >%shadowBuildDir%\buildinfo.iss
-gawk -f %toolDir%getBuildInfo.awk %sourcedir%\VERSION >>%shadowBuildDir%\buildInfo.iss || exit 60
-gawk -f %toolDir%getBuildInfo.awk %sourcedir%\git_info.h >>%shadowBuildDir%\buildInfo.iss || exit 62
-echo %shadowBuildDir% | gawk -f %toolDir%getBuildInfo.awk >>%shadowBuildDir%\buildInfo.iss || exit 63
-echo #define MySuffix "%1" >>%shadowBuildDir%\buildinfo.iss || exit 64
-:::echo #define MySourceDir "%sourcedir%" >>%shadowBuildDir%\buildinfo.iss
-
-::: Create Release directory and subdirectories
-if exist %shadowBuildDir%\Release\*.* rmdir /s /q %shadowBuildDir%\Release
-mkdir %shadowBuildDir%\Release
-cd %shadowBuildDir%\Release
-copy %shadowBuildDir%\oscar.exe .  || exit 71
-:::copy %shadowBuildDir%\use*.reg .  || exit 72
-
-::: Now in Release subdirectory
-::: If QT created a help directory, copy it.  But it might not have if "helpless" option was set
-if exist Help\*.* rmdir /s /q Help
-mkdir Help
-if exist ..\help\*.qch copy ..\help Help
-
-if exist Html\*.* rmdir /s /q Html
-mkdir Html
-copy ..\html html  || exit 80
-
-if exist Translations\*.* rmdir /s /q Translations
-mkdir Translations
-copy ..\translations Translations || exit 84
-
-::: Run deployment tool
-windeployqt.exe --release --force --compiler-runtime --no-translations --verbose 1 OSCAR.exe || exit 87
-
-::: Clean up unwanted translation files
-:::For unknown reasons, Win64 build copies the .ts files into the release directory, while Win32 does not
-if exist Translations\*.ts del /q Translations\*.ts
-
-::: Create installer
-cd ..
-:::"%ProgramFiles(x86)%\Inno Setup 6\compil32" /cc BuildInstall.iss
-"%ProgramFiles(x86)%\Inno Setup 6\iscc" /Q BuildInstall.iss
+:::
+::: Build Release and Installer subdirectories of the current shadow build directory.
+::: The Release directory contains everything needed to run OSCAR.
+::: The Installer directory contains a single executable -- the OSCAR installer.
+:::
+::: DEPLOY.BAT should be run as the last step of a QT Build Release kit.
+::: QT Shadow build should be specified (this is the QT default).
+::: A command line parameter is optional.  Any text on the command line will be appended
+::: to the file name of the installer.
+:::
+::: Requirements:
+:::     Inno Setup 6 - http://www.jrsoftware.org/isinfo.php, installed to default Program Files (x86) location:%ProgramFiles(x86)%
+:::     gawk - somewhere in the PATH or in Git for Windows installed with Git\cmd in the path
+:::
+::: Deploy.bat resides in ...\OSCAR-code\Building\Windows, along with
+:::     buildinstall.iss -- script for Inno Setup to create installer
+:::     getBuildInfo.awk -- gawk script for extracting version fields from various files
+:::     setup.ico -- Icon to be used for the installer.
+:::
+::: When building a release version in QT, QT will start this batch file which will prepare
+::: additional files, run WinDeployQt, and create an installer.
+:::
+@echo off
+echo Executing %~nx0 %*
+setlocal
+set doSkipInstall=0
+set	suffixParam=%1
+if "%1"=="skipInstall" (
+		set doSkipInstall=1
+		set	suffixParam=%2
+	) else (
+		if "%2"=="skipInstall" set doSkipInstall=1
+	)
+
+echo doSkipInstall = %doSkipInstall%
+set errDescription=
+set errvalue=0
+::: Current Directory is the shadowBuildDir
+set shadowBuildDir=%cd%
+::: toolDir is where the Window install\deploy tools are located
+cd %~dp0 && cd ..\..\..
+set parentDir=%cd%
+if exist %shadowBuildDir%\oscar\nul set shadowBuildDir=%shadowBuildDir%\oscar
+cd %shadowBuildDir%
+set toolDir=%parentDir%\OSCAR-code\Building\Windows
+::: Calculate directory where OSCAR-code is located.
+set sourceDir=%parentDir%\OSCAR-code\oscar
+
+echo tooldir is %toolDir%
+::echo parentDir is %parentDir%
+:: echo sourceDir is %sourceDir%
+echo shadowBuildDir is %shadowBuildDir%
+if NOT exist %shadowBuildDir%\OSCAR.exe  (
+	call :err 41	%shadowBuildDir%\OSCAR.exe does not exist
+	goto :endProgram
+	)
+
+call :cleanFolder
+if exist %shadowBuildDir%\buildInfo.iss  del /q %shadowBuildDir%\buildInfo.iss  || (call :err 42	& goto :endProgram)
+if exist %shadowBuildDir%\buildInstall.iss  del /q %shadowBuildDir%\buildInstall.iss  || (call :err 43	& goto :endProgram)
+if exist %shadowBuildDir%\setup.ico   del /q %shadowBuildDir%\setup.ico  || (call :err 44	& goto :endProgram)
+
+where gawk  > temp.txt 2>nul
+set er=%errorlevel%
+set gawk=<temp.txt
+if %er%==0 (del temp.txt && goto :eof)
+:: get location of Git command - then find where Git was downloaded.
+where Git > temp.txt 2>nul
+set er=%errorlevel%
+set /p git=<temp.txt
+del temp.txt
+if NOT %er%==0 (echo git command not found && exit /b 33)
+::: found the location of GIT. because git has gawk		
+:: have fullpath of git.exe which is in Git\cmd\git.exe need Git\usr\bin\gawk
+FOR %%i IN ("%git%") DO (set git=%%~dpi)
+:: get rid of trailing \ for above command to decend one level
+FOR %%i IN ("%git:~0,-1%") DO (set git=%%~dpi)
+set path=%git:~0,-1%\usr\bin;%path%
+
+::: Now have gawk. -- do not delete this line.
+::: Now copy the base installation control file
+copy %toolDir%\buildInstall.iss %shadowBuildDir%   1>nul
+if NOT %ERRORLEVEL%==0 (
+	call :err 45  %ERRORLEVEL% failure to copy %toolDir%\buildInstall.iss to %shadowBuildDir%
+	goto :endProgram
+	)
+copy %toolDir%\setup.ico %shadowBuildDir% 1>nul
+if NOT %ERRORLEVEL%==0 (
+	call :err 	 failure to copy %toolDir%\setup.ico to %shadowBuildDir%
+	goto :endProgram
+	)
+:::copy %toolDir%\use*.reg %shadowBuildDir% || call :err 47	& goto :endProgram
+
+::: Create and copy installer control files
+::: Create file with all version numbers etc. ready for use by buildinstall.iss
+::: Extract the version info from various header files using gawk and
+::: #define fields for each data item in buildinfo.iss which will be
+::: used by the installer script.
+echo ; This script auto-generated by DEPLOY.BAT >%shadowBuildDir%\buildinfo.iss
+gawk -f %toolDir%\getBuildInfo.awk %sourcedir%\VERSION >>%shadowBuildDir%\buildInfo.iss
+if NOT %ERRORLEVEL%==0 (
+	call :err 60	& goto :endProgram)
+gawk -f %toolDir%\getBuildInfo.awk %sourcedir%\git_info.h >>%shadowBuildDir%\buildInfo.iss
+if NOT %ERRORLEVEL%==0 (
+	call :err 62	& goto :endProgram)
+echo %shadowBuildDir% | gawk -f %toolDir%\getBuildInfo.awk >>%shadowBuildDir%\buildInfo.iss
+if NOT %ERRORLEVEL%==0 (
+	call :err 63	& goto :endProgram)
+echo #define MySuffix "%suffixParam%" >>%shadowBuildDir%\buildinfo.iss
+if NOT %ERRORLEVEL%==0 (
+	call :err 64	& goto :endProgram)
+:::echo #define MySourceDir "%sourcedir%" >>%shadowBuildDir%\buildinfo.iss
+
+set releaseDir=%shadowBuildDir%\Release
+
+::: Create Release directory and subdirectories
+::: if exist %shadowBuildDir%\Release\*.* rmdir /s /q %shadowBuildDir%\Release
+mkdir %releaseDir%
+cd %shadowBuildDir%\Release
+copy %shadowBuildDir%\oscar.exe .  1>nul
+if NOT %ERRORLEVEL%==0 (
+	call :err 71	& goto :endProgram)
+:::copy %shadowBuildDir%\use*.reg .  || call :err 72	& goto :endProgram
+::: if exist %shadowBuildDir%\Installer\*.* rmdir /s /q %shadowBuildDir%\Installer  (call :err 73	& goto :endProgram)
+
+::: starting to copy files
+::: Now in Release subdirectory
+::: If QT created a help directory, copy it.  But it might not have if "helpless" option was set
+
+::: if exist Help\*.* rmdir /s /q Help
+mkdir Help
+if exist %shadowBuildDir%\help\*.qch copy %shadowBuildDir%\help %releaseDir%\Help 1>nul ||  (call :err 80	& goto :endProgram)
+
+::: if exist Html\*.* rmdir /s /q Html
+mkdir Html
+copy %shadowBuildDir%\html %releaseDir%\html 1>nul || 		(call :err 81	& goto :endProgram)
+
+::: if exist Translations\*.* rmdir /s /q Translations
+mkdir Translations
+copy %shadowBuildDir%\translations %releaseDir%\Translations   1>nul || (call :err 84	& goto :endProgram)
+
+::: Run deployment tool										
+echo Running Qt Deployment tool
+windeployqt.exe --release --force --compiler-runtime --no-translations --verbose 1 OSCAR.exe 1>nul 2>nul
+if %errorlevel% == 0 goto :cleanup
+::: echo windeployqt error = %errorlevel%	executing next version
+::: Post mingw 8.0 --release Must not be used.
+windeployqt.exe --force --compiler-runtime --no-translations --verbose 1 OSCAR.exe 1>nul || (call :err 87	& goto :endProgram)
+
+
+:cleanup
+::: Clean up unwanted translation files
+::::For unknown reasons, Win64 build copies the .ts files into the release dir/ectory, while Win32 does not
+if exist Translations\*.ts del /q Translations\*.ts
+
+
+::: Create installer
+cd ..
+IF %doSkipInstall%==1 goto :endProgram
+echo Creating OSCAR Installation Exec
+"%ProgramFiles(x86)%\Inno Setup 6\iscc" /Q BuildInstall.iss 		|| (call :err 88	& goto :endProgram)
+if NOT exist %shadowBuildDir%\Installer\OSCAR*.exe  (call :err 89	& goto :endProgram)
+:endProgram
+echo Finished %~nx0 %errDescription%
+exit /b %errvalue%
+:::: =======================
+
+:err
+set errvalue=%1
+set errDescription=%*
+echo %~nx0 detected error: %*
+
+exit /b %errvalue%
+
+
+::: =====================================================================================
+
+:getGawk
+:: check if gawk is already available.
+where gawk  > temp.txt 2>nul
+set er=%errorlevel%
+set gawk=<temp.txt
+if %er%==0 (
+	del temp.txt
+	goto :eof)
+:: get location of Git command - then find where Git was downloaded.
+where Git > temp.txt 2>nul
+set er=%errorlevel%
+set /p git=<temp.txt
+del temp.txt
+if NOT %er%==0 (echo git command not found && exit /b 33)
+::: found the location of GIT. because git has gawk		
+:: have fullpath of git.exe which is in Git\cmd\git.exe need Git\usr\bin\gawk
+FOR %%i IN ("%git%") DO (set git=%%~dpi)
+:: get rid of trailing \ for above command to decend one level
+FOR %%i IN ("%git:~0,-1%") DO (set git=%%~dpi)
+set path=%git:~0,-1%\usr\bin;%path%
+echo %path%
+goto :eof
+
+::: =====================================================================================
+:cleanFolder
+for /d %%i in (%shadowBuildDir%\*) do (
+	call :handClean %%i
+)
+goto :eof
+:handClean
+	::: Qt adds hidden files to build folder for glang compiler. .qtc_clangd (for windows builds)
+	::: This results is no file name, however it does exist in the full path name %1
+	set xpath=%1
+	set fname=%~n1
+	:: if fname is empty then directory is hidden and is in xpath
+:::	if "%fname%"=="" goto :endhandClean:::
+	if /I "%fname%"=="Help" goto :endhandClean
+	if /I "%fname%"=="Html" goto :endhandClean
+	if /I "%fname%"=="Translations" goto :endhandClean
+	if /I "%fname%"=="Release" goto :cleanDir
+	if /I "%fname%"=="Installer" goto :cleanDir
+	echo Folder %fname% was not cleaned
+	goto :endhandClean
+:cleanDir
+	echo Cleaning %xpath%
+	rmdir /Q /S %xpath%
+:endhandClean
+goto :eof
--- a/Htmldocs/about-fil.html
+++ b/Htmldocs/about-fil.html
--- a/Htmldocs/credits.html
+++ b/Htmldocs/credits.html
@ -17,7 +17,7 @@
    <p>
    <b>OpenSource Libraries</b>
    <br>OSCAR uses the OpenSource version of the Qt cross-platform toolkit available from 
-    <a href="http://qt.io" >http://qt.io</a> which itself draws from many smaller open source libraries. You can read the individual licensing for many of these components that are used under the hood of OSCAR at 
+    <a href="http://qt.io" >https://qt.io</a> which itself draws from many smaller open source libraries. You can read the individual licensing for many of these components that are used under the hood of OSCAR at 
    <a href="https://doc.qt.io/qt-5/licenses-used-in-qt.html" >https://doc.qt.io/qt-5/licenses-used-in-qt.html</a></p>
    <p>
    <b>Data formats</b>
@ -32,20 +32,19 @@
    <br>
    Phil Olynyk (pholynyk) (<i>Lead Developer</i>), GuyScharf, sawinglogz, Ray Elliott (LoudSnorer), untoutseul05</p>
    <p>
-    <b>Reporters</b>
-    <br>AlanE, BrandonA, Crimson Nape, foxfire, Heyns, jeremieb, jaswilliams, palerider, patl</p>
+   <b>Reporters</b>
+    <br>Crimson Nape, palerider</p>
    <p>
    <b>Testers</b>
    <br>
-    Fred Bonjour (Gideon) (<i>Lead Tester</i>), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94,
-    unidee</p>
+    Fred Bonjour (Gideon) (<i>Lead Tester</i>), GuyScharf, Jeff8356, bollar, c137jayde, cberistain, coldfeet7, geraldbergeron, Homerec130, johnnyb00, jr3586, minderbinder, ScottZZZ, Shnorky, SleepyHenry, stbrown3rd, unidee</p>
    <p>
    <b>Advisors</b>
-    <br>aviB, SkepticDoc, Sleeprider, SleepyProgrammer, srlevine1, LunaFerret, harre, mdhamptom, mitchcampbell, rhashimoto, rtannerf</p>
+    <br>SkepticDoc, Sleeprider, srlevine1, harre, rhashimoto </p>
    <p>
    <b>Translators</b>
    <br>
-    Arie Klerk (A KLERK) (<i>Translations Team Coordinator, Dutch</i>), 1st.qwerty (<i>Polish</i>), C Chan (<i>Trad.Chinese)</i>, delta (<i>Romanian</i>), dolceitalia (<i>Italian</i>),  drmaestro (<i>Turkish</i>), drol (<i>French</i>), FaureCourtet (<i>French</i>), GregK (<i>Russian, Hebrew</i>), hearsay73 (<i>Filipino</i>), Heyns (<i>Afrikaans</i>), Hypoxic (<i>Greek</i>), k2boys (<i>Korean</i>), Lazer1234 (<i>Swedish</i>), mazingas65 (<i>Italian</i>), Ppja (<i>Spanish</i>), pstrjds (<i>Bulgarian</i>), refurbished (<i>Polish</i>), Ristraus (<i>Portugese and Brazilian Portugese</i>), rlabs (<i>Russian</i>), ShaunBlake (<i>British</i>), steffenreitz (<i>German</i>), tolnaiz (<i>Hungarian</i>), unidee (<i>Finnish</i>), untoutseul05 (<i>French</i>), yrnkrn (<i>Hebrew</i>), N-A-N (<i>Thai</i>). <br>
+    Arie Klerk (A KLERK) (<i>Translations Team Coordinator, Dutch</i>), 1st.qwerty (<i>Polish</i>), ApneaHero (<i>Czech</i>), C Chan (<i>Chinese Trad</i>), delta (<i>Romanian</i>), dolceitalia (<i>Italian</i>), dprenerov (<i>Bulgarian</i>), drmaestro (<i>Turkish</i>), drol (<i>French</i>), eddyDee (<i>Hebrew</i>), FaureCourtet (<i>French</i>), GregK (<i>Russian/Hebrew</i>), hearsay73 (<i>Filipino</i>), Heyns (<i>Afrikaans</i>), hisaotsu (<i>Japanese</i>), Hypoxic (<i>Greek</i>), k2boys (<i>Korean</i>), Lazer1234 (<i>Swedish</i>), mazingas65 (<i>Italian</i>), Ppja (<i>Spanish</i>), pstrjds (<i>Bulgarian</i>), refurbished (<i>Polish</i>), Ristraus (<i>Brazilian/Portugese</i>), rlabs (<i>Russian</i>), ShaunBlake (<i>British</i>), steffenreitz (<i>German</i>), tolnaiz (<i>Hungarian</i>), unidee (<i>Finnish</i>), untoutseul05 (<i>French</i>), yrnkrn (<i>Hebrew</i>), zellem (<i>Chinese Simplified) <br>
    <b>Thank you all very much for your continuous effort!</b></p>
    <p>
      <b>OSCAR is always looking for help: programmers, testers, or translators. If you are interested, please PM &#39;Gideon&#39; on the Apnea Board Forum.</b>
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@ -11,12 +11,32 @@
    <b>This page in other languages:</b>
    <br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
    <p>
-    <b>Changes and fixes in OSCAR v1.4.1-xxxx</b>
-    <br>Portions of OSCAR are © 2019-2022 by
+    <b>Changes and fixes in OSCAR v1.5.0-beta-1</b>
+    <br>Portions of OSCAR are © 2019-2023 by
    <i>The OSCAR Team</i></p>
    <ul>
-      <li>[fix] Allow Graph and Event combo boxes to remain open after changes.<li>
-      <li>[fix] Overview display of ResMed Oximeter events now works.<li>
+      <li>[new] Added Clinical and Permissive mode for compliance</li>
+      <li>[new] Added Clinical tab to preferences</li>
+      <li>[new] Red zero line for flow rate on by default</li>
+      <li>[new] Added dynamic resizing of daily graphs by double clicking graph name</li>
+      <li>[new] Hoffrichter Point 3 machines now supported</li>
+      <li>[new] Resvent machines now supported</li>
+      <li>[new] F&P Sleepstyle now reports Obstructive and Central separately</li>
+      <li>[new] Added Shift+click to zoom into 3 minute window</li>
+      <li>[new] Search function added to Daily Screen left panel</li>
+      <li>[new] Event Flags graph automatically resizes to even types selected</li>
+      <li>[new] Added warning dialog when a session is disabled</li>
+      <li>[new] Added Backup feature for daily/overview graph settings</li>
+      <li>[new] Lowenstein Prisma now supported</li>
+      <li>[fix] Improved support for PrismaLine bilevel modes</li>
+      <li>[fix] Selected event not showing in PRS1 devicess</li>
+      <li>[fix] Updated wording for View > Reset Graphs</li>
+      <li>[fix] Crash on View > Reset Graphs</li>
+      <li>[fix] Viatom now imports files with .dat extension</li>
+      <li>[fix] Graph combo box updated</li>
+      <li>[fix] Weight calculation</li>
+      <li>[fix] Allow Graph and Event combo boxes to remain open after changes.</li>
+      <li>[fix] Overview display of ResMed Oximeter events now works.</li>
    </ul>
    <p>
    <b>Changes and fixes in OSCAR v1.4.0</b>
--- a/Translations/Afrikaans.af.ts
+++ b/Translations/Afrikaans.af.ts
--- a/Translations/Arabic.ar.ts
+++ b/Translations/Arabic.ar.ts
--- a/Translations/Bulgarian.bg.ts
+++ b/Translations/Bulgarian.bg.ts
--- a/Translations/Chinese.zh_CN.ts
+++ b/Translations/Chinese.zh_CN.ts
--- a/Translations/Chinese.zh_TW.ts
+++ b/Translations/Chinese.zh_TW.ts
--- a/Translations/Czech.cz.ts
+++ b/Translations/Czech.cz.ts
--- a/Translations/Dansk.da.ts
+++ b/Translations/Dansk.da.ts
--- a/Translations/Deutsch.de.ts
+++ b/Translations/Deutsch.de.ts
--- a/Translations/English.en_UK.ts
+++ b/Translations/English.en_UK.ts
--- a/Translations/Espaniol.es.ts
+++ b/Translations/Espaniol.es.ts
--- a/Translations/Espaniol.es_MX.ts
+++ b/Translations/Espaniol.es_MX.ts
--- a/Translations/Filipino.fil.ts
+++ b/Translations/Filipino.fil.ts
--- a/Translations/Filipino.ph.ts
+++ b/Translations/Filipino.ph.ts
--- a/Translations/Francais.fr.ts
+++ b/Translations/Francais.fr.ts
--- a/Translations/Greek.el.ts
+++ b/Translations/Greek.el.ts
--- a/Translations/Hebrew.he.ts
+++ b/Translations/Hebrew.he.ts
--- a/Translations/Italiano.it.ts
+++ b/Translations/Italiano.it.ts
--- a/Translations/Japanese.ja.ts
+++ b/Translations/Japanese.ja.ts
--- a/Translations/Korean.ko.ts
+++ b/Translations/Korean.ko.ts
--- a/Translations/Magyar.hu.ts
+++ b/Translations/Magyar.hu.ts
--- a/Translations/Nederlands.nl.ts
+++ b/Translations/Nederlands.nl.ts
--- a/Translations/Norsk.no.ts
+++ b/Translations/Norsk.no.ts
--- a/Translations/Polski.pl.ts
+++ b/Translations/Polski.pl.ts
--- a/Translations/Portugues.pt.ts
+++ b/Translations/Portugues.pt.ts
--- a/Translations/Portugues.pt_BR.ts
+++ b/Translations/Portugues.pt_BR.ts
--- a/Translations/Romanian.ro.ts
+++ b/Translations/Romanian.ro.ts
--- a/Translations/Russkiy.ru.ts
+++ b/Translations/Russkiy.ru.ts
--- a/Translations/Suomi.fi.ts
+++ b/Translations/Suomi.fi.ts
--- a/Translations/Svenska.sv.ts
+++ b/Translations/Svenska.sv.ts
--- a/Translations/Thai.th.ts
+++ b/Translations/Thai.th.ts
--- a/Translations/Turkish.tr.ts
+++ b/Translations/Turkish.tr.ts
--- a/Translations/qt/oscar_qt_fil.ts
+++ b/Translations/qt/oscar_qt_fil.ts
--- a/oscar/Graphs/MinutesAtPressure.h
+++ b/oscar/Graphs/MinutesAtPressure.h
@ -23,6 +23,7 @@ public:
    PressureInfo();
    PressureInfo(ChannelID code, qint64 minTime, qint64 maxTime) ;
    PressureInfo(PressureInfo &copy) = default;
+    ~PressureInfo() {} ;

    void AddChannel(ChannelID c);
    void AddChannels(QList<ChannelID> & chans);
@ -272,3 +273,4 @@ public:
 };

 #endif // MINUTESATPRESSURE_H
+
--- a/oscar/Graphs/gFlagsLine.cpp
+++ b/oscar/Graphs/gFlagsLine.cpp
@ -7,6 +7,11 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+#define BAR_TITLE_BAR_DEBUGoff
+
+
 #include <cmath>
 #include <QVector>
 #include "SleepLib/profiles.h"
@ -70,8 +75,12 @@ void gFlagsGroup::SetDay(Day *d)
        return;
    }

+    m_sessions = d->getSessions(MT_CPAP);
+    m_start  =   d->first(MT_CPAP);
+    m_duration = d->last(MT_CPAP) - m_start;
+    if (m_duration<=0) m_duration = 1; // avoid divide by zero

-    quint32 z = schema::FLAG | schema::SPAN;
+    quint32 z = schema::FLAG | schema::SPAN | schema::MINOR_FLAG;
    if (p_profile->general->showUnknownFlags()) z |= schema::UNKNOWN;
    availableChans = d->getSortedMachineChannels(z);

@ -111,23 +120,6 @@ void gFlagsGroup::SetDay(Day *d)


    cnt = lvisible.size();
-
-//    for (int i = 0; i < layers.size(); i++) {
-//        gFlagsLine *f = dynamic_cast<gFlagsLine *>(layers[i]);
-
-//        if (!f) { continue; }
-
-//        bool e = f->isEmpty();
-
-//        if (!e || f->isAlwaysVisible()) {
-//            lvisible.push_back(f);
-
-//            if (!e) {
-//                cnt++;
-//            }
-//        }
-//    }
-
    m_empty = (cnt == 0);

    if (m_empty) {
@ -138,6 +130,7 @@ void gFlagsGroup::SetDay(Day *d)

    m_barh = 0;
 }
+
 bool gFlagsGroup::isEmpty()
 {
    if (m_day) {
@ -147,21 +140,38 @@ bool gFlagsGroup::isEmpty()
    return true;
 }

+void gFlagsGroup::refreshConfiguration(gGraph* graph)
+{
+    int numOn=0;
+    for (const auto & flagsline : lvisible) {
+        if (schema::channel[flagsline->code()].enabled()) numOn++;
+    }
+    if (numOn==0) numOn=1;  // always have an area showing in graph.
+    float barHeight = QFontMetrics(*defaultfont).capHeight() + QFontMetrics(*defaultfont).descent() ;
+    int height (barHeight * numOn);
+    height += sessionBarHeight();
+    setMinimumHeight (height);
+    if (graph->height()<height) graph->setHeight (height);
+}
+
+int  gFlagsGroup::sessionBarHeight() {
+     static const int m_sessionHeight = 7;
+     return (m_sessions.size()>1 ) ? m_sessionHeight : 0;
+};
+
 void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
 {
+    if (!m_visible) { return; }
+    if (!m_day) { return; }
+
    QRectF outline(region.boundingRect());
    outline.translate(0.0f, 0.001f);

    int left = region.boundingRect().left()+1;
-    int top = region.boundingRect().top()+1;
+    int top = region.boundingRect().top()+1 ;
    int width = region.boundingRect().width();
    int height = region.boundingRect().height();

-    if (!m_visible) { return; }
-
-    if (!m_day) { return; }
-
-
    QVector<gFlagsLine *> visflags;

    for (const auto & flagsline : lvisible) {
@ -169,9 +179,34 @@ void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
            visflags.push_back(flagsline);
    }

+    int sheight = (m_sessions.size()>1?sessionBarHeight():0);
    int vis = visflags.size();
-    m_barh = float(height) / float(vis);
-    float linetop = top;
+    m_barh = float(height-sheight) / float(vis);
+    float linetop = top+sheight-2;
+
+    qint64 minx,maxx,dur;
+    g.graphView()->GetXBounds(minx,maxx);
+    dur = maxx - minx;
+
+    #if BAR_TITLE_BAR_DEBUG
+    // debug for minimum size for event flags.  adding required height for enabled events , number eventTypes , height of an event bar
+   QString text= QString("%1 -> %2     %3: %4 H:%5 Vis:%6 barH:%7").
+        arg(QDateTime::fromMSecsSinceEpoch(minx).time().toString()).
+        arg(QDateTime::fromMSecsSinceEpoch(maxx).time().toString()).
+        arg(QObject::tr("Selection Length")).
+        arg(QTime(0,0).addMSecs(dur).toString("H:mm:ss.zzz"))
+        .arg(height)
+        .arg(vis)
+        .arg(m_barh)
+        ;
+    #else
+    QString text= QString("%1 -> %2       %3: %4").
+        arg(QDateTime::fromMSecsSinceEpoch(minx).time().toString()).
+        arg(QDateTime::fromMSecsSinceEpoch(maxx).time().toString()).
+        arg(QObject::tr("Selection Length")).
+        arg(QTime(0,0).addMSecs(dur).toString("H:mm:ss.zzz")) ;
+    #endif
+    g.renderText(text, left , top -5 );

    QColor barcol;

@ -195,6 +230,17 @@ void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
        linetop += m_barh;
    }

+    // graph each session at top
+    if (m_sessions.size()>1 ) {
+        QRect sessBox(0,g.top,0,sessionBarHeight());
+        double adjustment = width/(double)m_duration;
+        for (const auto & sess : m_sessions) {
+            sessBox.setX(left + (sess->first()-m_start)*adjustment);
+            sessBox.setWidth(   sess->length() * adjustment);
+            painter.fillRect(sessBox, QBrush(Qt::gray));
+        }
+    }
+
    painter.setPen(COLOR_Outline);
    painter.drawRect(outline);

@ -277,7 +323,6 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
    double xmult = width / xx;

    schema::Channel & chan = schema::channel[m_code];
-
    GetTextExtent(chan.label(), m_lx, m_ly);

    // Draw text label
--- a/oscar/Graphs/gFlagsLine.h
+++ b/oscar/Graphs/gFlagsLine.h
@ -64,9 +64,6 @@ class gFlagsLine: public Layer
    //! \brief Drawing code to add the flags and span markers to the Vertex buffers.
    virtual void paint(QPainter &painter, gGraph &w, const QRegion &region);

-    void setTotalLines(int i) { total_lines = i; }
-    void setLineNum(int i) { line_num = i; }
-
    virtual Layer * Clone() {
        gFlagsLine * layer = new gFlagsLine(NoChannel);  //ouchie..
        Layer::CloneInto(layer);
@ -76,8 +73,6 @@ class gFlagsLine: public Layer

    void CloneInto(gFlagsLine * layer ) {
        layer->m_always_visible = m_always_visible;
-        layer->total_lines = total_lines;
-        layer->line_num = line_num;
        layer->m_lx = m_lx;
        layer->m_ly = m_ly;
    }
@ -87,7 +82,6 @@ class gFlagsLine: public Layer
    virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);

    bool m_always_visible;
-    int total_lines, line_num;
    int m_lx, m_ly;

 };
@ -117,16 +111,11 @@ class gFlagsGroup: public LayerGroup
    //! Returns true if none of the gFlagLine objects contain any data for this day
    virtual bool isEmpty();

-    //! Returns the count of visible flag line entries
-    int count() { return lvisible.size(); }
-
-    //! Returns the height in pixels of each bar
-    int barHeight() { return m_barh; }
-
    //! Returns a list of Visible gFlagsLine layers to draw
    QVector<gFlagsLine *> &visibleLayers() { return lvisible; }

    void alwaysVisible(ChannelID code) { m_alwaysvisible.push_back(code); }
+    void refreshConfiguration(gGraph* graph) ;

    virtual Layer * Clone() {
        gFlagsGroup * layer = new gFlagsGroup();  //ouchie..
@ -138,6 +127,7 @@ class gFlagsGroup: public LayerGroup
    void CloneInto(gFlagsGroup * layer) {
        layer->m_alwaysvisible = m_alwaysvisible;
        layer->availableChans = availableChans;
+        layer->m_sessions = m_sessions;

        for (int i=0; i<lvisible.size(); i++) {
            layer->lvisible.append(dynamic_cast<gFlagsLine *>(lvisible.at(i)->Clone()));
@ -150,15 +140,16 @@ class gFlagsGroup: public LayerGroup

  protected:
    virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
-
    QList<ChannelID> m_alwaysvisible;
-
    QList<ChannelID> availableChans;
-
-    QVector<gFlagsLine *> lvisible;
+    QList<Session*> m_sessions;
+    qint64 m_start  ;
+    qint64 m_duration ;
+    QVector<gFlagsLine*> lvisible;
    float m_barh;
    bool m_empty;
    bool m_rebuild_cpap;
+    int sessionBarHeight();
 };

 #endif // GFLAGSLINE_H
--- a/oscar/Graphs/gGraph.cpp
+++ b/oscar/Graphs/gGraph.cpp
@ -24,6 +24,64 @@

 extern MainWindow *mainwin;

+#if 0
+/*
+from qt 4.8
+int QGraphicsSceneWheelEvent::delta() const
+Returns the distance that the wheel is rotated, in eighths (1/8s) of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user.
+
+int QWheelEvent::delta () const
+Returns the distance that the wheel is rotated, in eighths of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user.
+
+Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.
+
+However, some mice have finer-resolution wheels and send delta values that are less than 120 units (less than 15 degrees). To support this possibility, you can either cumulatively add the delta values from events until the value of 120 is reached, then scroll the widget, or you can partially scroll the widget in response to each wheel event.
+
+Example:
+
+ void MyWidget::wheelEvent(QWheelEvent *event)
+ {
+     int numDegrees = event->delta() / 8;
+     int numSteps = numDegrees / 15;
+
+     if ( isWheelEventHorizontal(event) )  {
+         scrollHorizontally(numSteps);
+     } else {
+         scrollVertically(numSteps);
+     }
+     event->accept();
+ }
+
+
+ from qt 5.15
+Returns the relative amount that the wheel was rotated, in eighths of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user. angleDelta().y() provides the angle through which the common vertical mouse wheel was rotated since the previous event. angleDelta().x() provides the angle through which the horizontal mouse wheel was rotated, if the mouse has a horizontal wheel; otherwise it stays at zero. Some mice allow the user to tilt the wheel to perform horizontal scrolling, and some touchpads support a horizontal scrolling gesture; that will also appear in angleDelta().x().
+
+Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.
+
+However, some mice have finer-resolution wheels and send delta values that are less than 120 units (less than 15 degrees). To support this possibility, you can either cumulatively add the delta values from events until the value of 120 is reached, then scroll the widget, or you can partially scroll the widget in response to each wheel event. But to provide a more native feel, you should prefer pixelDelta() on platforms where it's available.
+*/
+#endif
+
+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define wheelEventPos( id )   id ->position()
+    #define wheelEventX( id )     id ->position().x()
+    #define wheelEventY( id )     id ->position().y()
+    #define wheelEventDelta( id ) id ->angleDelta().y()
+
+    #define isWheelEventVertical( id )  id ->angleDelta().x()==0
+    #define isWheelEventHorizontal( id )  id ->angleDelta().y()==0
+#else
+    #define wheelEventPos( id )   id ->pos()
+    #define wheelEventX( id )     id ->x()
+    #define wheelEventY( id )     id ->y()
+    #define wheelEventDelta( id ) id ->delta()
+
+    #define isWheelEventVertical( id )  id ->orientation() == Qt::Vertical
+    #define isWheelEventHorizontal( id )  id ->orientation() == Qt::Horizontal
+#endif
+
 // Graph globals.
 QFont *defaultfont = nullptr;
 QFont *mediumfont = nullptr;
@ -144,7 +202,8 @@ gGraph::gGraph(QString name, gGraphView *graphview, QString title, QString units
        qDebug() << "Trying to duplicate " << name << " when a graph with the same name already exists";
        name+="-1";
    }
-    m_min_height = 60;
+    m_min_height = 60;      // this is the graphs minimum height.- does not consider the graphs layer height requirements. 
+    m_defaultLayerMinHeight = 25;   // this is the minimum requirements for the layer height. can be chnaged by a layer. // not changable
    m_width = 0;

    m_layers.clear();
@ -179,7 +238,6 @@ gGraph::gGraph(QString name, gGraphView *graphview, QString title, QString units
    m_pinned = false;
    m_lastx23 = 0;

-    invalidate_yAxisImage = true;
    invalidate_xAxisImage = true;

    m_block_select = false;
@ -775,6 +833,7 @@ double gGraph::currentTime() const
 {
    return m_graphview->currentTime();
 }
+
 double gGraph::screenToTime(int xpos)
 {
    double w = m_rect.width() - left - right;
@ -863,8 +922,7 @@ void gGraph::mouseMoveEvent(QMouseEvent *event)
            if (d > 1) {
                m_selDurString = tr("%1 days").arg(floor(d));
            } else {
-
-                m_selDurString.sprintf("%02i:%02i:%02i:%03i", h, m, s, ms);
+                m_selDurString=QString::asprintf("%02i:%02i:%02i:%03i", h, m, s, ms);
            }

            ToolTipAlignment align = x >= x2 ? TT_AlignLeft : TT_AlignRight;
@ -953,18 +1011,6 @@ void gGraph::mousePressEvent(QMouseEvent *event)
                return;
            }
    }
-
-    /*
-    int w=m_lastbounds.width()-(right+m_marginright);
-    //int h=m_lastbounds.height()-(bottom+m_marginbottom);
-    //int x2,y2;
-    double xx=max_x-min_x;
-    //double xmult=xx/w;
-    if (x>left+m_marginleft && x<m_lastbounds.width()-(right+m_marginright) && y>top+m_margintop && y<m_lastbounds.height()-(bottom+m_marginbottom)) { // main area
-        x-=left+m_marginleft;
-        y-=top+m_margintop;
-    }*/
-    //qDebug() << m_title << "Clicked" << x << y << left << right << top << bottom << m_width << m_height;
 }

 void gGraph::mouseReleaseEvent(QMouseEvent *event)
@ -1068,6 +1114,15 @@ void gGraph::mouseReleaseEvent(QMouseEvent *event)

    if ((m_graphview->horizTravel() < mouse_movement_threshold) && (x > left && x < w + left
            && y > top && y < h)) {
+        if ((event->modifiers() & Qt::ShiftModifier) != 0) {
+            qint64 time = (qint64)screenToTime(x);
+            qint64 period =qint64(p_profile->general->eventWindowSize())*60000L;  // eventwindowsize units  minutes
+            qint64 small  =period/10;
+            qint64 start = time - period;
+            qint64 end   = time + small;
+            m_graphview->SetXBounds(start, end);
+            return;
+        }
        // normal click in main area
        if (!m_blockzoom) {
            double zoom;
@ -1142,23 +1197,23 @@ void gGraph::mouseReleaseEvent(QMouseEvent *event)

 void gGraph::wheelEvent(QWheelEvent *event)
 {
-    qDebug() << m_title << "Wheel" << event->x() << event->y() << event->delta();
+    //qDebug() << m_title << "Wheel" << wheelEventX(event) << wheelEventY(event) << wheelEventDelta(event);
    //int y=event->pos().y();
-    if (event->orientation() == Qt::Horizontal) {
+    if ( isWheelEventHorizontal(event) ) {

        return;
    }

-    int x = event->pos().x() - m_graphview->titleWidth; //(left+m_marginleft);
+    int x = wheelEventPos( event).x() - m_graphview->titleWidth; //(left+m_marginleft);

-    if (event->delta() > 0) {
+    if (wheelEventDelta(event) > 0) {
        ZoomX(0.75, x);
    } else {
        ZoomX(1.5, x);
    }

-    int y = event->pos().y();
-    x = event->pos().x();
+    int y = wheelEventPos(event).y();
+    x = wheelEventPos(event).x();

    for (const auto & layer : m_layers) {
        if (layer->m_rect.contains(x, y)) {
@ -1265,7 +1320,6 @@ void gGraph::DrawTextQue(QPainter &painter)
 void gGraph::resize(int width, int height)
 {
    invalidate_xAxisImage = true;
-    invalidate_yAxisImage = true;

    Q_UNUSED(width);
    Q_UNUSED(height);
@ -1476,18 +1530,14 @@ Layer *gGraph::getLineChart()

 int gGraph::minHeight()
 {
-    int minheight = m_min_height;
-
-//    int top = 0;
-//    int center = 0;
-//    int bottom = 0;
+    // adjust graph height for centerLayer (ploting area) required height.
+    int adjustment  = top + bottom;    //adjust graph minimun to layer minimum
+    int minlayerheight = m_min_height  - adjustment;
    for (const auto & layer : m_layers) {
-        int mh = layer->minimumHeight();
-        mh += m_margintop + m_marginbottom;
-        if (mh > minheight) minheight = mh;
+        if (layer->position() != LayerCenter) continue;
+        minlayerheight = max(max (m_defaultLayerMinHeight,layer->minimumHeight()),minlayerheight);
    }
-    // layers need to set their own too..
-    return minheight;
+    return minlayerheight + adjustment; // adjust layer min to graph minimum
 }

 int GetXHeight(QFont *font)
--- a/oscar/Graphs/gGraph.h
+++ b/oscar/Graphs/gGraph.h
@ -101,7 +101,6 @@ class gGraph : public QObject
    //! \brief Set the height element. (relative to the total of all heights)
    void setHeight(float height) {
        m_height = height;
-        invalidate_yAxisImage = true;
    }

    //! \brief Return minimum height this graph is allowed to (considering layer preferences too)
@ -318,8 +317,7 @@ class gGraph : public QObject
    bool dynamicScalingOn =false;
    QTimer *timer;

-    // This gets set to true to force a redraw of the yAxis tickers when graphs are resized.
-    bool invalidate_yAxisImage;
+    // This gets set to true to force a redraw of the xAxis tickers when graphs are resized.
    bool invalidate_xAxisImage;

    //! \brief Returns a Vector reference containing all this graphs layers
@ -404,6 +402,7 @@ class gGraph : public QObject
    ZoomyScaling m_zoomY;
    bool m_block_select;
    QRect m_rect;
+    int m_defaultLayerMinHeight;

    qint64 m_selectedDuration;

--- a/oscar/Graphs/gGraphView.cpp
+++ b/oscar/Graphs/gGraphView.cpp
@ -47,6 +47,65 @@
 #include "SleepLib/profiles.h"
 #include "overview.h"

+
+#if 0
+/*
+from qt 4.8
+int QGraphicsSceneWheelEvent::delta() const
+Returns the distance that the wheel is rotated, in eighths (1/8s) of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user.
+
+int QWheelEvent::delta () const
+Returns the distance that the wheel is rotated, in eighths of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user.
+
+Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.
+
+However, some mice have finer-resolution wheels and send delta values that are less than 120 units (less than 15 degrees). To support this possibility, you can either cumulatively add the delta values from events until the value of 120 is reached, then scroll the widget, or you can partially scroll the widget in response to each wheel event.
+
+Example:
+
+ void MyWidget::wheelEvent(QWheelEvent *event)
+ {
+     int numDegrees = event->delta() / 8;
+     int numSteps = numDegrees / 15;
+
+     if ( isEventHorizontal(event) )  {
+         scrollHorizontally(numSteps);
+     } else {
+         scrollVertically(numSteps);
+     }
+     event->accept();
+ }
+
+
+ from qt 5.15
+Returns the relative amount that the wheel was rotated, in eighths of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user. angleDelta().y() provides the angle through which the common vertical mouse wheel was rotated since the previous event. angleDelta().x() provides the angle through which the horizontal mouse wheel was rotated, if the mouse has a horizontal wheel; otherwise it stays at zero. Some mice allow the user to tilt the wheel to perform horizontal scrolling, and some touchpads support a horizontal scrolling gesture; that will also appear in angleDelta().x().
+
+Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.
+
+However, some mice have finer-resolution wheels and send delta values that are less than 120 units (less than 15 degrees). To support this possibility, you can either cumulatively add the delta values from events until the value of 120 is reached, then scroll the widget, or you can partially scroll the widget in response to each wheel event. But to provide a more native feel, you should prefer pixelDelta() on platforms where it's available.
+*/
+#endif
+
+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define wheelEventPos( id )   id ->position()
+    #define wheelEventX( id )     id ->position().x()
+    #define wheelEventY( id )     id ->position().y()
+    #define wheelEventDelta( id ) id ->angleDelta().y()
+
+    #define isWheelEventVertical( id )  id ->angleDelta().x()==0
+    #define isWheelEventHorizontal( id )  id ->angleDelta().y()==0
+#else
+    #define wheelEventPos( id )   id ->pos()
+    #define wheelEventX( id )     id ->x()
+    #define wheelEventY( id )     id ->y()
+    #define wheelEventDelta( id ) id ->delta()
+
+    #define isWheelEventVertical( id )  id ->orientation() == Qt::Vertical
+    #define isWheelEventHorizontal( id )  id ->orientation() == Qt::Horizontal
+#endif
+
 extern MainWindow *mainwin;

 #include <QApplication>
@ -110,8 +169,11 @@ w+=m_spacer*2;
 h+=m_spacer*2; */
 //}

-void gToolTip::display(QString text, int x, int y, ToolTipAlignment align, int timeout)
+void gToolTip::display(QString text, int x, int y, ToolTipAlignment align, int timeout,bool alwaysShow)
 {
+    if (!alwaysShow && !AppSetting->graphTooltips())  {
+        return;
+    }
    if (timeout <= 0) {
        timeout = AppSetting->tooltipTimeout();
    }
@ -284,7 +346,7 @@ void gParentToolTip::paint(QPainter &painter,int width,int height) {
    if (!m_parent_visible) {return ;};
    m_width=width;
    m_height=height;
-    gToolTip::display(m_text, 0, 0,m_alignment, m_timeout);
+    gToolTip::display(m_text, 0, 0,m_alignment, m_timeout,true);
    gToolTip::paint(painter);
 };

@ -888,7 +950,11 @@ void gGraphView::DrawTextQue(QPainter &painter)
        if (q.angle == 0) {
            painter.drawText(q.x, q.y, q.text);
        } else {
-            w = painter.fontMetrics().width(q.text);
+            #if (QT_VERSION >= QT_VERSION_CHECK(5,11,0))
+                w = painter.fontMetrics().horizontalAdvance(q.text);
+            #else
+                w = painter.fontMetrics().width(q.text);
+            #endif
            h = painter.fontMetrics().xHeight() + 2;

            painter.translate(q.x, q.y);
@ -913,7 +979,11 @@ void gGraphView::DrawTextQue(QPainter &painter)
        if (q.angle == 0) {
            painter.drawText(q.rect, q.flags, q.text);
        } else {
-            w = painter.fontMetrics().width(q.text);
+            #if (QT_VERSION >= QT_VERSION_CHECK(5,11,0))
+                w = painter.fontMetrics().horizontalAdvance(q.text);
+            #else
+                w = painter.fontMetrics().width(q.text);
+            #endif
            h = painter.fontMetrics().xHeight() + 2;

            painter.translate(q.rect.x(), q.rect.y());
@ -954,7 +1024,11 @@ void gGraphView::DrawTextQueCached(QPainter &painter)
        if (!QPixmapCache::find(hstr, &pm)) {

            QFontMetrics fm(*q.font);
-            w = fm.width(q.text);
+            #if (QT_VERSION >= QT_VERSION_CHECK(5,11,0))
+                w = painter.fontMetrics().horizontalAdvance(q.text);
+            #else
+                w = painter.fontMetrics().width(q.text);
+            #endif
            h = fm.height()+buf;

            pm = QPixmap(w, h);
@ -1780,8 +1854,11 @@ void gGraphView::mouseMoveEvent(QMouseEvent *event)
        float h = m_graphs[m_sizer_index]->height();
        h += my / m_scaleY;

-        if (h > m_graphs[m_sizer_index]->minHeight()) {
-            m_graphs[m_sizer_index]->setHeight(h);
+        gGraph* graph = m_graphs[m_sizer_index];
+        int minHeight = graph-> minHeight();
+        if (h < minHeight) { h = minHeight; }   // past minimum height - reset to to minimum
+        if ((h > minHeight) || ( graph->height() > minHeight)) {
+            graph->setHeight(h);
            m_sizer_point.setX(x);
            m_sizer_point.setY(y);
            updateScrollBar();
@ -2232,6 +2309,13 @@ void gGraphView::populateMenu(gGraph * graph)

            if (!lc->m_enabled[dot.code]) continue;

+            #if defined(ENABLE_ALWAYS_ON_ZERO_RED_LINE_FLOW_RATE)
+            // if red line is always on then there is no need for the button to turn it on /off
+            // skip creating UI to change value.   or turn enabled off.
+            //if (lc->code() == CPAP_FlowRate && dot.type == Calc_Zero) continue;
+            if (lc->code() == CPAP_FlowRate) continue;
+            #endif
+
            schema::Channel &chan = schema::channel[dot.code];

            if (dot.available) {
@ -3065,7 +3149,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
    if (event->modifiers() == Qt::NoModifier) {
        int scrollDampening = AppSetting->scrollDampening();

-        if (event->orientation() == Qt::Vertical) { // Vertical Scrolling
+        if (isWheelEventVertical(event)) { // Vertical Scrolling
            if (horizScrollTime.elapsed() < scrollDampening) {
                return;
            }
@ -3088,7 +3172,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
    gGraph *graph = nullptr;
    int group = 0;
    //int x = event->x();
-    int y = event->y();
+    int y = wheelEventY(event);

    float h, py = 0, pinned_height = 0;

@ -3172,7 +3256,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
        double xx = (graph->max_x - graph->min_x);
        double zoom = 240.0;

-        int delta = event->delta();
+        int delta = wheelEventDelta(event);

        if (delta > 0) {
            graph->min_x -= (xx / zoom) * (float)abs(delta);
@ -3470,7 +3554,7 @@ void gGraphView::resetGraphOrder(bool pinFirst, const QList<QString> graphOrder)
        QString nextGraph = graphOrder.at(i);
        auto it = m_graphsbyname.find(nextGraph);
        if (it == m_graphsbyname.end()) {
-            qDebug() << "resetGraphOrder could not find" << nextGraph;
+            // qDebug() << "resetGraphOrder could not find" << nextGraph;
            continue;  // should not happen
        }
        gGraph * graph = it.value();
@ -3481,7 +3565,7 @@ void gGraphView::resetGraphOrder(bool pinFirst, const QList<QString> graphOrder)
    }
    // If we didn't find everything, append anything extra we have
    for (int i = 0; i < old_graphs.size(); i++) {
-        qDebug() << "resetGraphOrder added leftover" << old_graphs.at(i)->name();
+        // qDebug() << "resetGraphOrder added leftover" << old_graphs.at(i)->name();
        new_graphs.append(old_graphs.at(i));
    }

@ -3513,8 +3597,8 @@ void gGraphView::SaveDefaultSettings() {
    m_default_graphs = m_graphs;
 }

-const quint32 gvmagic = 0x41756728;   //'Aug('
-const quint16 gvversion = 4;
+const quint32 gVmagic = 0x41756728;   //'Aug('
+const quint16 gVversion = 5;    // version 5 has same format as 4, used to override settings in shg files on upgrade to version 5.

 QString gGraphView::settingsFilename (QString title,QString folderName, QString ext) {
    if (folderName.size()==0) {
@ -3523,6 +3607,19 @@ QString gGraphView::settingsFilename (QString title,QString folderName, QString
    return folderName+title.toLower()+ext;
 }

+/* This note is for the save and restore settings.
+* all versions prior to 4 were sleepyHead versions and have never been used.
+* The layouts (version 4 and 5) are identical
+* The rollback to a gVversion should always work.
+* So new addtions to the saved configuration must be placed at the end of the file.
+* the SHG file will then be
+*   SHG FILE HEADER - Must never change
+*   SHG VERSION 4(5) changes - for all graphs
+*   SHG VERSION 6 changes - for all graphs
+*   SHG VERSION 7 changes - for all graphs
+*   ...
+*/
+
 void gGraphView::SaveSettings(QString title,QString folderName)
 {
    qDebug() << "Saving" << title << "settings";
@ -3533,8 +3630,8 @@ void gGraphView::SaveSettings(QString title,QString folderName)
    out.setVersion(QDataStream::Qt_4_6);
    out.setByteOrder(QDataStream::LittleEndian);

-    out << (quint32)gvmagic;
-    out << (quint16)gvversion;
+    out << (quint32)gVmagic;
+    out << (quint16)gVversion;

    out << (qint16)size();

@ -3559,9 +3656,13 @@ void gGraphView::SaveSettings(QString title,QString folderName)
        } else {
            out << (quint32)LT_Other;
        }
-
+    }
+    #if 0
+    // add changes for additional settings
+    for (auto & graph : m_graphs) {

    }
+    #endif

    f.close();
 }
@ -3598,80 +3699,62 @@ bool gGraphView::LoadSettings(QString title,QString folderName)

    in >> t1;

-    if (t1 != gvmagic) {
-        qDebug() << "gGraphView" << title << "settings magic doesn't match" << t1 << gvmagic;
+    if (t1 != gVmagic) {
+        qDebug() << "gGraphView" << title << "settings magic doesn't match" << t1 << gVmagic;
        return false;
    }

    in >> version;

-    if (version < gvversion) {
-        qDebug() << "gGraphView" << title << "settings will be upgraded.";
-    }
+    //The first version of OSCAR 1.0.0-release started at gVversion 4. and the OSCAR 1.4.0 still uses gVversion 4
+    // This section of code is being simplified  to remove dependances on lower version.

-    qint16 siz;
-    in >> siz;
+    //if (version < gVversion) {
+        //qDebug() << "gGraphView" << title << "settings will be upgraded.";
+    //}
+
+    qint16 numGraphs;
    QString name;
    float hght;
    bool vis;
    EventDataType recminy, recmaxy;
    bool pinned;
-
    short zoomy = 0;
-
    QList<gGraph *> neworder;
    QHash<QString, gGraph *>::iterator gi;

-    for (int i = 0; i < siz; i++) {
+    in >> numGraphs;
+    for (int i = 0; i < numGraphs; i++) {
        in >> name;
        in >> hght;
        in >> vis;
        in >> recminy;
        in >> recmaxy;
 //qDebug() << "Loading graph" << title << name;
-        if (gvversion >= 1) {
-            in >> zoomy;
-        }
-
-        if (gvversion >= 2) {
-            in >> pinned;
-        }
+        in >> zoomy;

+        in >> pinned;
        QHash<ChannelID, bool> flags_enabled;
        QHash<ChannelID, bool> plots_enabled;
        QHash<ChannelID, QHash<quint32, bool> > dot_enabled;

        // Warning: Do not break the follow section up!!!
        quint32 layertype;
-        if (gvversion >= 4) {
-            in >> layertype;
-            if (layertype == LT_LineChart) {
-                in >> flags_enabled;
-                in >> plots_enabled;
-                in >> dot_enabled;
-            }
+        in >> layertype;
+        if (layertype == LT_LineChart) {
+            in >> flags_enabled;
+            in >> plots_enabled;
+            in >> dot_enabled;
        }

        gGraph *g = nullptr;
-
-        if (version <= 2) {
-            continue;
-//            // Names were stored as translated strings, so look up title instead.
-//            g = nullptr;
-//            for (int z=0; z<m_graphs.size(); ++z) {
-//                if (m_graphs[z]->title() == name) {
-//                    g = m_graphs[z];
-//                    break;
-//                }
-//            }
+        gi = m_graphsbyname.find(name);
+        if (gi == m_graphsbyname.end()) {
+            qDebug() << "Graph" << name << "has been renamed or removed";
        } else {
-            gi = m_graphsbyname.find(name);
-            if (gi == m_graphsbyname.end()) {
-                qDebug() << "Graph" << name << "has been renamed or removed";
-            } else {
-                g = gi.value();
-            }
+            g = gi.value();
        }
+
        if (g) {
            neworder.push_back(g);
            g->setHeight(hght);
@ -3681,19 +3764,41 @@ bool gGraphView::LoadSettings(QString title,QString folderName)
            g->setZoomY(static_cast<ZoomyScaling>(zoomy));
            g->setPinned(pinned);

-            if (gvversion >= 4) {
-                if (layertype == LT_LineChart) {
-                    gLineChart * lc = dynamic_cast<gLineChart *>(findLayer(g, LT_LineChart));
-                    if (lc) {
-                        hashMerge(lc->m_flags_enabled, flags_enabled);
-                        hashMerge(lc->m_enabled, plots_enabled);
-                        hashMerge(lc->m_dot_enabled, dot_enabled);
+            if (layertype == LT_LineChart) {
+                gLineChart * lc = dynamic_cast<gLineChart *>(findLayer(g, LT_LineChart));
+                if (lc) {
+                    hashMerge(lc->m_flags_enabled, flags_enabled);
+                    hashMerge(lc->m_enabled, plots_enabled);
+                    hashMerge(lc->m_dot_enabled, dot_enabled);
+
+                    // the following check forces the flowRate graph to have a Zero dotted line enabled when the the current version changes from 4 to 5
+                    // still allows the end user user to to remove the zero dotted line.
+                    // currently this would be executed on each graphview version (gVversion) change
+                    // could be changed.
+                    // This is a one time change.
+                    if (version==4 && gVversion>4) {
+                        lc->resetGraphViewSettings();
                    }
                }
            }
-
        }
    }
+    // Do this for gVersion 5
+    #if 0
+    // Version 5 had no changes
+    if (version>=gVversion)
+    for (int i = 0; i < numGraphs; i++) {
+    }
+    #endif
+
+    // Do this for gVersion 6 ...
+    #if 0
+    // repeat this for each additional version change
+    // this for the next additions to the saved information.
+    if (version>=gVversion)
+    for (int i = 0; i < numGraphs; i++) {
+    }
+    #endif

    if (neworder.size() == m_graphs.size()) {
        m_graphs = neworder;
--- a/oscar/Graphs/gGraphView.h
+++ b/oscar/Graphs/gGraphView.h
@ -26,6 +26,7 @@
 #include <QDoubleSpinBox>
 #include <QToolButton>
 #include <QTimer>
+#include <QElapsedTimer>
 #include <QGestureEvent>
 #include <QPinchGesture>

@ -103,7 +104,7 @@ public:
    QFont m_font;
    QString m_text;
    Qt::Alignment m_alignment;
-    QTime time;
+    QElapsedTimer time;
 protected slots:
    void doRedraw();

@ -234,7 +235,7 @@ class gToolTip : public QObject
    /*! \fn virtual void display(QString text, int x, int y, int timeout=2000);
        \brief Set the tooltips display message, position, and timeout value
        */
-    virtual void display(QString text, int x, int y, ToolTipAlignment align = TT_AlignCenter, int timeout = 0);
+    virtual void display(QString text, int x, int y, ToolTipAlignment align = TT_AlignCenter, int timeout = 0,bool alwaysShow=false);

    //! \brief Draw the tooltip
    virtual void paint(QPainter &paint); //actually paints it.
@ -717,7 +718,7 @@ class gGraphView

    QPixmapCache pixmapcache;

-    QTime horizScrollTime, vertScrollTime;
+    QElapsedTimer horizScrollTime, vertScrollTime;
    QMenu * context_menu;
    QAction * pin_action;
    QAction * popout_action;
--- a/oscar/Graphs/gLineChart.cpp
+++ b/oscar/Graphs/gLineChart.cpp
@ -47,7 +47,6 @@ QDataStream & operator>>(QDataStream & stream, DottedLine & dot)
    return stream;
 }

-
 QColor darken(QColor color, float p)
 {
    int r = qMin(int(color.red() * p), 255);
@ -58,6 +57,18 @@ QColor darken(QColor color, float p)
    return QColor(r,g,b, color.alpha());
 }

+void gLineChart::resetGraphViewSettings() {
+    #if !defined(ENABLE_ALWAYS_ON_ZERO_RED_LINE_FLOW_RATE)
+    // always turn zero red line on as default value.
+    if (m_code==CPAP_FlowRate) {
+        m_dot_enabled[m_code][Calc_Zero] = true;
+    } else
+    #endif
+    if (m_code==CPAP_Leak) {
+        m_dot_enabled[m_code][Calc_UpperThresh] = true;
+    }
+}
+
 gLineChart::gLineChart(ChannelID code, bool square_plot, bool disable_accel)
    : Layer(code), m_square_plot(square_plot), m_disable_accel(disable_accel)
 {
@ -66,7 +77,9 @@ gLineChart::gLineChart(ChannelID code, bool square_plot, bool disable_accel)
    lines.reserve(50000);
    lasttime = 0;
    m_layertype = LT_LineChart;
+    resetGraphViewSettings();
 }
+
 gLineChart::~gLineChart()
 {
    for (auto fit = flags.begin(), end=flags.end(); fit != end; ++fit) {
@ -210,7 +223,7 @@ skipcheck:
        if (!m_flags_enabled.contains(code)) {
            bool b = false;

-            if (((m_codes[0] == CPAP_FlowRate) || ((m_codes[0] == CPAP_MaskPressureHi))) && (schema::channel[code].machtype() == MT_CPAP)) b = true;
+            if (((m_codes[0] == CPAP_FlowRate) ||((m_codes[0] == CPAP_MaskPressureHi))) && (schema::channel[code].machtype() == MT_CPAP)) b = true;
            if ((m_codes[0] == CPAP_Leak) && (code == CPAP_LargeLeak)) b = true;
            m_flags_enabled[code] = b;
        }
@ -237,12 +250,14 @@ skipcheck:

    for (const auto & code : m_codes) {
        const schema::Channel & chan = schema::channel[code];
-        addDotLine(DottedLine(code, Calc_Max,chan.calc[Calc_Max].enabled));
+        if (code != CPAP_FlowRate) {
+            addDotLine(DottedLine(code, Calc_Max,chan.calc[Calc_Max].enabled));
+        }
        if ((code != CPAP_FlowRate) && (code != CPAP_MaskPressure) && (code != CPAP_MaskPressureHi)) {
            addDotLine(DottedLine(code, Calc_Perc,chan.calc[Calc_Perc].enabled));
            addDotLine(DottedLine(code, Calc_Middle, chan.calc[Calc_Middle].enabled));
        }
-        if ((code != CPAP_Snore) && (code != CPAP_FlowLimit) && (code != CPAP_RDI) && (code != CPAP_AHI)) {
+        if ((code != CPAP_FlowRate) && (code != CPAP_Snore) && (code != CPAP_FlowLimit) && (code != CPAP_RDI) && (code != CPAP_AHI)) {
            addDotLine(DottedLine(code, Calc_Min, chan.calc[Calc_Min].enabled));
        }
    }
@ -250,6 +265,10 @@ skipcheck:
        addDotLine(DottedLine(CPAP_Leak, Calc_UpperThresh, schema::channel[CPAP_Leak].calc[Calc_UpperThresh].enabled));
    } else if (m_codes[0] == CPAP_FlowRate) {
        addDotLine(DottedLine(CPAP_FlowRate, Calc_Zero, schema::channel[CPAP_FlowRate].calc[Calc_Zero].enabled));
+        #if defined(ENABLE_ALWAYS_ON_ZERO_RED_LINE_FLOW_RATE)
+            //on set day force red line on.
+            m_dot_enabled[m_code][Calc_Zero] = true;
+        #endif
    } else if (m_codes[0] == OXI_Pulse) {
        addDotLine(DottedLine(OXI_Pulse, Calc_UpperThresh, schema::channel[OXI_Pulse].calc[Calc_UpperThresh].enabled));
        addDotLine(DottedLine(OXI_Pulse, Calc_LowerThresh, schema::channel[OXI_Pulse].calc[Calc_LowerThresh].enabled));
@ -258,6 +277,7 @@ skipcheck:
    }


+
    if (m_day) {
        for (auto & dot : m_dotlines) {
            dot.calc(m_day);
@ -425,7 +445,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)

 //#define DEBUG_AUTOSCALER
 #ifdef DEBUG_AUTOSCALER
-    QString a = QString().sprintf("%.2f - %.2f",miny, maxy);
+    QString a = QString::asprintf("%.2f - %.2f",miny, maxy);
    w.renderText(a,width/2,top-5);
 #endif

@ -508,9 +528,9 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
    height -= 2;

    int num_points = 0;
-    int visible_points = 0;
+    //int visible_points = 0;
    int total_points = 0;
-    int total_visible = 0;
+    //int total_visible = 0;
    bool square_plot, accel;
    qint64 clockdrift = qint64(p_profile->cpap->clockDrift()) * 1000L;
    qint64 drift = 0;
@ -559,7 +579,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                painter.setPen(QPen(QBrush(color), lineThickness, Qt::DotLine));
                EventDataType y=top + height + 1 - ((dot.value - miny) * ymult);
                painter.drawLine(left + 1, y, left + 1 + width, y);
-                DEBUGF NAME(dot.code) Q(dot.type) QQ(y,(int)y) Q(ratioX) O(QLine(left + 1, y, left + 1 + width, y)) Q(legendx) O(dot.value) ;

            }
        }
@ -671,7 +690,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                    double ZR = ZD / sr;
                    double ZQ = ZR / XR;
                    double ZW = ZR / (width * ZQ);
-                    visible_points += ZR * ZQ;
+                    //visible_points += ZR * ZQ;

 //                    if (accel && n > 0) {
 //                        sam = 1;
@ -700,7 +719,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                        maxz = 0;
                    }

-                    total_visible += visible_points;
+                    //total_visible += visible_points;
                } else {
                    sam = 1;
                }
@ -1083,14 +1102,14 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
    extras.push_back(CPAP_UserFlag1);
    extras.push_back(CPAP_UserFlag2);

-    double sum = 0;
+    //double sum = 0;
    int cnt = 0;

    //Draw the linechart overlays (Event flags) independant of line Cursor mode
    //The problem was that turning lineCUrsor mode off (or  Control L) also stopped flag event on most daily graphs.
    // The user didn't know what trigger the problem. Best quess is that Control L was typed by mistable.
    // this fix allows flag events to be normally displayed when the line Cursor mode is off.
-    //was if (m_day /*&& (AppSetting->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))*/) 
+    //was if (m_day /*&& (AppSetting->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))*/)
    if (m_day) {
        bool blockhover = false;
        for (auto fit=flags.begin(), end=flags.end(); fit != end; ++fit) {
@ -1102,7 +1121,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
            if (lob->hover()) blockhover = true; // did it render a hover over?

            if (ahilist.contains(code)) {
-                sum += lob->sum();
+                //sum += lob->sum();
                cnt += lob->count();
            }
        }
@ -1125,8 +1144,9 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)

   // painter.setRenderHint(QPainter::Antialiasing, false);

-if (actual_max_y>0) {
-    m_actual_min_y=actual_min_y;
-    m_actual_max_y=actual_max_y;
-}
+    if (actual_max_y>0) {
+        m_actual_min_y=actual_min_y;
+        m_actual_max_y=actual_max_y;
+    }
+
 }
--- a/oscar/Graphs/gLineChart.h
+++ b/oscar/Graphs/gLineChart.h
@ -18,6 +18,7 @@
 #include "SleepLib/day.h"
 #include "Graphs/gLineOverlay.h"

+#define ENABLE_ALWAYS_ON_ZERO_RED_LINE_FLOW_RATE
 enum DottedLineCalc {
    DLC_Zero, DLC_Min, DLC_Mid, DLC_Perc, DLC_Max, DLC_UpperThresh, DLC_LowerThresh
 };
@ -161,6 +162,7 @@ class gLineChart: public Layer
        layer->lasttime = lasttime;
    }

+    virtual void resetGraphViewSettings();

  protected:
    //! \brief Mouse moved over this layers area (shows the hover-over tooltips here)
--- a/oscar/Graphs/gLineOverlay.cpp
+++ b/oscar/Graphs/gLineOverlay.cpp
@ -377,7 +377,7 @@ void gLineOverlaySummary::paint(QPainter &painter, gGraph &w, const QRegion &reg
        a = QObject::tr("Duration")+": "+w.selDurString();
    } else {
        a = QObject::tr("Events") + ": " + QString::number(cnt) + ", " +
-            QObject::tr("Duration") + " " + QString().sprintf("%02i:%02i:%02i", h, m, s) + ", " +
+            QObject::tr("Duration") + " " + QString::asprintf("%02i:%02i:%02i", h, m, s) + ", " +
            m_text + ": " + QString::number(val, 'f', 2);
    }
    if (isSpan) {
--- a/oscar/Graphs/gOverviewGraph.cpp
+++ b/oscar/Graphs/gOverviewGraph.cpp
@ -7,6 +7,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include "test_macros.h"
+
 #include <math.h>
 #include <QLabel>
 #include <QDateTime>
@ -556,10 +559,6 @@ void gOverviewGraph::paint(QPainter &painter, gGraph &w, const QRegion &region)

    float compliance_hours = 0;

-    if (p_profile->cpap->showComplianceInfo()) {
-        compliance_hours = p_profile->cpap->complianceHours();
-    }
-
    int incompliant = 0;
    Day *day;
    EventDataType hours;
@ -954,7 +953,7 @@ jumpnext:
        if (type == ST_HOURS) {
            int h = f;
            int m = int(f * 60) % 60;
-            val.sprintf("%02i:%02i", h, m);
+            val = QString::asprintf("%02i:%02i", h, m);
            ishours = true;
        } else {
            val = QString::number(f, 'f', 2);
@ -1005,15 +1004,6 @@ jumpnext:
    }*/
    a += QString(QObject::tr("Days: %1")).arg(total_days, 0);

-    if (p_profile->cpap->showComplianceInfo()) {
-        if (ishours && incompliant > 0) {
-            a += " "+QString(QObject::tr("Low Usage Days: %1")).arg(incompliant, 0)+
-                 " "+QString(QObject::tr("(%1% compliant, defined as > %2 hours)")).
-                    arg((1.0 / daynum) * (total_days - incompliant) * 100.0, 0, 'f', 2).arg(compliance_hours, 0, 'f', 1);
-        }
-    }
-
-
    //GetTextExtent(a,x,y);
    //legendx-=30+x;
    //w.renderText(a,px+24,py+5);
@ -1045,9 +1035,9 @@ QString formatTime(EventDataType v, bool show_seconds = false, bool duration = f
    }

    if (show_seconds) {
-        return QString().sprintf("%i:%02i:%02i%s", h, m, s, pm);
+        return QString::asprintf("%i:%02i:%02i%s", h, m, s, pm);
    } else {
-        return QString().sprintf("%i:%02i%s", h, m, pm);
+        return QString::asprintf("%i:%02i%s", h, m, pm);
    }
 }

@ -1117,7 +1107,7 @@ bool gOverviewGraph::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
                    int h = t / 3600;
                    int m = (t / 60) % 60;
                    //int s=t % 60;
-                    val.sprintf("%02i:%02i", h, m);
+                    val = QString::asprintf("%02i:%02i", h, m);
                } else {
                    val = QString::number(d.value()[0], 'f', 2);
                }
@ -1144,7 +1134,7 @@ bool gOverviewGraph::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
                    int h = t / 3600;
                    int m = (t / 60) % 60;
                    //int s=t % 60;
-                    val.sprintf("%02i:%02i", h, m);
+                    val = QString::asprintf("%02i:%02i", h, m);
                } else {
                    val = QString::number(d.value()[0], 'f', 2);
                }
--- a/oscar/Graphs/gPressureChart.cpp
+++ b/oscar/Graphs/gPressureChart.cpp
@ -220,6 +220,18 @@ void gPressureChart::populate(Day * day, int idx)
        }
        addSlice(CPAP_IPAPHi);

+    } else if (mode == MODE_TRILEVEL_AUTO_VARIABLE_PDIFF) {
+        addSlice(CPAP_EEPAPLo);
+        if (!day->summaryOnly()) {
+            ChannelID eepap = CPAP_EEPAP;
+            ChannelID ipap = CPAP_IPAP;
+            addSlice(eepap, ST_MID);
+            addSlice(eepap, ST_90P);
+            addSlice(ipap, ST_MID);
+            addSlice(ipap, ST_90P);
+        }
+        addSlice(CPAP_IPAPHi);
+
    } else if (mode == MODE_ASV) {
        addSlice(CPAP_EPAP);
        if (!day->summaryOnly()) {
--- a/oscar/Graphs/gSessionTimesChart.cpp
+++ b/oscar/Graphs/gSessionTimesChart.cpp
@ -101,8 +101,8 @@ void gSessionTimesChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRect

    QString txt = QObject::tr("Sessions: %1 / %2 / %3 Length: %4 / %5 / %6 Longest: %7 / %8 / %9")
            .arg(calc1.min, 0, 'f', 2).arg(mid1, 0, 'f', 2).arg(calc1.max, 0, 'f', 2)
-            .arg(calc.min, 0, 'f', 2).arg(mid, 0, 'f', 2).arg(calc.max, 0, 'f', 2)
-            .arg(calc2.min, 0, 'f', 2).arg(midlongest, 0, 'f', 2).arg(calc2.max, 0, 'f', 2);
+            .arg(durationInHoursToHhMmSs(calc.min)).arg(durationInHoursToHhMmSs(mid)).arg(durationInHoursToHhMmSs(calc.max))
+            .arg(durationInHoursToHhMmSs(calc2.min)).arg(durationInHoursToHhMmSs(midlongest)).arg(durationInHoursToHhMmSs(calc2.max));
    graph.renderText(txt, rect.left(), rect.top()-5*graph.printScaleY(), 0);
 }

@ -216,9 +216,10 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
                        float s1 = float(splittime.secsTo(st)) / 3600.0;

                        float s2 = double(slice.end - slice.start) / 3600000.0;
+                        float s2_display = double(slice.end - slice.start) / 1000.0;

                        QColor col = (slice.status == MaskOn) ? goodcolor : Qt::black;
-                        QString txt = QObject::tr("%1\nLength: %3\nStart: %2\n").arg(datestr).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2);
+                        QString txt = QObject::tr("%1\nLength: %3\nStart: %2\n").arg(datestr).arg(st.time().toString("hh:mm:ss")).arg(durationInSecondsToHhMmSs(s2_display));

                        txt += (slice.status == MaskOn) ? QObject::tr("Mask On") : QObject::tr("Mask Off");
                        slices.append(SummaryChartSlice(&calcitems[0], s1, s2, txt, col));
@ -231,7 +232,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &

                    float s2 = sess->hours();

-                    QString txt = QObject::tr("%1\nLength: %3\nStart: %2").arg(datestr).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2);
+                    QString txt = QObject::tr("%1\nLength: %3\nStart: %2").arg(datestr).arg(st.time().toString("hh:mm:ss")).arg(durationInHoursToHhMmSs(s2));

                    slices.append(SummaryChartSlice(&calcitems[0], s1, s2, txt, goodcolor));
                }
--- a/oscar/Graphs/gSummaryChart.cpp
+++ b/oscar/Graphs/gSummaryChart.cpp
@ -688,3 +688,30 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
    }

 }
+
+QString gSummaryChart::durationInHoursToHhMmSs(double duration) {
+    return durationInSecondsToHhMmSs(duration * 3600);
+}
+
+QString gSummaryChart::durationInMinutesToHhMmSs(double duration) {
+    return durationInSecondsToHhMmSs(duration * 60);
+}
+
+QString gSummaryChart::durationInSecondsToHhMmSs(double duration) {
+    // ensure that a negative duration is supported (could potentially occur when start and end occur in different timezones without compensation)
+    double duration_abs = abs(duration);
+    int seconds_abs = static_cast<int>(0.5 + duration_abs);
+    int daily_hours_abs = seconds_abs / 3600;
+    QString result;
+    if (daily_hours_abs < 24) {
+        result = QTime(0,0,0,0).addSecs(seconds_abs).toString("hh:mm:ss");
+    } else {
+        result = QString::number(daily_hours_abs + seconds_abs % 86400 / 3600) + ":" + QTime(0, 0, 0, 0).addSecs(seconds_abs).toString("mm:ss");
+    }
+
+    if (duration == duration_abs) {
+        return result;
+    } else {
+        return "-" + result;
+    }
+}
--- a/oscar/Graphs/gSummaryChart.h
+++ b/oscar/Graphs/gSummaryChart.h
@ -238,6 +238,10 @@ protected:
    //! \brief Mouse Button was released over this area. (jumps to daily view here)
    virtual bool mouseReleaseEvent(QMouseEvent *event, gGraph *graph);

+    QString durationInHoursToHhMmSs(double duration);
+    QString durationInMinutesToHhMmSs(double duration);
+    QString durationInSecondsToHhMmSs(double duration);
+
    QString m_label;
    MachineType m_machtype;
    bool m_empty;
--- a/oscar/Graphs/gTTIAChart.cpp
+++ b/oscar/Graphs/gTTIAChart.cpp
@ -68,7 +68,7 @@ void gTTIAChart::afterDraw(QPainter &, gGraph &graph, QRectF rect)
            break;
        }

-        txtlist.append(QString("%1 %2 / %3 / %4").arg(QObject::tr("TTIA:")).arg(calc.min, 0, 'f', 2).arg(mid, 0, 'f', 2).arg(calc.max, 0, 'f', 2));
+        txtlist.append(QString("%1 %2 / %3 / %4").arg(QObject::tr("TTIA:")).arg(durationInMinutesToHhMmSs(calc.min)).arg(durationInMinutesToHhMmSs(mid)).arg(durationInMinutesToHhMmSs(calc.max)));
    }
    QString txt = txtlist.join(", ");
    graph.renderText(txt, rect.left(), rect.top()-5*graph.printScaleY(), 0);
@ -80,10 +80,7 @@ void gTTIAChart::populate(Day *day, int idx)
 //    float ttia = day->sum(CPAP_AllApnea) + day->sum(CPAP_Obstructive) + day->sum(CPAP_ClearAirway) + day->sum(CPAP_Apnea) + day->sum(CPAP_Hypopnea);
    float ttia = day->sum(AllAhiChannels);

-    int h = ttia / 3600;
-    int m = int(ttia) / 60 % 60;
-    int s = int(ttia) % 60;
-    slices.append(SummaryChartSlice(&calcitems[0], ttia / 60.0, ttia / 60.0, QObject::tr("\nTTIA: %1").arg(QString().sprintf("%02i:%02i:%02i",h,m,s)), QColor(255,147,150)));
+    slices.append(SummaryChartSlice(&calcitems[0], ttia / 60.0, ttia / 60.0, QObject::tr("\nTTIA: %1").arg(durationInSecondsToHhMmSs(ttia)), QColor(255,147,150)));
 }

 QString gTTIAChart::tooltipData(Day *, int idx)
--- a/oscar/Graphs/gUsageChart.cpp
+++ b/oscar/Graphs/gUsageChart.cpp
@ -27,7 +27,7 @@ extern MainWindow * mainwin;

 QString gUsageChart::tooltipData(Day * day, int)
 {
-    return QObject::tr("\nHours: %1").arg(day->hours(m_machtype), 0, 'f', 2);
+    return QObject::tr("\nLength: %1").arg(durationInHoursToHhMmSs(day->hours(m_machtype)));
 }

 void gUsageChart::populate(Day *day, int idx)
@ -94,7 +94,7 @@ void gUsageChart::afterDraw(QPainter &, gGraph &graph, QRectF rect)
        }

        QString txt = QObject::tr("%1 low usage, %2 no usage, out of %3 days (%4% compliant.) Length: %5 / %6 / %7").
-                arg(incompdays).arg(nousedays).arg(totaldays).arg(comp,0,'f',1).arg(calc.min, 0, 'f', 2).arg(mid, 0, 'f', 2).arg(calc.max, 0, 'f', 2);;
+                arg(incompdays).arg(nousedays).arg(totaldays).arg(comp,0,'f',1).arg(durationInHoursToHhMmSs(calc.min)).arg(durationInHoursToHhMmSs(mid)).arg(durationInHoursToHhMmSs(calc.max));
        graph.renderText(txt, rect.left(), rect.top()-5*graph.printScaleY(), 0);
    }
 }
--- a/oscar/Graphs/gYAxis.cpp
+++ b/oscar/Graphs/gYAxis.cpp
@ -327,6 +327,7 @@ bool gYAxis::mouseDoubleClickEvent(QMouseEvent *event, gGraph *graph)

 const QString gYAxisTime::Format(EventDataType v, int dp)
 {
+    // it seems that v is the total duration of the sleep from 12 noon
    int h = int(v) % 24;
    int m = int(v * 60) % 60;
    int s = int(v * 3600) % 60;
@ -337,15 +338,15 @@ const QString gYAxisTime::Format(EventDataType v, int dp)

        h >= 12 ? pm[0] = 'a' : pm[0] = 'p';
        h %= 12;
-
        if (h == 0) { h = 12; }
    } else {
+        h < 12 ? h+=12 : h-=12;
        pm[0] = 0;
    }

-    if (dp > 2) { return QString().sprintf("%02i:%02i:%02i%s", h, m, s, pm); }
+    if (dp > 2) { return QString::asprintf("%02i:%02i:%02i%s", h, m, s, pm) ; }

-    return QString().sprintf("%i:%02i%s", h, m, pm);
+    return QString::asprintf("%i:%02i%s", h, m, pm) ;
 }

 const QString gYAxisWeight::Format(EventDataType v, int dp)
--- a/oscar/Graphs/layer.h
+++ b/oscar/Graphs/layer.h
@ -81,7 +81,10 @@ class Layer
    virtual void deselect() { }

    //! \brief Override to set the minimum allowed height for this layer
-    virtual int minimumHeight() { return 0; }
+    virtual void setMinimumHeight(int height) { m_minimumHeight=height; }
+
+    //! \brief Override to set the minimum allowed height for this layer
+    virtual int minimumHeight() { return  m_minimumHeight; }

    //! \brief Override to set the minimum allowed width for this layer
    virtual int minimumWidth() { return 0; }
@ -188,6 +191,7 @@ class Layer
    bool m_mouseover;
    volatile bool m_recalculating;
    LayerType m_layertype;
+    int  m_minimumHeight=0;
 public:

 //    //! \brief A vector containing all this layers custom drawing buffers
--- a/oscar/Resources.qrc
+++ b/oscar/Resources.qrc
@ -66,6 +66,8 @@
        <file>icons/update.png</file>
        <file>icons/cog.png</file>
        <file>icons/question_mark.png</file>
-        <file>icons/return.png</file>
+        <file>icons/checkmark.png</file>
+        <file>icons/empty_box.png</file>
+        <file>icons/resvent.png</file>
    </qresource>
 </RCC>
--- a/oscar/SleepLib/appsettings.h
+++ b/oscar/SleepLib/appsettings.h
@ -25,6 +25,7 @@ class Preferences;
 enum OverviewLinechartModes { OLC_Bartop, OLC_Lines };
 #endif

+#define REMSTAR_M_SUPPORTdisabled

 // ApplicationWideSettings Strings
 const QString STR_CS_UserEventPieChart = "UserEventPieChart";
@ -136,6 +137,7 @@ public:
  bool includeSerial() const { return getPref(STR_AS_IncludeSerial).toBool(); }
  //! \brief Whether to print reports in black and white, which can be more legible on non-color printers
  bool monochromePrinting() const { return getPref(STR_AS_MonochromePrinting).toBool(); }
+  //! \Allow disabling of sessions
  //! \brief Whether to show graph tooltips
  inline bool graphTooltips() const { return m_graphTooltips; }
  //! \brief Pen width of line plots
--- a/oscar/SleepLib/calcs.cpp
+++ b/oscar/SleepLib/calcs.cpp
@ -322,16 +322,16 @@ void FlowParser::calcPeaks(EventDataType *input, int samples)

    EventDataType zeroline = 0;

-    double rate = m_flow->rate();
+    // double rate = m_flow->rate();

-    double flowstart = m_flow->first();
-    double time; //, lasttime;
+    // double flowstart = m_flow->first();
+    //double time; //, lasttime;

    //double peakmax = flowstart,
    //double peakmin = flowstart;

    // lasttime =
-    time = flowstart;
+    // time = flowstart;
    breaths.clear();

    // Estimate storage space needed using typical average breaths per minute.
@ -407,7 +407,7 @@ void FlowParser::calcPeaks(EventDataType *input, int samples)
        }

        //lasttime = time;
-        time += rate;
+        // time += rate;
        lastc = c;
        //lastk = k;
    }
@ -1476,7 +1476,7 @@ int calcSPO2Drop(Session *session)
    auto it = session->eventlist.find(OXI_SPO2);
    if (it == session->eventlist.end()) { return 0; }

-    EventDataType val, val2, change, tmp;
+    EventDataType val, val2, change ; // , tmp;
    qint64 time, time2;
    qint64 window = p_profile->oxi->spO2DropDuration();
    window *= 1000;
@ -1494,7 +1494,7 @@ int calcSPO2Drop(Session *session)
    //int rp=0;
    int min;
    int cnt = 0;
-    tmp = 0;
+    // tmp = 0;

    qint64 start = 0;

@ -1514,7 +1514,7 @@ int calcSPO2Drop(Session *session)

            if (time > start + 3600000) { break; } // just look at the first hour

-            tmp += val;
+            // tmp += val;
            cnt++;
        }
    }
--- a/oscar/SleepLib/calcs.h
+++ b/oscar/SleepLib/calcs.h
@ -40,6 +40,8 @@ struct Filter {
        param2 = copy.param2;
        param3 = copy.param3;
    }
+    Filter& operator=(const Filter &copy) = default;
+    ~Filter() {};

    FilterType type;
    EventDataType param1;
--- a/oscar/SleepLib/common.cpp
+++ b/oscar/SleepLib/common.cpp
@ -185,6 +185,21 @@ QString getGraphicsEngine()
    return gfxEngine;
 }

+QString getCompilerVersion()
+{
+    #ifdef __clang_version__
+        return QString("clang++:%1").arg(__clang_version__);
+    #elif defined(__MINGW64__)
+        return QString("MINGW64:%1").arg(__VERSION__);
+    #elif defined(__MINGW32__)
+        return QString("MINGW32:%1").arg(__VERSION__);
+    #elif defined (__GNUG__) or defined (__GNUC__)
+        return QString("GNU C++:%1").arg(__VERSION__);
+    #else
+        return QString();
+    #endif
+}
+
 QStringList buildInfo;

 QStringList makeBuildInfo (QString forcedEngine){
@ -194,6 +209,10 @@ QStringList makeBuildInfo (QString forcedEngine){
    buildInfo << (QObject::tr("Operating system:") + " " + QSysInfo::prettyProductName());
    buildInfo << (QObject::tr("Graphics Engine:") + " " + getOpenGLVersionString());
    buildInfo << (QObject::tr("Graphics Engine type:") + " " + getGraphicsEngine());
+    QString compiler = getCompilerVersion();
+    if (compiler.length() >0 )
+        buildInfo << (QObject::tr("Compiler:") + " " + compiler);
+
    if (forcedEngine != "")
        buildInfo << forcedEngine;

@ -528,6 +547,8 @@ QString STR_TR_BIPAP;   // Bi-Level Positive Airway Pressure
 QString STR_TR_BiLevel; // Another name for BiPAP
 QString STR_TR_EPAP;    // Expiratory Positive Airway Pressure
 QString STR_TR_EEPAP;    // End Expiratory Positive Airway Pressure
+QString STR_TR_EEPAPLo;  // End-Expiratory Positive Airway Pressure, Low
+QString STR_TR_EEPAPHi;  // End-Expiratory Positive Airway Pressure, High
 QString STR_TR_EPAPLo;  // Expiratory Positive Airway Pressure, Low
 QString STR_TR_EPAPHi;  // Expiratory Positive Airway Pressure, High
 QString STR_TR_IPAP;    // Inspiratory Positive Airway Pressure
@ -738,7 +759,9 @@ void initializeStrings()
    STR_TR_BIPAP = QObject::tr("BiPAP");  // Bi-Level Positive Airway Pressure
    STR_TR_BiLevel = QObject::tr("Bi-Level"); // Another name for BiPAP
    STR_TR_EPAP = QObject::tr("EPAP");    // Expiratory Positive Airway Pressure
-    STR_TR_EEPAP = QObject::tr("EEPAP");    // Expiratory Positive Airway Pressure
+    STR_TR_EEPAP = QObject::tr("EEPAP");    // End-Expiratory Positive Airway Pressure
+    STR_TR_EEPAPLo = QObject::tr("Min EEPAP");    // Lower End-Expiratory Positive Airway Pressure
+    STR_TR_EEPAPHi = QObject::tr("Max EEPAP");    // Higher End-Expiratory Positive Airway Pressure
    STR_TR_EPAPLo = QObject::tr("Min EPAP"); // Lower Expiratory Positive Airway Pressure
    STR_TR_EPAPHi = QObject::tr("Max EPAP"); // Higher Expiratory Positive Airway Pressure
    STR_TR_IPAP = QObject::tr("IPAP");    // Inspiratory Positive Airway Pressure
--- a/oscar/SleepLib/common.h
+++ b/oscar/SleepLib/common.h
@ -68,6 +68,7 @@ struct ValueCount {
        :value(val), count(cnt), p(pp) {}

    ValueCount(const ValueCount &copy) = default;
+    ~ValueCount() {};
    EventDataType value;
    qint64 count;
    double p;
@ -253,6 +254,8 @@ extern QString STR_TR_BIPAP;   // Bi-Level Positive Airway Pressure
 extern QString STR_TR_BiLevel; // Another name for BiPAP
 extern QString STR_TR_EPAP;    // Expiratory Positive Airway Pressure
 extern QString STR_TR_EEPAP;    // Expiratory Positive Airway Pressure
+extern QString STR_TR_EEPAPLo;  // End-Expiratory Positive Airway Pressure, Low
+extern QString STR_TR_EEPAPHi;  // End-Expiratory Positive Airway Pressure, High
 extern QString STR_TR_EPAPLo;  // Expiratory Positive Airway Pressure, Low
 extern QString STR_TR_EPAPHi;  // Expiratory Positive Airway Pressure, High
 extern QString STR_TR_IPAP;    // Inspiratory Positive Airway Pressure
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@ -7,6 +7,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QMultiMap>

 #include <algorithm>
@ -839,7 +842,7 @@ ChannelID Day::getPressureChannelID() {
    // And why would ASV or AVAPS have Pressure channels?
    QList<ChannelID> preferredIDs = { CPAP_Pressure, CPAP_PressureSet, CPAP_IPAP, CPAP_IPAPSet };
    if (cpapmode == MODE_ASV || cpapmode == MODE_ASV_VARIABLE_EPAP || cpapmode == MODE_AVAPS ||
-        cpapmode == MODE_BILEVEL_FIXED || cpapmode == MODE_BILEVEL_AUTO_FIXED_PS || cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
+        cpapmode == MODE_BILEVEL_FIXED || cpapmode == MODE_BILEVEL_AUTO_FIXED_PS || cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS || cpapmode == MODE_TRILEVEL_AUTO_VARIABLE_PDIFF) {
        preferredIDs = { CPAP_IPAP, CPAP_IPAPSet, CPAP_Pressure, CPAP_PressureSet };
    }

@ -1492,7 +1495,9 @@ QString Day::getCPAPModeStr()
 //        return QObject::tr("Auto Bi-Level (Fixed PS)");
 //    } else if (mode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
 //        return QObject::tr("Auto Bi-Level (Variable PS)");
-//    }  else if (mode == MODE_ASV) {
+//    } else if (mode == MODE_TRILEVEL_AUTO_VARIABLE_PDIFF) {
+//        return QObject::tr("Auto TriLevel (Variable PDIFF)");
+//    }   else if (mode == MODE_ASV) {
 //        return QObject::tr("ASV Fixed EPAP");
 //    } else if (mode == MODE_ASV_VARIABLE_EPAP) {
 //        return QObject::tr("ASV Variable EPAP");
@ -1602,6 +1607,11 @@ QString Day::getPressureSettings()
                arg(validPressure(settings_max(CPAP_IPAPHi))).
                arg(validPressure(settings_min(CPAP_PSMin))).
                arg(validPressure(settings_max(CPAP_PSMax))).arg(units);
+    } else if (mode == MODE_TRILEVEL_AUTO_VARIABLE_PDIFF) {
+        return QObject::tr("Min EEPAP %1 Max EEPAP %2 PDIFF %3-%4 (%5)").arg(validPressure(settings_min(CPAP_EEPAPLo))).
+                arg(validPressure(settings_max(CPAP_EEPAPHi))).
+                arg(validPressure(settings_min(CPAP_PSMin))).
+                arg(validPressure(settings_max(CPAP_PSMax))).arg(units);
    } else if (mode == MODE_ASV) {
        return QObject::tr("EPAP %1 PS %2-%3 (%4)").arg(validPressure(settings_min(CPAP_EPAP))).
                arg(validPressure(settings_min(CPAP_PSMin))).
--- a/oscar/SleepLib/deviceconnection.h
+++ b/oscar/SleepLib/deviceconnection.h
@ -291,6 +291,7 @@ public:
    friend class QXmlStreamWriter & operator<<(QXmlStreamWriter & xml, const SerialPortInfo & info);
    friend class QXmlStreamReader & operator>>(QXmlStreamReader & xml, SerialPortInfo & info);
    bool operator==(const SerialPortInfo & other) const;
+    SerialPortInfo& operator=(const SerialPortInfo & other) = default;

 protected:
    SerialPortInfo(const class QSerialPortInfo & other);
--- a/oscar/SleepLib/importcontext.cpp
+++ b/oscar/SleepLib/importcontext.cpp
@ -6,6 +6,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QApplication>
 #include <QMessageBox>

--- a/oscar/SleepLib/journal.cpp
+++ b/oscar/SleepLib/journal.cpp
@ -7,6 +7,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include "journal.h"
 #include "machine_common.h"
 #include <QDomDocument>
--- a/oscar/SleepLib/journal.h
+++ b/oscar/SleepLib/journal.h
@ -25,6 +25,7 @@ public:
        end = copy.end;
        notes = copy.notes;
    }
+    Bookmark& operator=(const Bookmark & other) = default;
    Bookmark(qint64 start, qint64 end, QString notes):
    start(start), end(end), notes(notes) {}

--- a/oscar/SleepLib/loader_plugins/cms50_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/cms50_loader.cpp
@ -28,6 +28,18 @@
 #include <QVBoxLayout>
 #include <QPushButton>

+
+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif
+
+
 using namespace std;

 #include "cms50_loader.h"
@ -302,7 +314,7 @@ int CMS50Loader::doImportMode()
            m_startTime = QDateTime(oda,oti);

            oxisessions[m_startTime] = oxirec;
-            qDebug() << "Session start (according to CMS50)" << m_startTime << hex << buffer.at(idx + 1) << buffer.at(idx + 2) << ":" << dec << hour << minute ;
+            qDebug() << "Session start (according to CMS50)" << m_startTime << QTHEX << buffer.at(idx + 1) << buffer.at(idx + 2) << ":" << QTDEC << hour << minute ;

            cb_reset = 1;

--- a/oscar/SleepLib/loader_plugins/cms50_loader.h
+++ b/oscar/SleepLib/loader_plugins/cms50_loader.h
@ -10,6 +10,7 @@
 #ifndef CMS50LOADER_H
 #define CMS50LOADER_H

+#include <QElapsedTimer>
 #include "SleepLib/serialoximeter.h"

 const QString cms50_class_name = "CMS50";
@ -73,7 +74,7 @@ protected:
    EventList *PULSE;
    EventList *SPO2;

-    QTime m_time;
+    QElapsedTimer m_time;

    QByteArray buffer;

--- a/oscar/SleepLib/loader_plugins/cms50f37_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/cms50f37_loader.cpp
@ -29,6 +29,16 @@
 #include <QVBoxLayout>
 #include <QPushButton>

+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif
+
 using namespace std;

 #include "cms50f37_loader.h"
@ -194,7 +204,7 @@ QString CMS50F37Loader::getUser()

    sendCommand(COMMAND_GET_USER_INFO);

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -210,7 +220,7 @@ QString CMS50F37Loader::getVendor()

    sendCommand(COMMAND_GET_OXIMETER_VENDOR);

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -227,7 +237,7 @@ QString CMS50F37Loader::getModel()
    modelsegments = 0;
    sendCommand(COMMAND_GET_OXIMETER_MODEL);

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -260,7 +270,7 @@ QString CMS50F37Loader::getDeviceID()

    sendCommand(COMMAND_GET_OXIMETER_DEVICEID);

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -275,7 +285,7 @@ int CMS50F37Loader::getUserCount()  // for future use, check, then add select us
    userCount = -1;
    sendCommand(COMMAND_GET_USER_COUNT);

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -290,7 +300,7 @@ int CMS50F37Loader::getSessionCount()
    session_count = -1;
    sendCommand(COMMAND_GET_SESSION_COUNT);

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -304,7 +314,7 @@ int CMS50F37Loader::getOximeterInfo()
 {
    device_info = -1;
    sendCommand(COMMAND_GET_OXIMETER_INFO);
-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -321,7 +331,7 @@ int CMS50F37Loader::getDuration(int session)
    duration = -1;
    sendCommand(COMMAND_GET_SESSION_DURATION, session);

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -338,7 +348,7 @@ QDateTime CMS50F37Loader::getDateTime(int session)
    imp_date = QDate();
    imp_time = QTime();
    sendCommand(COMMAND_GET_SESSION_TIME, session);
-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -448,9 +458,9 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
            // COMMAND_GET_SESSION_TIME --- the date part
        case 0x07: // 7,80,80,80,94,8e,88,92

-            year = QString().sprintf("%02i%02i",buffer.at(idx+4), buffer.at(idx+5)).toInt();
-            month = QString().sprintf("%02i", buffer.at(idx+6)).toInt();
-            day = QString().sprintf("%02i", buffer.at(idx+7)).toInt();
+            year = QString::asprintf("%02i%02i",buffer.at(idx+4), buffer.at(idx+5)).toInt();
+            month = QString::asprintf("%02i", buffer.at(idx+6)).toInt();
+            day = QString::asprintf("%02i", buffer.at(idx+7)).toInt();

            if ( year == 0 ) {
                imp_date = QDate::currentDate();
@ -503,7 +513,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)

            // COMMAND_GET_SESSION_TIME
        case 0x12: // 12,80,80,80,82,a6,92,80
-            tmpstr = QString().sprintf("%02i:%02i:%02i",buffer.at(idx+4), buffer.at(idx+5), buffer.at(idx+6));
+            tmpstr = QString::asprintf("%02i:%02i:%02i",buffer.at(idx+4), buffer.at(idx+5), buffer.at(idx+6));
            imp_time = QTime::fromString(tmpstr, "HH:mm:ss");
            qDebug() << "cms50f37 - pB: tmpStr:" << tmpstr << " impTime: " << imp_time;

@ -541,7 +551,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)

            break;
        default:
-            qDebug() << "cms50f37 - pB: unknown cms50F result?" << hex << (int)res;
+            qDebug() << "cms50f37 - pB: unknown cms50F result?" << QTHEX << (int)res;
            break;
        }

@ -640,7 +650,7 @@ void CMS50F37Loader::sendCommand(quint8 c)

    QString out;
    for (int i=0;i < 9;i++) 
-    	out += QString().sprintf("%02X ",cmd[i]);
+       out += QString::asprintf("%02X ",cmd[i]);
    qDebug() << "cms50f37 - Write:" << out;

    if (serial.write((char *)cmd, 9) == -1) {
@ -656,7 +666,7 @@ void CMS50F37Loader::sendCommand(quint8 c, quint8 c2)

    QString out;
    for (int i=0; i < 9; ++i) 
-    	out += QString().sprintf("%02X ",cmd[i]);
+       out += QString::asprintf("%02X ",cmd[i]);
    qDebug() << "cms50f37 - Write:" << out;

    if (serial.write((char *)cmd, 9) == -1) {
@ -673,7 +683,7 @@ void CMS50F37Loader::eraseSession(int user, int session)

    QString out;
    for (int i=0; i < 9; ++i) 
-    	out += QString().sprintf("%02X ",cmd[i]);
+       out += QString::asprintf("%02X ",cmd[i]);
    qDebug() << "cms50f37 - Erase Session: Write:" << out;

    if (serial.write((char *)cmd, 9) == -1) {
@ -681,7 +691,7 @@ void CMS50F37Loader::eraseSession(int user, int session)
    }

    int z = timectr;
-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -711,7 +721,7 @@ void CMS50F37Loader::setDeviceID(const QString & newid)

    QString out;
    for (int i=0; i < 9; ++i) 
-    	out += QString().sprintf("%02X ",cmd[i]);
+       out += QString::asprintf("%02X ",cmd[i]);
    qDebug() << "cms50f37 - setDeviceID: Write:" << out;

    if (serial.write((char *)cmd, 9) == -1) {
@ -721,7 +731,7 @@ void CMS50F37Loader::setDeviceID(const QString & newid)
    // Supposed to return 0x04 command, so reset devid..
    devid = QString();

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
@ -745,7 +755,7 @@ void CMS50F37Loader::syncClock()
        qDebug() << "cms50f37 - Couldn't write date bytes to CMS50F";
    }

-    QTime time;
+    QElapsedTimer time;
    time.start();
    do {
        QApplication::processEvents();
--- a/oscar/SleepLib/loader_plugins/cms50f37_loader.h
+++ b/oscar/SleepLib/loader_plugins/cms50f37_loader.h
@ -10,6 +10,7 @@
 #ifndef CMS50F37LOADER_H
 #define CMS50F37LOADER_H

+#include <QElapsedTimer>
 #include "SleepLib/serialoximeter.h"

 const QString cms50f37_class_name = "CMS50F37";
@ -107,7 +108,7 @@ protected:
    EventList *PULSE;
    EventList *SPO2;

-    QTime m_time;
+    QElapsedTimer m_time;

    QByteArray buffer;

--- a/oscar/SleepLib/loader_plugins/icon_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/icon_loader.cpp
@ -15,6 +15,16 @@

 #include "icon_loader.h"

+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif
+
 const QString FPHCARE = "FPHCARE";

 FPIcon::FPIcon(Profile *profile, MachineID id)
@ -681,7 +691,7 @@ bool FPIconLoader::OpenFLW(Machine *mach, const QString & filename)
    } while (p < end);

    if (endMarker != 0x7fff) {
-        qDebug() << fname << "waveform does not end with the corrent marker" << hex << endMarker;
+        qDebug() << fname << "waveform does not end with the corrent marker" << QTHEX << endMarker;
    }

    if (sess) {
@ -922,6 +932,7 @@ bool FPIconLoader::OpenDetail(Machine *mach, const QString & filename)
    quint8 recs;

    int totalrecs = 0;
+    Q_UNUSED( totalrecs );

    do {
        in >> ts;
--- a/oscar/SleepLib/loader_plugins/md300w1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/md300w1_loader.cpp
@ -194,7 +194,7 @@ bool MD300W1Loader::readDATFile(const QString & path)
    int gap;
    for (int pos = 0; pos < n; ++pos) {
        int i = 3 + (pos * 11);
-        QString datestr = QString().sprintf("%02d/%02d/%02d %02d:%02d:%02d",
+        QString datestr = QString::asprintf("%02d/%02d/%02d %02d:%02d:%02d",
                (unsigned char)data.at(i+4),(unsigned char)data.at(i+5),(unsigned char)data.at(i+3),
                (unsigned char)data.at(i+6),(unsigned char)data.at(i+7),(unsigned char)data.at(i+8));
        // Ensure date is correct first to ensure DST is handled correctly
--- a/oscar/SleepLib/loader_plugins/md300w1_loader.h
+++ b/oscar/SleepLib/loader_plugins/md300w1_loader.h
@ -10,6 +10,7 @@
 #ifndef MD300W1LOADER_H
 #define MD300W1LOADER_H

+#include <QElapsedTimer>
 #include "SleepLib/serialoximeter.h"

 const QString md300w1_class_name = "MD300W1";
@ -69,7 +70,7 @@ protected:
    EventList *PULSE;
    EventList *SPO2;

-    QTime m_time;
+    QElapsedTimer m_time;

    QByteArray buffer;

--- a/oscar/SleepLib/loader_plugins/mseries_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/mseries_loader.cpp
@ -7,10 +7,21 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#include "mseries_loader.h"
+#ifdef REMSTAR_M_SUPPORT
+
 #include <QDir>
 #include <QProgressBar>

-#include "mseries_loader.h"
+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif


 MSeries::MSeries(Profile *profile, MachineID id)
@ -238,7 +249,7 @@ int MSeriesLoader::Open(const QString & path)
        dt = QDateTime::fromTime_t(ts);
        date = dt.date();
        time = dt.time();
-        qDebug() << "New Sparse Chunk" << chk << dt << hex << ts;
+        qDebug() << "New Sparse Chunk" << chk << dt << QTHEX << ts;

        cb += 4;
        quint8 sum = 0;
@ -265,7 +276,7 @@ int MSeriesLoader::Open(const QString & path)
        dt = QDateTime::fromTime_t(ts);
        date = dt.date();
        time = dt.time();
-        qDebug() << "Details New Data Chunk" << cnt << dt << hex << ts;
+        qDebug() << "Details New Data Chunk" << cnt << dt << QTHEX << ts;

        cb += 4;

@ -349,7 +360,7 @@ int MSeriesLoader::Open(const QString & path)
        dt = QDateTime::fromTime_t(ts);
        date = dt.date();
        time = dt.time();
-        //qDebug() << "Summary Data Chunk" << cnt << dt << hex << ts;
+        //qDebug() << "Summary Data Chunk" << cnt << dt << QTHEX << ts;
        cb += 4;

        while (cb < endcard) {
@ -364,7 +375,7 @@ int MSeriesLoader::Open(const QString & path)
            u2 = (cb[2] << 8 | cb[3]) & 0x7ff; // 0xBX XX??
            ts = st + u1 * 60;
            dt = QDateTime::fromTime_t(ts);
-            //qDebug() << "Summary Sub Chunk" << dt << u1 << u2 << hex << ts;
+            //qDebug() << "Summary Sub Chunk" << dt << u1 << u2 << QTHEX << ts;
            cb += 4;

            if (cb[0] == 0xff) { break; }
@ -389,7 +400,7 @@ int MSeriesLoader::Open(const QString & path)
        QString a;

        for (int i = 0; i < 0x13; i++) {
-            a += QString().sprintf("%02X ", cb[i]);
+            a += QString::asprintf("%02X ", cb[i]);
        }

        a += " " + date.toString() + " " + time.toString();
@ -489,3 +500,4 @@ void MSeriesLoader::Register()
    //InitModelMap();
    mseries_initialized = true;
 }
+#endif // REMSTAR_M_SUPPORT
--- a/oscar/SleepLib/loader_plugins/mseries_loader.h
+++ b/oscar/SleepLib/loader_plugins/mseries_loader.h
@ -13,6 +13,9 @@
 #ifndef MSERIES_LOADER_H
 #define MSERIES_LOADER_H

+#include "SleepLib/appsettings.h"
+#ifdef REMSTAR_M_SUPPORT
+
 #include "SleepLib/machine.h"
 #include "SleepLib/machine_loader.h"
 #include "SleepLib/profiles.h"
@ -74,4 +77,5 @@ class MSeriesLoader : public MachineLoader
    quint32 epoch;
 };

+#endif // REMSTAR_M_SUPPORT
 #endif // MSERIES_LOADER_H
--- a/oscar/SleepLib/loader_plugins/prisma_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prisma_loader.cpp
@ -45,10 +45,10 @@
 //********************************************************************************************

 // parameters
-ChannelID Prisma_Mode = 0, Prisma_SoftPAP = 0, Prisma_PSoft = 0, Prisma_PSoft_Min = 0, Prisma_AutoStart = 0, Prisma_Softstart_Time = 0, Prisma_Softstart_TimeMax = 0, Prisma_Softstart_Pressure = 0, Prisma_TubeType = 0, Prisma_PMaxOA = 0, Prisma_EEPAP_Min = 0, Prisma_EEPAP_Max = 0, Prisma_HumidifierLevel = 0;
+ChannelID Prisma_Mode = 0, Prisma_SoftPAP = 0, Prisma_BiSoft = 0, Prisma_PSoft = 0, Prisma_PSoft_Min = 0, Prisma_AutoStart = 0, Prisma_Softstart_Time = 0, Prisma_Softstart_TimeMax = 0, Prisma_Softstart_Pressure = 0, Prisma_TubeType = 0, Prisma_PMaxOA = 0, Prisma_HumidifierLevel = 0;

 // waveforms
-ChannelID Prisma_ObstructLevel = 0, Prisma_rMVFluctuation = 0, Prisma_rRMV= 0, Prisma_PressureMeasured = 0, Prisma_FlowFull = 0, Prisma_SPRStatus = 0, Prisma_EEPAP = 0;
+ChannelID Prisma_ObstructLevel = 0, Prisma_rMVFluctuation = 0, Prisma_rRMV= 0, Prisma_PressureMeasured = 0, Prisma_FlowFull = 0, Prisma_EEPAP = 0;

 // events
 ChannelID Prisma_Artifact = 0, Prisma_CriticalLeak = 0, Prisma_DeepSleep = 0, Prisma_TimedBreath = 0;
@ -216,29 +216,49 @@ void PrismaImport::run()

    bool found = true;
    if (parameters.contains(PRISMA_LINE_MODE)) {
+
+        if (parameters[PRISMA_LINE_MODE] == PRISMA_MODE_AUTO_ST ||
+            parameters[PRISMA_LINE_MODE] == PRISMA_MODE_AUTO_S) {
+
+            if (parameters[PRISMA_LINE_EXTRA_OBSTRUCTION_PROTECTION] != 1) {
+                if (parameters[PRISMA_LINE_AUTO_PDIFF] == 1) {
+                    session->settings[CPAP_Mode] = (int)MODE_BILEVEL_AUTO_VARIABLE_PS;
+                }else{
+                    session->settings[CPAP_Mode] = (int)MODE_BILEVEL_AUTO_FIXED_PS;
+                }
+            }else{
+                session->settings[CPAP_Mode] = (int)MODE_TRILEVEL_AUTO_VARIABLE_PDIFF;
+            }
+
+            session->settings[Prisma_BiSoft] = parameters[PRISMA_LINE_EXTRA_OBSTRUCTION_PROTECTION];
+            session->settings[CPAP_EEPAPLo] = parameters[PRISMA_LINE_EEPAP_MIN] / 100.0;
+            session->settings[CPAP_EEPAPHi] = parameters[PRISMA_LINE_EEPAP_MAX] / 100.0;
+            session->settings[CPAP_EPAP] = parameters[PRISMA_LINE_EPAP] / 100.0;
+            session->settings[CPAP_IPAP] = parameters[PRISMA_LINE_IPAP] / 100.0;
+            session->settings[CPAP_IPAPHi] = parameters[PRISMA_LINE_IPAP_MAX] / 100.0;
+            session->settings[CPAP_PSMin] = parameters[PRISMA_LINE_PDIFF_NORM] / 100.0;
+            session->settings[CPAP_PSMax] = parameters[PRISMA_LINE_PDIFF_MAX] / 100.0;
+            session->settings[Prisma_Softstart_Pressure] = parameters[PRISMA_LINE_SOFT_START_PRESS] / 100.0;
+            session->settings[Prisma_Softstart_Time] = parameters[PRISMA_LINE_SOFT_START_TIME];
+            session->settings[Prisma_AutoStart] = parameters[PRISMA_LINE_AUTOSTART];
+            if (parameters.contains(PRISMA_SMART_TUBE_TYPE)) {
+                session->settings[Prisma_TubeType] = parameters[PRISMA_LINE_TUBE_TYPE] / 10.0;
+            }
+            // Indicate partial support
+            session->settings[Prisma_Warning] = 2;
+        }
+
        switch(parameters[PRISMA_LINE_MODE]) {
            case PRISMA_MODE_AUTO_ST:
                // TODO AXT
                // Was not sure which mode this should be mapped, maybe we need to intorudce new modes
                // Setting/parameter mapping should be reviewed and tested
                // session->settings[CPAP_Mode] = (int)MODE_BILEVEL_AUTO_VARIABLE_PS; ???
-
                session->settings[Prisma_Mode] = (int)PRISMA_COMBINED_MODE_AUTO_ST;
-                session->settings[Prisma_EEPAP_Min] = parameters[PRISMA_LINE_EEPAP_MIN] / 100.0;
-                session->settings[Prisma_EEPAP_Max] = parameters[PRISMA_LINE_EEPAP_MAX] / 100.0;
-                session->settings[CPAP_EPAP] = parameters[PRISMA_LINE_EPAP] / 100.0;
-                session->settings[CPAP_IPAP] = parameters[PRISMA_LINE_IPAP] / 100.0;
-                session->settings[CPAP_IPAPHi] = parameters[PRISMA_LINE_IPAP_MAX] / 100.0;
-                session->settings[CPAP_PSMin] = parameters[PRISMA_LINE_PDIFF_NORM] / 100.0;
-                session->settings[CPAP_PSMax] = parameters[PRISMA_LINE_PDIFF_MAX] / 100.0;
-                session->settings[Prisma_Softstart_Pressure] = parameters[PRISMA_LINE_SOFT_START_PRESS] / 100.0;
-                session->settings[Prisma_Softstart_Time] = parameters[PRISMA_LINE_SOFT_START_TIME];
-                session->settings[Prisma_AutoStart] = parameters[PRISMA_LINE_AUTOSTART];
-                if (parameters.contains(PRISMA_SMART_TUBE_TYPE)) {
-                    session->settings[Prisma_TubeType] = parameters[PRISMA_LINE_TUBE_TYPE] / 10.0;
-                }
-                // Indicate partial support
-                session->settings[Prisma_Warning] = 2;
+            break;
+
+            case PRISMA_MODE_AUTO_S:
+                session->settings[Prisma_Mode] = (int)PRISMA_COMBINED_MODE_AUTO_S;
            break;

            case PRISMA_MODE_ACSV:
@ -246,8 +266,8 @@ void PrismaImport::run()
                // and MODE_ASV_VARIABLE_EPAP here
                session->settings[CPAP_Mode] = (int)MODE_ASV;
                session->settings[Prisma_Mode] = (int)PRISMA_COMBINED_MODE_ACSV;
-                session->settings[Prisma_EEPAP_Min] = parameters[PRISMA_LINE_EEPAP_MIN] / 100.0;
-                session->settings[Prisma_EEPAP_Max] = parameters[PRISMA_LINE_EEPAP_MAX] / 100.0;
+                session->settings[CPAP_EEPAPLo] = parameters[PRISMA_LINE_EEPAP_MIN] / 100.0;
+                session->settings[CPAP_EEPAPHi] = parameters[PRISMA_LINE_EEPAP_MAX] / 100.0;
                session->settings[CPAP_EPAP] = parameters[PRISMA_LINE_EPAP] / 100.0;
                session->settings[CPAP_IPAP] = parameters[PRISMA_LINE_IPAP] / 100.0;
                session->settings[CPAP_IPAPHi] = parameters[PRISMA_LINE_IPAP_MAX] / 100.0;
@ -307,9 +327,6 @@ void PrismaImport::run()
    AddWaveform(CPAP_FlowRate, QString("RespFlow"));
    AddWaveform(CPAP_Leak, QString("LeakFlowBreath"));
    AddWaveform(Prisma_ObstructLevel, QString("ObstructLevel"));
-    // NOTE: this is a bitfield indicating the device current stauts breaht in, breath out, leakage
-    // only can be used for debugging, consider removing it, or adding better support for displaying it
-    AddWaveform(Prisma_SPRStatus, QString("SPRStatus"));

    // prisma smart
    // waweforms specific for prisma smart / soft devices
@ -773,7 +790,7 @@ void PrismaLoader::initChannels()
    channel.add(GRP_CPAP, chan = new Channel(Prisma_Mode=0xe400, SETTING,  MT_CPAP,  SESSION,
        "PrismaMode", QObject::tr("Mode"),
        QObject::tr("PAP Mode"),
-        QObject::tr("PAP Mode"),
+        QObject::tr("Mode"),
        "", LOOKUP, Qt::green));
    chan->addOption(PRISMA_COMBINED_MODE_UNKNOWN, QObject::tr("UNKNOWN"));
    chan->addOption(PRISMA_COMBINED_MODE_CPAP, QObject::tr("CPAP"));
@ -786,7 +803,7 @@ void PrismaLoader::initChannels()
    channel.add(GRP_CPAP, chan = new Channel(Prisma_SoftPAP=0xe401, SETTING,  MT_CPAP,  SESSION,
        "Prisma_SoftPAP",
        QObject::tr("SoftPAP Mode"),
-        QObject::tr("SoftPAP Mode"),
+        QObject::tr("Pressure relief during exhalation"),
        QObject::tr("SoftPAP Mode"),
        "", LOOKUP, Qt::green));
    chan->addOption(Prisma_SoftPAP_OFF, QObject::tr("Off"));
@ -794,75 +811,87 @@ void PrismaLoader::initChannels()
    chan->addOption(Prisma_SoftPAP_STANDARD, QObject::tr("Standard"));

    channel.add(GRP_CPAP, new Channel(Prisma_PSoft=0xe402, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_PSoft", QObject::tr("PSoft"),
-        QObject::tr("PSoft"),
+        "Prisma_PSoft",
+        QObject::tr("Softstart pressure"),
+        QObject::tr("Pressure during soft start period"),
        QObject::tr("PSoft"),
        STR_UNIT_CMH2O, DEFAULT, Qt::green));

    channel.add(GRP_CPAP, new Channel(Prisma_PSoft_Min=0xe403, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_PSoft_Min", QObject::tr("PSoftMin"),
-        QObject::tr("PSoftMin"),
+        "Prisma_PSoft_Min",
+        QObject::tr("Softstart minimum pressure"),
+        QObject::tr("Minimum pressure during soft start period"),
        QObject::tr("PSoftMin"),
        STR_UNIT_CMH2O, DEFAULT, Qt::green));

    channel.add(GRP_CPAP, chan = new Channel(Prisma_AutoStart=0xe404, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_AutoStart", QObject::tr("AutoStart"),
-        QObject::tr("AutoStart"),
-        QObject::tr("AutoStart"),
+        "Prisma_AutoStart",
+        QObject::tr("Auto start"),
+        QObject::tr("Automatically turn on the device by breathing"),
+        QObject::tr("Auto start"),
        "", LOOKUP, Qt::green));
    chan->addOption(0, STR_TR_Off);
    chan->addOption(1, STR_TR_On);

    channel.add(GRP_CPAP, new Channel(Prisma_Softstart_Time=0xe405, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_Softstart_Time", QObject::tr("Softstart_Time"),
-        QObject::tr("Softstart_Time"),
-        QObject::tr("Softstart_Time"),
+        "Prisma_Softstart_Time",
+        QObject::tr("Softstart time"),
+        QObject::tr("Lenght of soft start period"),
+        QObject::tr("Softstart time"),
        STR_UNIT_Minutes, LOOKUP, Qt::green));

    channel.add(GRP_CPAP, new Channel(Prisma_Softstart_TimeMax=0xe406, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_Softstart_TimeMax", QObject::tr("Softstart_TimeMax"),
-        QObject::tr("Softstart_TimeMax"),
-        QObject::tr("Softstart_TimeMax"),
+        "Prisma_Softstart_TimeMax",
+        QObject::tr("Soft start maximum time"),
+        QObject::tr("Maximum lenght of soft start period"),
+        QObject::tr("Soft start max. time"),
        STR_UNIT_Minutes, LOOKUP, Qt::green));

    channel.add(GRP_CPAP, new Channel(Prisma_Softstart_Pressure=0xe407, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_Softstart_Pressure", QObject::tr("Softstart_Pressure"),
-        QObject::tr("Softstart_Pressure"),
-        QObject::tr("Softstart_Pressure"),
+        "Prisma_Softstart_Pressure",
+        QObject::tr("Soft start pressure"),
+        QObject::tr("Pressure during soft start period"),
+        QObject::tr("Soft start pressure"),
        STR_UNIT_CMH2O, DEFAULT, Qt::green));

    channel.add(GRP_CPAP, new Channel(Prisma_PMaxOA=0xe408, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_PMaxOA", QObject::tr("PMaxOA"),
+        "Prisma_PMaxOA",
+        QObject::tr("PMaxOA"),
        QObject::tr("PMaxOA"),
        QObject::tr("PMaxOA"),
        STR_UNIT_CMH2O, DEFAULT, Qt::green));

-    channel.add(GRP_CPAP, new Channel(Prisma_EEPAP_Min=0xe409, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_EEPAPMin", QObject::tr("EEPAPMin"),
+    channel.add(GRP_CPAP, new Channel(CPAP_EEPAPLo=0xe409, SETTING,  MT_CPAP,  SESSION,
+        "CPAP_EEPAPLo",
        QObject::tr("EEPAPMin"),
+        QObject::tr("Lower End Expiratory Pressure"),
        QObject::tr("EEPAPMin"),
        STR_UNIT_CMH2O, DEFAULT, Qt::green));

-    channel.add(GRP_CPAP, new Channel(Prisma_EEPAP_Max=0xe40a, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_EEPAPMax", QObject::tr("EEPAPMax"),
+    channel.add(GRP_CPAP, new Channel(CPAP_EEPAPHi=0xe40a, SETTING,  MT_CPAP,  SESSION,
+        "CPAP_EEPAPHi",
        QObject::tr("EEPAPMax"),
+        QObject::tr("Higher End Expiratory Pressure"),
        QObject::tr("EEPAPMax"),
        STR_UNIT_CMH2O, DEFAULT, Qt::green));

    channel.add(GRP_CPAP, new Channel(Prisma_HumidifierLevel=0xe40b, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_HumidLevel", QObject::tr("HumidifierLevel"),
-        QObject::tr("HumidifierLevel"),
-        QObject::tr("HumidifierLevel"),
+        "Prisma_HumidLevel",
+        QObject::tr("Humidifier level"),
+        QObject::tr("Humidifier level"),
+        QObject::tr("Humidifier level"),
        "", DEFAULT, Qt::green));

    channel.add(GRP_CPAP, new Channel(Prisma_TubeType=0xe40c, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_TubeType", QObject::tr("TubeType"),
-        QObject::tr("TubeType"),
-        QObject::tr("TubeType"),
+        "Prisma_TubeType",
+        QObject::tr("Tube type"),
+        QObject::tr("Tube type"),
+        QObject::tr("Tube type"),
        STR_UNIT_CM, DEFAULT, Qt::green));

    channel.add(GRP_CPAP, chan = new Channel(Prisma_Warning=0xe40d, SETTING,  MT_CPAP,  SESSION,
-        "Prisma_Warning", QObject::tr("Warning"),
+        "Prisma_Warning",
+        QObject::tr("Warning"),
        QObject::tr("Warning"),
        QObject::tr("Warning"),
        "", LOOKUP, Qt::green));
@ -872,20 +901,18 @@ void PrismaLoader::initChannels()

    channel.add(GRP_CPAP, chan = new Channel(Prisma_ObstructLevel=0xe440, WAVEFORM,  MT_CPAP,   SESSION,
        "Prisma_ObstructLevel",
-        QObject::tr("ObstructLevel"),
-        // TODO AXT add desc
-        QObject::tr("Obstruction Level"),
-        QObject::tr("ObstructLevel"),
+        QObject::tr("Obstruction level"),
+        QObject::tr("Obstruction level in percentage"),
+        QObject::tr("Obstruction level"),
        STR_UNIT_Percentage, DEFAULT, QColor("light purple")));
    chan->setUpperThreshold(100);
    chan->setLowerThreshold(0);

    channel.add(GRP_CPAP, chan = new Channel(Prisma_rMVFluctuation=0xe441, WAVEFORM,  MT_CPAP,   SESSION,
        "Prisma_rMVFluctuation",
-        QObject::tr("rMVFluctuation"),
-        // TODO AXT add desc
-        QObject::tr("rMVFluctuation"),
-        QObject::tr("rMVFluctuation"),
+        QObject::tr("rRMVFluctuation"),
+        QObject::tr("Relative respiratory minute volume fluctuation"),
+        QObject::tr("rRMVFluctuation"),
        STR_UNIT_Unknown, DEFAULT, QColor("light purple")));
    chan->setUpperThreshold(16);
    chan->setLowerThreshold(0);
@ -893,75 +920,67 @@ void PrismaLoader::initChannels()
    channel.add(GRP_CPAP, new Channel(Prisma_rRMV=0xe442, WAVEFORM,  MT_CPAP,   SESSION,
        "Prisma_rRMV",
        QObject::tr("rRMV"),
-        // TODO AXT add desc
-        QObject::tr("rRMV"),
+        QObject::tr("Relative respiratory minute volume"),
        QObject::tr("rRMV"),
        STR_UNIT_Unknown, DEFAULT, QColor("light purple")));

    channel.add(GRP_CPAP, new Channel(Prisma_PressureMeasured=0xe443, WAVEFORM,  MT_CPAP,   SESSION,
        "Prisma_PressureMeasured",
-        QObject::tr("PressureMeasured"),
-        // TODO AXT add desc
-        QObject::tr("PressureMeasured"),
-        QObject::tr("PressureMeasured"),
+        QObject::tr("Measured pressure"),
+        QObject::tr("Measured pressure"),
+        QObject::tr("Measured pressure"),
        STR_UNIT_CMH2O, DEFAULT, QColor("black")));

    channel.add(GRP_CPAP, new Channel(Prisma_FlowFull=0xe444, WAVEFORM,  MT_CPAP,   SESSION,
        "Prisma_FlowFull",
-        QObject::tr("FlowFull"),
-        // TODO AXT add desc
-        QObject::tr("FlowFull"),
-        QObject::tr("FlowFull"),
+        QObject::tr("Full flow"),
+        QObject::tr("Full flow"),
+        QObject::tr("Full flow"),
        STR_UNIT_Unknown, DEFAULT, QColor("black")));

-    channel.add(GRP_CPAP, new Channel(Prisma_SPRStatus=0xe445, WAVEFORM,  MT_CPAP,   SESSION,
-        "Prisma_SPRStatus",
-        QObject::tr("SPRStatus"),
-        // TODO AXT add desc
-        QObject::tr("SPRStatus"),
-        QObject::tr("SPRStatus"),
-        STR_UNIT_Unknown, DEFAULT, QColor("black")));
+    //Note: removed the channel, but keeping this code here, because of the channel id allocation, maybe we will bring it back in the future
+    //channel.add(GRP_CPAP, new Channel(Prisma_SPRStatus=0xe445, WAVEFORM,  MT_CPAP,   SESSION,
+    //    "Prisma_SPRStatus",
+    //    QObject::tr("SPRStatus"),
+    //    QObject::tr("SPRStatus"),
+    //    QObject::tr("SPRStatus"),
+    //    STR_UNIT_Unknown, DEFAULT, QColor("black")));


    channel.add(GRP_CPAP, new Channel(Prisma_Artifact=0xe446, SPAN,  MT_CPAP,   SESSION,
        "Prisma_Artifact",
-        QObject::tr("Artifact"),
-        // TODO AXT add desc
-        QObject::tr("Artifact"),
+        QObject::tr("Artefact"),
+        QObject::tr("Irregularity in measured data, that doesn't represents a breathing event (e.g swallowing, coughing, or speaking)"),
        QObject::tr("ART"),
        STR_UNIT_Percentage, DEFAULT, QColor("salmon")));

    channel.add(GRP_CPAP, new Channel(Prisma_CriticalLeak = 0xe447, SPAN,  MT_CPAP,   SESSION,
        "Prisma_CriticalLeak",
        QObject::tr("CriticalLeak"),
-        // TODO AXT add desc
-        QObject::tr("CriticalLeak"),
+        QObject::tr("Mask leakage is above a critical treshold"),
        QObject::tr("CL"),
        STR_UNIT_EventsPerHour, DEFAULT, QColor("orchid")));

    channel.add(GRP_CPAP, chan = new Channel(Prisma_eMO = 0xe448, SPAN,  MT_CPAP,   SESSION,
        "Prisma_eMO",
        QObject::tr("eMO"),
-        // TODO AXT add desc
+        QObject::tr("Epoch (2 mins) with Mild Obstruction"),
        QObject::tr("eMO"),
-        QObject::tr("eMO"),
-        STR_UNIT_Percentage, DEFAULT, QColor("red")));
+        STR_UNIT_Percentage, DEFAULT, QColor("orange")));
    chan->setEnabled(false);

    channel.add(GRP_CPAP, chan = new Channel(Prisma_eSO = 0xe449, SPAN,  MT_CPAP,   SESSION,
        "Prisma_eSO",
        QObject::tr("eSO"),
-        // TODO AXT add desc
+        QObject::tr("Epoch (2 mins) with Severe Obstruction"),
        QObject::tr("eSO"),
-        QObject::tr("eSO"),
-        STR_UNIT_Percentage, DEFAULT, QColor("orange")));
+        STR_UNIT_Percentage, DEFAULT, QColor("red")));
    chan->setEnabled(false);

    channel.add(GRP_CPAP, chan = new Channel(Prisma_eS = 0xe44a, SPAN,  MT_CPAP,   SESSION,
        "Prisma_eS",
        QObject::tr("eS"),
-        // TODO AXT add desc
-        QObject::tr("eS"),
+        QObject::tr("Epoch (2 mins) with Snoring"),
        QObject::tr("eS"),
        STR_UNIT_Percentage, DEFAULT, QColor("light green")));
    chan->setEnabled(false);
@ -969,17 +988,15 @@ void PrismaLoader::initChannels()
    channel.add(GRP_CPAP, chan = new Channel(Prisma_eF = 0xe44b, SPAN,  MT_CPAP,   SESSION,
        "Prisma_eFL",
        QObject::tr("eFL"),
-        // TODO AXT add desc
-        QObject::tr("eFL"),
+        QObject::tr("Epoch (2 mins) with Flow Limitation"),
        QObject::tr("eFL"),
        STR_UNIT_Percentage, DEFAULT, QColor("yellow")));
    chan->setEnabled(false);

    channel.add(GRP_CPAP, chan = new Channel(Prisma_DeepSleep = 0xe44c, SPAN,  MT_CPAP,   SESSION,
        "Prisma_DS",
-        QObject::tr("DeepSleep"),
-        // TODO AXT add desc
-        QObject::tr("DeepSleep"),
+        QObject::tr("Deep Sleep"),
+        QObject::tr("Deep sleep, stable respiration"),
        QObject::tr("DS"),
        STR_UNIT_Percentage, DEFAULT, QColor("light blue")));
    chan->setEnabled(false);
@ -987,12 +1004,21 @@ void PrismaLoader::initChannels()

    channel.add(GRP_CPAP, chan = new Channel(Prisma_TimedBreath = 0xe44d, FLAG,  MT_CPAP,   SESSION,
        "Prisma_TB",
-        QObject::tr("TimedBreath"),
-        // TODO AXT add desc
-        QObject::tr("TimedBreath"),
+        QObject::tr("Timed breath"),
+        QObject::tr("Machine Initiated Breath"),
        QObject::tr("TB"),
        STR_UNIT_Percentage, DEFAULT, QColor("purple")));

+    channel.add(GRP_CPAP, chan = new Channel(Prisma_BiSoft=0xe44e, SETTING,  MT_CPAP,  SESSION,
+        "Prisma_BiSoft",
+        QObject::tr("BiSoft Mode"),
+        QObject::tr("BiSoft Mode"),
+        QObject::tr("BiSoft Mode"),
+        "", LOOKUP, Qt::green));
+    chan->addOption(Prisma_BiSoft_Off, QObject::tr("Off"));
+    chan->addOption(Prisma_BiSoft_1, QObject::tr("BiSoft 1"));
+    chan->addOption(Prisma_BiSoft_2, QObject::tr("BiSoft 2"));
+    chan->addOption(Prisma_TriLevel, QObject::tr("TriLevel"));

 }

--- a/oscar/SleepLib/loader_plugins/prisma_loader.h
+++ b/oscar/SleepLib/loader_plugins/prisma_loader.h
@ -68,7 +68,9 @@ enum Prisma_Parameters {
    PRISMA_LINE_EPAP = 1201,
    // PRISMA_LINE_ALARM_LEAK_ACTIVE = 1202,
    // PRISMA_LINE_ALARM_DISCONNECTION_ACTIVE = 1203,
-    PRISMA_LINE_APAP_DYNAMIC = 1209
+    PRISMA_LINE_APAP_DYNAMIC = 1209,
+    PRISMA_LINE_EXTRA_OBSTRUCTION_PROTECTION = 1154, // BiSoft off = 0, BiSoft1 = 2, BiSoft2 = 3, TriLevel = 1
+    PRISMA_LINE_AUTO_PDIFF = 1219

 };

@ -97,6 +99,13 @@ enum Prisma_SoftPAP_Mode {
    Prisma_SoftPAP_STANDARD = 2
 };

+enum Prisma_BiSoft_Mode {
+    Prisma_BiSoft_Off = 0,
+    Prisma_BiSoft_1 = 2,
+    Prisma_BiSoft_2 = 3,
+    Prisma_TriLevel = 1,
+};
+
 // NOTE: This enum represents a "virtual mode" which combines the main mode of the device with the APAP submode,
 // if it makes sense. The reason for this is, that we can see the Standard and Dynamic APAP modes on the statistics
 // page. Enum values are internal to the loader. We use -1 to indicate a mode that is not recognized.
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@ -7,6 +7,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QApplication>
 #include <QString>
 #include <QDateTime>
@ -987,7 +990,11 @@ bool PRS1Loader::CreateMachineFromProperties(QString propertyfile)

 static QString relativePath(const QString & inpath)
 {
-    QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), QString::SkipEmptyParts);
+    #if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+        QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), Qt::SkipEmptyParts);
+    #else
+        QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), QString::SkipEmptyParts);
+    #endif
    QString relative = pathlist.mid(pathlist.size()-3).join(QDir::separator());
    return relative;
 }
@ -1367,8 +1374,15 @@ void PRS1Import::CreateEventChannels(const PRS1DataChunk* chunk)
    // Generate the list of channels created by non-slice events for this device.
    // We can't just use the full list of non-slice events, since on some devices
    // PS is generated by slice events (EPAP/IPAP average).
-    // TODO: convert supported to QSet and clean this up.
-    QSet<PRS1ParsedEventType> supportedNonSliceEvents = QSet<PRS1ParsedEventType>::fromList(QList<PRS1ParsedEventType>::fromVector(supported));
+    // Duplicates need to be removed. QSet does the removal.
+    #if QT_VERSION < QT_VERSION_CHECK(5,14,0)
+        // convert QVvector to QList then to QSet
+        QSet<PRS1ParsedEventType> supportedNonSliceEvents = QSet<PRS1ParsedEventType>::fromList( QList<PRS1ParsedEventType>::fromVector( supported ) );
+    #else
+        // release 5.14 supports the direct conversion.
+        QSet<PRS1ParsedEventType> supportedNonSliceEvents(supported.begin(),supported.end() ) ;
+    #endif
+
    supportedNonSliceEvents.intersect(PRS1NonSliceChannels);
    QSet<ChannelID> supportedNonSliceChannels;
    for (auto & e : supportedNonSliceEvents) {
@ -1384,7 +1398,7 @@ void PRS1Import::CreateEventChannels(const PRS1DataChunk* chunk)
            m_importChannels.remove(c);
        }
    }
-    
+
    // Create all supported channels (except for on-demand ones that only get created if an event appears)
    for (auto & e : supported) {
        if (!PRS1OnDemandChannels.contains(e)) {
@ -1424,7 +1438,7 @@ void PRS1Import::AddEvent(ChannelID channel, qint64 t, float value, float gain)
            qWarning() << "gain mismatch for channel" << channel << "at" << ts(t);
        }
    }
-    
+
    // Add the event
    C->AddEvent(t, value, gain);
 }
@ -1433,7 +1447,7 @@ void PRS1Import::AddEvent(ChannelID channel, qint64 t, float value, float gain)
 bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t)
 {
    bool updated = false;
-    
+
    if (!m_currentSliceInitialized) {
        m_currentSliceInitialized = true;
        m_currentSlice = m_slices.constBegin();
@ -1452,12 +1466,12 @@ bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t)
            break;
        }
    }
-    
+
    if (updated) {
        // Write out any pending end-of-slice events.
        FinishSlice();
    }
-    
+
    if (updated && (*m_currentSlice).status == MaskOn) {
        // Set the interval start times based on the new slice's start time.
        m_statIntervalStart = 0;
@ -1466,7 +1480,7 @@ bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t)
        // Create a new eventlist for this new slice, to allow for a gap in the data between slices.
        CreateEventChannels(chunk);
    }
-    
+
    return updated;
 }

@ -1538,7 +1552,7 @@ bool PRS1Import::IsIntervalEvent(PRS1ParsedEvent* e)
        default:
            break;
    }
-    
+
    return intervalEvent;
 }

--- a/oscar/SleepLib/loader_plugins/prs1_parser.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_parser.cpp
@ -12,6 +12,16 @@
 #include "prs1_loader.h"
 #include "rawdata.h"

+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif
+

 const PRS1ParsedEventType PRS1TidalVolumeEvent::TYPE;
 const PRS1ParsedEventType PRS1SnoresAtPressureEvent::TYPE;
@ -975,7 +985,7 @@ PRS1DataChunk* PRS1DataChunk::ParseNext(RawDataDevice & f, PRS1Loader* loader)
        // Make sure the calculated CRC over the entire chunk (header and data) matches the stored CRC.
        if (chunk->calcCrc != chunk->storedCrc) {
            // Corrupt data block, warn about it.
-            qWarning() << chunk->m_path << "@" << chunk->m_filepos << "block CRC calc" << hex << chunk->calcCrc << "!= stored" << hex << chunk->storedCrc;
+            qWarning() << chunk->m_path << "@" << chunk->m_filepos << "block CRC calc" << QTHEX << chunk->calcCrc << "!= stored" << QTHEX << chunk->storedCrc;
            
            // TODO: When this happens, it's usually because the chunk was truncated and another chunk header
            // exists within the blockSize bytes. In theory it should be possible to rewing and resync by
@ -1023,12 +1033,12 @@ bool PRS1DataChunk::ReadHeader(RawDataDevice & f)

        // Do a few early sanity checks before any variable-length header data.
        if (this->blockSize == 0) {
-            qWarning() << this->m_path << "@" << hex << this->m_filepos << "blocksize 0, skipping remainder of file";
+            qWarning() << this->m_path << "@" << QTHEX << this->m_filepos << "blocksize 0, skipping remainder of file";
            break;
        }
        if (this->fileVersion < 2 || this->fileVersion > 3) {
            if (this->m_filepos > 0) {
-                qWarning() << this->m_path << "@" << hex << this->m_filepos << "corrupt PRS1 header, skipping remainder of file";
+                qWarning() << this->m_path << "@" << QTHEX << this->m_filepos << "corrupt PRS1 header, skipping remainder of file";
            } else {
                qWarning() << this->m_path << "unsupported PRS1 header version" << this->fileVersion;
            }
--- a/oscar/SleepLib/loader_plugins/prs1_parser_asv.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_parser_asv.cpp
@ -10,6 +10,17 @@
 #include "prs1_parser.h"
 #include "prs1_loader.h"

+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif
+
+
 //********************************************************************************************
 // MARK: -
 // MARK: 50 and 60 Series
@ -1245,7 +1256,7 @@ bool PRS1DataChunk::ParseSettingsF5V3(const unsigned char* data, int size)
                break;
            default:
                UNEXPECTED_VALUE(code, "known setting");
-                qDebug() << "Unknown setting:" << hex << code << "in" << this->sessionid << "at" << pos;
+                qDebug() << "Unknown setting:" << QTHEX << code << "in" << this->sessionid << "at" << pos;
                this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data, size), pos, len));
                break;
        }
--- a/oscar/SleepLib/loader_plugins/prs1_parser_vent.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_parser_vent.cpp
@ -10,6 +10,16 @@
 #include "prs1_parser.h"
 #include "prs1_loader.h"

+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif
+
 static QString hex(int i)
 {
    return QString("0x") + QString::number(i, 16).toUpper();
@ -1010,7 +1020,7 @@ bool PRS1DataChunk::ParseSettingsF3V6(const unsigned char* data, int size)
                break;
            default:
                UNEXPECTED_VALUE(code, "known setting");
-                qDebug() << "Unknown setting:" << hex << code << "in" << this->sessionid << "at" << pos;
+                qDebug() << "Unknown setting:" << QTHEX << code << "in" << this->sessionid << "at" << pos;
                this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data, size), pos, len));
                break;
        }
--- a/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
@ -10,6 +10,18 @@
 #include "prs1_parser.h"
 #include "prs1_loader.h"

+
+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif
+
+
 //********************************************************************************************
 // MARK: 50 Series

@ -2104,7 +2116,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                break;
            default:
                UNEXPECTED_VALUE(code, "known setting");
-                qDebug() << "Unknown setting:" << hex << code << "in" << this->sessionid << "at" << pos;
+                qDebug() << "Unknown setting:" << QTHEX << code << "in" << this->sessionid << "at" << pos;
                this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data, size), pos, len));
                break;
        }
--- a/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h
+++ b/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h
@ -160,6 +160,7 @@ public:
    }
    
    STRRecord(const STRRecord & /*copy*/) = default;
+    ~STRRecord() {};    // required to get rid of warning

 // All the data members

--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@ -7,6 +7,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QApplication>
 #include <QString>
 #include <QDateTime>
@ -31,6 +34,15 @@
 #endif


+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTCOMBINE insert
+    //idmap.insert(hash);
+#else
+    #define QTCOMBINE unite
+    //idmap.unite(hash);
+#endif
+
+
 ChannelID RMS9_EPR, RMS9_EPRLevel, RMS9_Mode, RMS9_SmartStart, RMS9_HumidStatus, RMS9_HumidLevel,
         RMS9_PtAccess, RMS9_Mask, RMS9_ABFilter, RMS9_ClimateControl, RMS9_TubeType, RMAS11_SmartStop,
         RMS9_Temp, RMS9_TempEnable, RMS9_RampEnable, RMAS1x_Comfort, RMAS11_PtView;
@ -1982,7 +1994,7 @@ bool parseIdentFile( QString path, MachineInfo * info, QHash<QString, QString> &
        while (!f.atEnd()) {
           QString line = f.readLine().trimmed();
           QHash<QString, QString> hash = parseIdentLine( line, info );
-           idmap.unite(hash);
+           idmap.QTCOMBINE(hash);
        }

        f.close();
@ -1997,19 +2009,19 @@ void scanProductObject( QJsonObject product, MachineInfo *info, QHash<QString, Q
        info->serial = product["SerialNumber"].toString();
        hash1["SerialNumber"] = product["SerialNumber"].toString();
        if (idmap)
-            idmap->unite(hash1);
+            idmap->QTCOMBINE(hash1);
    }
    if (product.contains("ProductCode")) {
        info->modelnumber = product["ProductCode"].toString();
        hash2["ProductCode"] = info->modelnumber;
        if (idmap)
-            idmap->unite(hash2);
+            idmap->QTCOMBINE(hash2);
    }
    if (product.contains("ProductName")) {
        info->model = product["ProductName"].toString();
        hash3["ProductName"] = info->model;
        if (idmap)
-            idmap->unite(hash3);
+            idmap->QTCOMBINE(hash3);
        int idx = info->model.indexOf("11");
        info->series = info->model.left(idx+2);
    }
--- a/oscar/SleepLib/loader_plugins/resvent_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resvent_loader.cpp
@ -0,0 +1,642 @@
+/* SleepLib Resvent Loader Implementation
+ *
+ * Copyright (c) 2019-2023 The OSCAR Team
+ * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the source code
+ * for more details. */
+
+//********************************************************************************************
+// Please only INCREMENT the resvent_data_version in resvent_loader.h when making changes
+// that change loader behaviour or modify channels in a manner that fixes old data imports.
+// Note that changing the data version will require a reimport of existing data for which OSCAR
+// does not keep a backup - so it should be avoided if possible.
+// i.e. there is no need to change the version when adding support for new devices
+//********************************************************************************************
+
+#include <QString>
+#include <QDateTime>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QDebug>
+#include <QVector>
+#include <QMap>
+#include <QStringList>
+#include <cmath>
+
+#include "resvent_loader.h"
+
+#ifdef DEBUG_EFFICIENCY
+#include <QElapsedTimer>  // only available in 4.8
+#endif
+
+// Files WXX_XX contain flow rate and pressure and PXX_XX contain Pressure, IPAP, EPAP, Leak, Vt, MV, RR, Ti, IE, Spo2, PR
+// Both files contain a little header of size 0x24 bytes. In offset 0x12 contain the total number of different records in
+// the different files of the same type. And later contain the previous describe quantity of description header of size 0x20
+// containing the details for every type of record (e.g. sample chunk size).
+
+ResventLoader::ResventLoader()
+{
+    const QString RESVENT_ICON = ":/icons/resvent.png";
+
+    QString s = newInfo().series;
+    m_pixmap_paths[s] = RESVENT_ICON;
+    m_pixmaps[s] = QPixmap(RESVENT_ICON);
+
+    m_type = MT_CPAP;
+}
+ResventLoader::~ResventLoader()
+{
+}
+
+const QString kResventTherapyFolder = "THERAPY";
+const QString kResventConfigFolder = "CONFIG";
+const QString kResventRecordFolder = "RECORD";
+const QString kResventSysConfigFilename = "SYSCFG";
+constexpr qint64 kDateTimeOffset = 7 * 60 * 60 * 1000;
+constexpr int kMainHeaderSize = 0x24;
+constexpr int kDescriptionHeaderSize = 0x20;
+constexpr int kChunkDurationInSecOffset = 0x10;
+constexpr int kDescriptionCountOffset = 0x12;
+constexpr int kDescriptionSamplesByChunk = 0x1e;
+constexpr double kDefaultGain = 0.01;
+
+bool ResventLoader::Detect(const QString & givenpath)
+{
+    QDir dir(givenpath);
+
+    if (!dir.exists()) {
+        return false;
+    }
+
+    if (!dir.exists(kResventTherapyFolder)) {
+        return false;
+    }
+
+    dir.cd(kResventTherapyFolder);
+    if (!dir.exists(kResventConfigFolder)) {
+        return false;
+    }
+
+    if (!dir.exists(kResventRecordFolder)) {
+        return false;
+    }
+
+    return true;
+}
+
+
+MachineInfo ResventLoader::PeekInfo(const QString & path)
+{
+    if (!Detect(path)) {
+        return MachineInfo();
+    }
+
+    MachineInfo info = newInfo();
+
+    const auto sys_config_path = path + QDir::separator() + kResventTherapyFolder + QDir::separator() + kResventConfigFolder + QDir::separator() + kResventSysConfigFilename;
+    if (!QFile::exists(sys_config_path)) {
+        qDebug() << "Resvent Data card has no" << kResventSysConfigFilename << "file in " << sys_config_path;
+        return MachineInfo();
+    }
+    QFile f(sys_config_path);
+    f.open(QIODevice::ReadOnly | QIODevice::Text);
+    f.seek(4);
+    while (!f.atEnd()) {
+        QString line = f.readLine().trimmed();
+
+        const auto elems = line.split("=");
+        Q_ASSERT(elems.size() == 2);
+
+        if (elems[0] == "models") {
+            info.model = elems[1];
+        }
+        else if (elems[0] == "sn") {
+            info.serial = elems[1];
+        }
+        else if (elems[0] == "num") {
+            info.version = elems[1].toInt();
+        }
+        else if (elems[0] == "num") {
+            info.type = MachineType::MT_CPAP;
+        }
+    }
+
+    if (info.model.contains("Point", Qt::CaseInsensitive)) {
+        info.brand = "Hoffrichter";
+    } else {
+        info.brand = "Resvent";
+    }
+
+    return info;
+}
+
+QVector<QDate> GetSessionsDate(const QString& dirpath) {
+    QVector<QDate> sessions_date;
+
+    const auto records_path = dirpath + QDir::separator() + kResventTherapyFolder + QDir::separator() + kResventRecordFolder;
+    QDir records_folder(records_path);
+    const auto year_month_folders = records_folder.entryList(QStringList(), QDir::Dirs|QDir::NoDotAndDotDot, QDir::Name);
+    std::for_each(year_month_folders.cbegin(), year_month_folders.cend(), [&](const QString& year_month_folder_name){
+        if (year_month_folder_name.length() != 6) {
+            return;
+        }
+
+        const int year = std::stoi(year_month_folder_name.left(4).toStdString());
+        const int month = std::stoi(year_month_folder_name.right(2).toStdString());
+
+        const auto year_month_folder_path = records_path + QDir::separator() + year_month_folder_name;
+        QDir year_month_folder(year_month_folder_path);
+        const auto session_folders = year_month_folder.entryList(QStringList(), QDir::Dirs|QDir::NoDotAndDotDot, QDir::Name);
+        std::for_each(session_folders.cbegin(), session_folders.cend(), [&](const QString& day_folder){
+            const auto day = std::stoi(day_folder.toStdString());
+
+            sessions_date.push_back(QDate(year, month, day));
+        });
+    });
+    return sessions_date;
+}
+
+enum class EventType {
+    UsageSec= 1,
+    UnixStart = 2,
+    ObstructiveApnea = 17,
+    CentralApnea = 18,
+    Hypopnea = 19,
+    FlowLimitation = 20,
+    RERA = 21,
+    PeriodicBreathing = 22,
+    Snore = 23
+};
+
+struct EventData {
+    EventType type;
+    QDateTime date_time;
+    int duration;
+};
+
+struct UsageData {
+    QString number{};
+    QDateTime start_time{};
+    QDateTime end_time{};
+    qint32 countAHI = 0;
+    qint32 countOAI = 0;
+    qint32 countCAI = 0;
+    qint32 countAI = 0;
+    qint32 countHI = 0;
+    qint32 countRERA = 0;
+    qint32 countSNI = 0;
+    qint32 countBreath = 0;
+};
+
+void UpdateEvents(EventType event_type, const QMap<EventType, QVector<EventData>>& events, Session* session) {
+    static QMap<EventType, unsigned int> mapping {{EventType::ObstructiveApnea, CPAP_Obstructive},
+                                                 {EventType::CentralApnea, CPAP_Apnea},
+                                                 {EventType::Hypopnea, CPAP_Hypopnea},
+                                                 {EventType::FlowLimitation, CPAP_FlowLimit},
+                                                 {EventType::RERA, CPAP_RERA},
+                                                 {EventType::PeriodicBreathing, CPAP_PB},
+                                                 {EventType::Snore, CPAP_Snore}};
+    const auto it_events = events.find(event_type);
+    const auto it_mapping = mapping.find(event_type);
+    if (it_events == events.cend() || it_mapping == mapping.cend()) {
+        return;
+    }
+
+    EventList* event_list  = session->AddEventList(it_mapping.value(), EVL_Event);
+    std::for_each(it_events.value().cbegin(), it_events.value().cend(), [&](const EventData& event_data){
+        event_list->AddEvent(event_data.date_time.toMSecsSinceEpoch() + kDateTimeOffset, event_data.duration);
+    });
+}
+
+QString GetSessionFolder(const QString& dirpath, const QDate& session_date) {
+    const auto year_month_folder = QString::number(session_date.year()) + (session_date.month() > 10 ? "" : "0") + QString::number(session_date.month());
+    const auto day_folder = (session_date.day() > 10 ? "" : "0") + QString::number(session_date.day());
+    const auto session_folder_path = dirpath + QDir::separator() + kResventTherapyFolder + QDir::separator() + kResventRecordFolder + QDir::separator() + year_month_folder + QDir::separator() + day_folder;
+    return session_folder_path;
+}
+
+void LoadEvents(const QString& session_folder_path, Session* session, const UsageData& usage) {
+    const auto event_file_path = session_folder_path + QDir::separator() + "EV" + usage.number;
+
+    QMap<EventType, QVector<EventData>> events;
+    QFile f(event_file_path);
+    f.open(QIODevice::ReadOnly | QIODevice::Text);
+    f.seek(4);
+    while (!f.atEnd()) {
+        QString line = f.readLine().trimmed();
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        const auto elems = line.split(",", Qt::SkipEmptyParts);
+#else
+        const auto elems = line.split(",", QString::SkipEmptyParts);
+#endif
+        if (elems.size() != 4) {
+            continue;
+        }
+
+        const auto event_type_elems = elems.at(0).split("=");
+        const auto date_time_elems = elems.at(1).split("=");
+        const auto duration_elems = elems.at(2).split("=");
+
+        Q_ASSERT(event_type_elems.size() == 2);
+        Q_ASSERT(date_time_elems.size() == 2);
+        const auto event_type = static_cast<EventType>(std::stoi(event_type_elems[1].toStdString()));
+        const auto date_time = QDateTime::fromTime_t(std::stoi(date_time_elems[1].toStdString()));
+        const auto duration = std::stoi(duration_elems[1].toStdString());
+
+        events[event_type].push_back(EventData{event_type, date_time, duration});
+    }
+
+    static QVector<EventType> mapping {EventType::ObstructiveApnea,
+                                      EventType::CentralApnea,
+                                      EventType::Hypopnea,
+                                      EventType::FlowLimitation,
+                                      EventType::RERA,
+                                      EventType::PeriodicBreathing,
+                                      EventType::Snore};
+
+    std::for_each(mapping.cbegin(), mapping.cend(), [&](EventType event_type){
+        UpdateEvents(event_type, events, session);
+    });
+}
+
+template <typename T>
+T read_from_file(QFile& f) {
+    T data{};
+    f.read(reinterpret_cast<char*>(&data), sizeof(T));
+    return data;
+}
+
+struct WaveFileData {
+    unsigned int wave_event_id;
+    QString file_base_name;
+    unsigned int sample_rate_offset;
+    unsigned int start_offset;
+};
+
+EventList* GetEventList(const QString& name, Session* session, float sample_rate = 0.0) {
+    if (name == "Press") {
+        return session->AddEventList(CPAP_Pressure, EVL_Event);
+    }
+    else if (name == "IPAP") {
+        return session->AddEventList(CPAP_IPAP, EVL_Event);
+    }
+    else if (name == "EPAP") {
+        return session->AddEventList(CPAP_EPAP, EVL_Event);
+    }
+    else if (name == "Leak") {
+        return session->AddEventList(CPAP_Leak, EVL_Event);
+    }
+    else if (name == "Vt") {
+        return session->AddEventList(CPAP_TidalVolume, EVL_Event);
+    }
+    else if (name == "MV") {
+        return session->AddEventList(CPAP_MinuteVent, EVL_Event);
+    }
+    else if (name == "RR") {
+        return session->AddEventList(CPAP_RespRate, EVL_Event);
+    }
+    else if (name == "Ti") {
+        return session->AddEventList(CPAP_Ti, EVL_Event);
+    }
+    else if (name == "I:E") {
+        return session->AddEventList(CPAP_IE, EVL_Event);
+    }
+    else if (name == "SpO2" || name == "PR") {
+        // Not present
+        return nullptr;
+    }
+    else if (name == "Pressure") {
+        return session->AddEventList(CPAP_MaskPressure, EVL_Waveform, kDefaultGain, 0.0, 0.0, 0.0, 1000.0 / sample_rate);
+    }
+    else if (name == "Flow") {
+        return session->AddEventList(CPAP_FlowRate, EVL_Waveform, kDefaultGain, 0.0, 0.0, 0.0, 1000.0 / sample_rate);
+    }
+    else {
+        // Not supported
+        Q_ASSERT(false);
+        return nullptr;
+    }
+}
+
+struct ChunkData {
+    EventList* event_list;
+    uint16_t samples_by_chunk;
+    qint64 start_time;
+    int total_samples_by_chunk;
+    float sample_rate;
+};
+
+QString ReadDescriptionName(QFile& f) {
+    constexpr int kNameSize = 9;
+    QVector<char> name(kNameSize);
+
+    const auto readed = f.read(name.data(), kNameSize - 1);
+    Q_ASSERT(readed == kNameSize - 1);
+
+    return QString(name.data());
+}
+
+void ReadWaveFormsHeaders(QFile& f, QVector<ChunkData>& wave_forms, Session* session, const UsageData& usage) {
+    f.seek(kChunkDurationInSecOffset);
+    const auto chunk_duration_in_sec = read_from_file<uint16_t>(f);
+    f.seek(kDescriptionCountOffset);
+    const auto description_count = read_from_file<uint16_t>(f);
+    wave_forms.resize(description_count);
+
+    for (unsigned int i = 0; i < description_count; i++) {
+        const auto description_header_offset = kMainHeaderSize + i * kDescriptionHeaderSize;
+        f.seek(description_header_offset);
+        const auto name = ReadDescriptionName(f);
+        f.seek(description_header_offset + kDescriptionSamplesByChunk);
+        const auto samples_by_chunk = read_from_file<uint16_t>(f);
+
+        wave_forms[i].sample_rate = 1.0 * samples_by_chunk / chunk_duration_in_sec;
+        wave_forms[i].event_list = GetEventList(name, session, wave_forms[i].sample_rate);
+        wave_forms[i].samples_by_chunk = samples_by_chunk;
+        wave_forms[i].start_time = usage.start_time.toMSecsSinceEpoch();
+    }
+}
+
+void LoadOtherWaveForms(const QString& session_folder_path, Session* session, const UsageData& usage) {
+    QDir session_folder(session_folder_path);
+
+    const auto wave_files = session_folder.entryList(QStringList() << "P" + usage.number + "_*", QDir::Files, QDir::Name);
+
+    QVector<ChunkData> wave_forms;
+    bool initialized = false;
+    std::for_each(wave_files.cbegin(), wave_files.cend(), [&](const QString& wave_file){
+        // W01_ file
+        QFile f(session_folder_path + QDir::separator() + wave_file);
+        f.open(QIODevice::ReadOnly);
+
+        if (!initialized) {
+            ReadWaveFormsHeaders(f, wave_forms, session, usage);
+            initialized = true;
+        }
+        f.seek(kMainHeaderSize + wave_forms.size() * kDescriptionHeaderSize);
+
+        std::vector<qint16> chunk(std::max_element(wave_forms.cbegin(), wave_forms.cend(), [](const ChunkData& lhs, const ChunkData& rhs){
+                                      return lhs.samples_by_chunk < rhs.samples_by_chunk;
+                                  })->samples_by_chunk);
+        while (!f.atEnd()) {
+            for (int i = 0; i < wave_forms.size(); i++) {
+                const auto& wave_form = wave_forms[i].event_list;
+                const auto samples_by_chunk_actual = wave_forms[i].samples_by_chunk;
+                auto& start_time_current = wave_forms[i].start_time;
+                auto& total_samples_by_chunk = wave_forms[i].total_samples_by_chunk;
+                const auto sample_rate = wave_forms[i].sample_rate;
+
+                const auto readed = f.read(reinterpret_cast<char*>(chunk.data()), chunk.size() * sizeof(qint16));
+                if (wave_form) {
+                    const auto readed_elements = readed / sizeof(qint16);
+                    if (readed_elements != samples_by_chunk_actual) {
+                        std::fill(std::begin(chunk) + readed_elements, std::end(chunk), 0);
+                    }
+
+                    int offset = 0;
+                    std::for_each(chunk.cbegin(), chunk.cend(), [&](const qint16& value){
+                        wave_form->AddEvent(start_time_current + offset + kDateTimeOffset, value * kDefaultGain);
+                        offset += 1000.0 / sample_rate;
+                    });
+                }
+
+                start_time_current += samples_by_chunk_actual * 1000.0 / sample_rate;
+                total_samples_by_chunk += samples_by_chunk_actual;
+            }
+        }
+    });
+
+    QVector<qint16> chunk;
+    for (int i = 0; i < wave_forms.size(); i++) {
+        const auto& wave_form = wave_forms[i];
+        const auto expected_samples = usage.start_time.msecsTo(usage.end_time) / 1000.0 * wave_form.sample_rate;
+        if (wave_form.total_samples_by_chunk < expected_samples) {
+            chunk.resize(expected_samples - wave_form.total_samples_by_chunk);
+            if (wave_form.event_list) {
+                int offset = 0;
+                std::for_each(chunk.cbegin(), chunk.cend(), [&](const qint16& value){
+                    wave_form.event_list->AddEvent(wave_form.start_time + offset + kDateTimeOffset, value * kDefaultGain);
+                    offset += 1000.0 / wave_form.sample_rate;
+                });
+            }
+        }
+    }
+}
+
+void LoadWaveForms(const QString& session_folder_path, Session* session, const UsageData& usage) {
+    QDir session_folder(session_folder_path);
+
+    const auto wave_files = session_folder.entryList(QStringList() << "W" + usage.number + "_*", QDir::Files, QDir::Name);
+
+    QVector<ChunkData> wave_forms;
+    bool initialized = false;
+
+    std::for_each(wave_files.cbegin(), wave_files.cend(), [&](const QString& wave_file){
+        // W01_ file
+        QFile f(session_folder_path + QDir::separator() + wave_file);
+        f.open(QIODevice::ReadOnly);
+
+        if (!initialized) {
+            ReadWaveFormsHeaders(f, wave_forms, session, usage);
+            initialized = true;
+        }
+        f.seek(kMainHeaderSize + wave_forms.size() * kDescriptionHeaderSize);
+
+        QVector<qint16> chunk(std::max_element(wave_forms.cbegin(), wave_forms.cend(), [](const ChunkData& lhs, const ChunkData& rhs){
+                                  return lhs.samples_by_chunk < rhs.samples_by_chunk;
+                              })->samples_by_chunk);
+        while (!f.atEnd()) {
+            for (int i = 0; i < wave_forms.size(); i++) {
+                const auto& wave_form = wave_forms[i].event_list;
+                const auto samples_by_chunk_actual = wave_forms[i].samples_by_chunk;
+                auto& start_time_current = wave_forms[i].start_time;
+                auto& total_samples_by_chunk = wave_forms[i].total_samples_by_chunk;
+                const auto sample_rate = wave_forms[i].sample_rate;
+
+                const auto duration = samples_by_chunk_actual * 1000.0 / sample_rate;
+                const auto readed = f.read(reinterpret_cast<char*>(chunk.data()), chunk.size() * sizeof(qint16));
+                if (wave_form) {
+                    const auto readed_elements = readed / sizeof(qint16);
+                    if (readed_elements != samples_by_chunk_actual) {
+                        std::fill(std::begin(chunk) + readed_elements, std::end(chunk), 0);
+                    }
+                    wave_form->AddWaveform(start_time_current + kDateTimeOffset, chunk.data(), samples_by_chunk_actual, duration);
+                }
+
+                start_time_current += duration;
+                total_samples_by_chunk += samples_by_chunk_actual;
+            }
+        }
+    });
+
+    QVector<qint16> chunk;
+    for (int i = 0; i < wave_forms.size(); i++) {
+        const auto& wave_form = wave_forms[i];
+        const auto expected_samples = usage.start_time.msecsTo(usage.end_time) / 1000.0 * wave_form.sample_rate;
+        if (wave_form.total_samples_by_chunk < expected_samples) {
+            chunk.resize(expected_samples - wave_form.total_samples_by_chunk);
+            if (wave_form.event_list) {
+                const auto duration = chunk.size() * 1000.0 / wave_form.sample_rate;
+                wave_form.event_list->AddWaveform(wave_form.start_time + kDateTimeOffset, chunk.data(), chunk.size(), duration);
+            }
+        }
+    }
+}
+
+void LoadStats(const UsageData& /*usage_data*/, Session* session) {
+    //    session->settings[CPAP_AHI] = usage_data.countAHI;
+    //    session->setCount(CPAP_AI, usage_data.countAI);
+    //    session->setCount(CPAP_CAI, usage_data.countCAI);
+    //    session->setCount(CPAP_HI, usage_data.countHI);
+    //    session->setCount(CPAP_Obstructive, usage_data.countOAI);
+    //    session->settings[CPAP_RERA] = usage_data.countRERA;
+    //    session->settings[CPAP_Snore] = usage_data.countSNI;
+    session->settings[CPAP_Mode] = MODE_APAP;
+}
+
+UsageData ReadUsage(const QString& session_folder_path, const QString& usage_number) {
+    UsageData usage_data;
+    usage_data.number = usage_number;
+
+    const auto session_stat_path = session_folder_path + QDir::separator() + "STAT" + usage_number;
+    if (!QFile::exists(session_stat_path)) {
+        qDebug() << "Resvent Data card has no " << session_stat_path;
+        return usage_data;
+    }
+    QFile f(session_stat_path);
+    f.open(QIODevice::ReadOnly | QIODevice::Text);
+    f.seek(4);
+    while (!f.atEnd()) {
+        QString line = f.readLine().trimmed();
+
+        const auto elems = line.split("=");
+        Q_ASSERT(elems.size() == 2);
+
+        if (elems[0] == "secStart") {
+            usage_data.start_time = QDateTime::fromTime_t(std::stoi(elems[1].toStdString()));
+        }
+        else if (elems[0] == "secUsed") {
+            usage_data.end_time = QDateTime::fromTime_t(usage_data.start_time.toTime_t() + std::stoi(elems[1].toStdString()));
+        }
+        else if (elems[0] == "cntAHI") {
+            usage_data.countAHI = std::stoi(elems[1].toStdString());
+        }
+        else if (elems[0] == "cntOAI") {
+            usage_data.countOAI = std::stoi(elems[1].toStdString());
+        }
+        else if (elems[0] == "cntCAI") {
+            usage_data.countCAI = std::stoi(elems[1].toStdString());
+        }
+        else if (elems[0] == "cntAI") {
+            usage_data.countAI = std::stoi(elems[1].toStdString());
+        }
+        else if (elems[0] == "cntHI") {
+            usage_data.countHI = std::stoi(elems[1].toStdString());
+        }
+        else if (elems[0] == "cntRERA") {
+            usage_data.countRERA = std::stoi(elems[1].toStdString());
+        }
+        else if (elems[0] == "cntSNI") {
+            usage_data.countSNI = std::stoi(elems[1].toStdString());
+        }
+        else if (elems[0] == "cntBreath") {
+            usage_data.countBreath = std::stoi(elems[1].toStdString());
+        }
+    }
+
+    return usage_data;
+}
+
+QVector<UsageData> GetDifferentUsage(const QString& session_folder_path) {
+    QDir session_folder(session_folder_path);
+
+    const auto stat_files = session_folder.entryList(QStringList() << "STAT*", QDir::Files, QDir::Name);
+    QVector<UsageData> usage_data;
+    std::for_each(stat_files.cbegin(), stat_files.cend(), [&](const QString& stat_file){
+        if (stat_file.size() != 6) {
+            return;
+        }
+
+        auto usageData = ReadUsage(session_folder_path, stat_file.right(2));
+
+        usage_data.push_back(usageData);
+    });
+    return usage_data;
+}
+
+int LoadSession(const QString& dirpath, const QDate& session_date, Machine* machine) {
+    const auto session_folder_path = GetSessionFolder(dirpath, session_date);
+
+    const auto different_usage = GetDifferentUsage(session_folder_path);
+
+    return std::accumulate(different_usage.cbegin(), different_usage.cend(), 0, [&](int base, const UsageData& usage){
+        if (machine->SessionExists(usage.start_time.toMSecsSinceEpoch() + kDateTimeOffset)) {
+            return base;
+        }
+        Session* session = new Session(machine, usage.start_time.toMSecsSinceEpoch() + kDateTimeOffset);
+        session->SetChanged(true);
+        session->really_set_first(usage.start_time.toMSecsSinceEpoch() + kDateTimeOffset);
+        session->really_set_last(usage.end_time.toMSecsSinceEpoch() + kDateTimeOffset);
+
+        LoadStats(usage, session);
+        LoadWaveForms(session_folder_path, session, usage);
+        LoadOtherWaveForms(session_folder_path, session, usage);
+        LoadEvents(session_folder_path, session, usage);
+
+        session->UpdateSummaries();
+        session->Store(machine->getDataPath());
+        machine->AddSession(session);
+        return base + 1;
+    });
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Sorted EDF files that need processing into date records according to ResMed noon split
+///////////////////////////////////////////////////////////////////////////////////////////
+int ResventLoader::Open(const QString & dirpath)
+{
+    const auto machine_info = PeekInfo(dirpath);
+
+    // Abort if no serial number
+    if (machine_info.serial.isEmpty()) {
+        qDebug() << "Resvent Data card has no valid serial number in " << kResventSysConfigFilename;
+        return -1;
+    }
+
+    const auto sessions_date = GetSessionsDate(dirpath);
+
+    Machine *machine = p_profile->CreateMachine(machine_info);
+
+    int new_sessions = 0;
+    std::for_each(sessions_date.cbegin(), sessions_date.cend(), [&](const QDate& session_date){
+        new_sessions += LoadSession(dirpath, session_date, machine);
+    });
+
+    machine->Save();
+
+    return new_sessions;
+}
+
+void ResventLoader::initChannels()
+{
+}
+
+ChannelID ResventLoader::PresReliefMode() { return 0; }
+ChannelID ResventLoader::PresReliefLevel() { return 0; }
+ChannelID ResventLoader::CPAPModeChannel() { return 0; }
+
+bool resvent_initialized = false;
+void ResventLoader::Register()
+{
+    if (resvent_initialized) { return; }
+
+    qDebug() << "Registering ResventLoader";
+    RegisterLoader(new ResventLoader());
+
+    resvent_initialized = true;
+}
--- a/oscar/SleepLib/loader_plugins/resvent_loader.h
+++ b/oscar/SleepLib/loader_plugins/resvent_loader.h
@ -0,0 +1,76 @@
+/* SleepLib Resvent Loader Implementation
+ *
+ * Copyright (c) 2019-2023 The OSCAR Team
+ * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the source code
+ * for more details. */
+
+#ifndef RESVENT_LOADER_H
+#define RESVENT_LOADER_H
+
+#include <QVector>
+#include "SleepLib/machine.h" // Base class: MachineLoader
+#include "SleepLib/machine_loader.h"
+#include "SleepLib/profiles.h"
+
+//********************************************************************************************
+/// IMPORTANT!!!
+//********************************************************************************************
+// Please INCREMENT the following value when making changes to this loaders implementation.
+//
+const int resvent_data_version = 1;
+//
+//********************************************************************************************
+
+const QString resvent_class_name = "Resvent/Hoffrichter";
+
+/*! \class ResventLoader
+    \brief Importer for Resvent iBreezer and Hoffrichter Point 3
+    */
+class ResventLoader : public CPAPLoader
+{
+    Q_OBJECT
+public:
+    ResventLoader();
+    virtual ~ResventLoader();
+
+    //! \brief Detect if the given path contains a valid Folder structure
+    virtual bool Detect(const QString & path);
+
+    //! \brief Look up machine model information of ResMed file structure stored at path
+    virtual MachineInfo PeekInfo(const QString & path);
+
+    //! \brief Scans for ResMed SD folder structure signature, and loads any new data if found
+    virtual int Open(const QString &);
+
+    //! \brief Returns the version number of this Resvent loader
+    virtual int Version() { return resvent_data_version; }
+
+    //! \brief Returns the Machine class name of this loader. ("Resvent")
+    virtual const QString &loaderName() { return resvent_class_name; }
+
+    //! \brief Register the ResmedLoader with the list of other machine loaders
+    static void Register();
+
+    virtual MachineInfo newInfo() {
+        return MachineInfo(MT_CPAP, 0, resvent_class_name, QObject::tr("Resvent/Hoffrichter"), QString(), QString(), QString(), QObject::tr("iBreeze/Point3"), QDateTime::currentDateTime(), resvent_data_version);
+    }
+
+    virtual void initChannels();
+
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Now for some CPAPLoader overrides
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    virtual QString PresReliefLabel() { return QObject::tr("EPR: "); }
+
+    virtual ChannelID PresReliefMode();
+    virtual ChannelID PresReliefLevel();
+    virtual ChannelID CPAPModeChannel();
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+};
+
+#endif // RESVENT_LOADER_H
--- a/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
@ -870,6 +870,7 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
    quint16 unknownIndex;

    int totalrecs = 0;
+    Q_UNUSED( totalrecs );

    do {
        // Read timestamp for session and check for end of data signal
@ -923,7 +924,8 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)

 //fastleak        EventList *LK = sess->AddEventList(CPAP_LeakTotal, EVL_Event, 1);
        EventList *PR = sess->AddEventList(CPAP_Pressure, EVL_Event, 0.1F);
-        EventList *A = sess->AddEventList(CPAP_AllApnea, EVL_Event);
+        EventList *OA = sess->AddEventList(CPAP_Obstructive, EVL_Event);
+        EventList *CA = sess->AddEventList(CPAP_ClearAirway, EVL_Event);
        EventList *H =  sess->AddEventList(CPAP_Hypopnea, EVL_Event);
        EventList *FL = sess->AddEventList(CPAP_FlowLimit, EVL_Event);
        EventList *SA = sess->AddEventList(CPAP_SensAwake, EVL_Event);
@ -965,8 +967,8 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
                bitmask = 1;
                for (int k = 0; k < 6; k++) {  // There are 6 flag sets per 2 minutes
                    // TODO: Modify if all four channels are to be reported separately
-                    if (a1 & bitmask) {  A->AddEvent(ti+60000, 0); } // Grouped by F&P as A
-                    if (a2 & bitmask) {  A->AddEvent(ti+60000, 0); } // Grouped by F&P as A
+                    if (a1 & bitmask) { OA->AddEvent(ti+60000, 0); } // Grouped by F&P as A
+                    if (a2 & bitmask) { CA->AddEvent(ti+60000, 0); } // Grouped by F&P as A
                    if (a3 & bitmask) {  H->AddEvent(ti+60000, 0); } // Grouped by F&P as H
                    if (a4 & bitmask) {  H->AddEvent(ti+60000, 0); } // Grouped by F&P as H
                    if (a5 & bitmask) { FL->AddEvent(ti+60000, 0); }
--- a/oscar/SleepLib/loader_plugins/sleepstyle_loader.h
+++ b/oscar/SleepLib/loader_plugins/sleepstyle_loader.h
@ -21,7 +21,7 @@
 //********************************************************************************************
 // Please INCREMENT the following value when making changes to this loaders implementation.
 //
-const int sleepstyle_data_version = 1;
+const int sleepstyle_data_version = 2;
 //
 //********************************************************************************************

--- a/oscar/SleepLib/loader_plugins/somnopose_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/somnopose_loader.cpp
@ -94,8 +94,13 @@ int SomnoposeLoader::OpenFile(const QString & filename)
        return -1;
    }

-    QDateTime epoch(QDate(2001, 1, 1));
-    qint64 ep = qint64(epoch.toTime_t()+epoch.offsetFromUtc()) * 1000, time=0;
+     #if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+         QDateTime epoch(QDate(2001, 1, 1).startOfDay(Qt::OffsetFromUTC));
+         qint64 ep = epoch.toMSecsSinceEpoch() , time=0;
+     #else
+        QDateTime epoch(QDate(2001, 1, 1));
+        qint64 ep = qint64(epoch.toTime_t()+epoch.offsetFromUtc()) * 1000, time=0;
+    #endif
    qDebug() << "Epoch starts at" << epoch.toString();

    double timestamp, orientation=0, inclination=0, movement=0;
--- a/oscar/SleepLib/loader_plugins/weinmann_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/weinmann_loader.cpp
@ -17,6 +17,17 @@

 #include "weinmann_loader.h"

+// The qt5.15 obsolescence of hex requires this change.
+// this solution to QT's obsolescence is only used in debug statements
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    #define QTHEX     Qt::hex
+    #define QTDEC     Qt::dec
+#else
+    #define QTHEX     hex
+    #define QTDEC     dec
+#endif
+
+
 Weinmann::Weinmann(Profile *profile, MachineID id)
    : CPAP(profile, id)
 {
@ -74,7 +85,7 @@ int WeinmannLoader::ParseIndex(QFile & wmdata)
            int val = e.attribute("val").toInt(&ok);
            if (ok) {
                index[e.attribute("name")] = val;
-                qDebug() << e.attribute("name") << "=" << hex << val;
+                qDebug() << e.attribute("name") << "=" << QTHEX << val;
            }
        }
        n = n.nextSibling();
@ -152,7 +163,7 @@ int WeinmannLoader::Open(const QString & dirpath)

    unsigned char *p = weekco;
    for (int c=0; c < wccount; ++c) {
-        int year = QString().sprintf("%02i%02i", p[0], p[1]).toInt();
+        int year = QString::asprintf("%02i%02i", p[0], p[1]).toInt();
        int month = p[2];
        int day = p[3];
        int hour = p[5];
@ -206,7 +217,7 @@ int WeinmannLoader::Open(const QString & dirpath)

    //int c = index[DayComplianceCount];
    for (int i=0; i < 5; i++) {
-        int year = QString().sprintf("%02i%02i", p[0], p[1]).toInt();
+        int year = QString::asprintf("%02i%02i", p[0], p[1]).toInt();
        int month = p[2];
        int day = p[3];
        int hour = p[5];
@ -250,7 +261,7 @@ int WeinmannLoader::Open(const QString & dirpath)
        sess->really_set_last(qint64(ts+dur) * 1000L);
        sessions[ts] = sess;

-//        qDebug() << date << ts << dur << QString().sprintf("%02i:%02i:%02i", dur / 3600, dur/60 % 60, dur % 60);
+//        qDebug() << date << ts << dur << QString::asprintf("%02i:%02i:%02i", dur / 3600, dur/60 % 60, dur % 60);

        p += 0xd6;
    }
@ -361,6 +372,7 @@ int WeinmannLoader::Open(const QString & dirpath)
        EventList * FL = sess->AddEventList(CPAP_FlowLimit, EVL_Event);
 //        EventList * VS = sess->AddEventList(CPAP_VSnore, EVL_Event);
        quint64 tt = ti;
+        Q_UNUSED (tt);
        quint64 step = sess->length() / ci.event_recs;
        unsigned char *p = &ev[ci.event_start];
        for (quint32 j=0; j < ci.event_recs; ++j) {
--- a/oscar/SleepLib/loader_plugins/weinmann_loader.h
+++ b/oscar/SleepLib/loader_plugins/weinmann_loader.h
@ -66,6 +66,7 @@ struct CompInfo
        pres_start(ps), pres_size(pl),
        amv_start(ms), amv_size(ml),
        event_start(es), event_recs(er) {}
+    CompInfo& operator=(const CompInfo & other) = default;
    Session * session;
    QDateTime time;
    quint32 flow_start;
--- a/oscar/SleepLib/machine.cpp
+++ b/oscar/SleepLib/machine.cpp
@ -7,6 +7,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QApplication>
 #include <QDir>
 #include <QDebug>
@ -33,6 +36,7 @@
 #include "profiles.h"
 #include <algorithm>
 #include "SleepLib/schema.h"
+//#include "SleepLib/session.h"
 #include "SleepLib/day.h"
 #include "mainwindow.h"

@ -161,7 +165,7 @@ bool Machine::saveSessionInfo()
        Session * sess = s.value();
        if (sess->s_first != 0) {
            out << (quint32) sess->session();
-            out << (bool)(sess->enabled());
+            out << (quint8)(sess->enabled(true));
        } else {
            qWarning() << "Machine::SaveSessionInfo discarding session" << sess->s_session
                       << "["+QDateTime::fromTime_t(sess->s_session).toString("MMM dd, yyyy hh:mm:ss")+"]"
@ -194,9 +198,11 @@ bool Machine::loadSessionInfo()
            Session * sess = s.value();
            QHash<ChannelID, QVariant>::iterator it = sess->settings.find(SESSION_ENABLED);

-            bool b = true;
+            quint8 b = true;
+            b &= 0x1;
            if (it != sess->settings.end()) {
                b = it.value().toBool();
+            } else {
            }
            sess->setEnabled(b);        // Extract from session settings and save..
        }
@ -230,11 +236,12 @@ bool Machine::loadSessionInfo()
    in >> size;

    quint32 sid;
-    bool b;
+    quint8 b;

    for (int i=0; i< size; ++i) {
        in >> sid;
        in >> b;
+        b &= 0x1;

        s = sessionlist.find(sid);

@ -393,8 +400,7 @@ bool Machine::AddSession(Session *s, bool allowOldSessions)

    if (session_length < ignore_sessions) {
        // keep the session to save importing it again, but don't add it to the day record this time
-        qDebug() << s->session() << "Ignoring short session <" << ignore_sessions
-            << "["+QDateTime::fromMSecsSinceEpoch(s->first()).toString("MMM dd, yyyy hh:mm:ss")+"]";
+        // qDebug() << s->session() << "Ignoring short session <" << ignore_sessions << "["+QDateTime::fromMSecsSinceEpoch(s->first()).toString("MMM dd, yyyy hh:mm:ss")+"]";
        return true;
    }

@ -415,7 +421,6 @@ bool Machine::AddSession(Session *s, bool allowOldSessions)
        dit = day.insert(date, profile->addDay(date));
    }
    dd = dit.value();
-
    dd->addSession(s);

    if (combine_next_day) {
@ -624,7 +629,7 @@ void Machine::setInfo(MachineInfo inf)
 }

 const QString Machine::getDataPath()
-{    
+{
    // TODO: Rework the underlying database so that file storage doesn't rely on consistent presence or absence of the serial number.
    m_dataPath = p_pref->Get("{home}/Profiles/")+profile->user->userName()+"/"+info.loadername + "_"
                 + (info.serial.isEmpty() ? hexid() : info.serial) + "/";
@ -706,7 +711,7 @@ bool Machine::Load(ProgressDialog *progress)
        progress->setProgressValue(0);
        QApplication::processEvents();

-        QTime time;
+        QElapsedTimer time;
        time.start();
        dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);

@ -899,7 +904,7 @@ const int summaryxml_version=1;

 bool Machine::LoadSummary(ProgressDialog * progress)
 {
-    QTime time;
+    QElapsedTimer time;
    time.start();
    QString filename = getDataPath() + summaryFileName + ".gz";

@ -1022,7 +1027,7 @@ bool Machine::LoadSummary(ProgressDialog * progress)
 //      if ((cnt % 100) == 0) {
 //          progress->setValue(cnt);
 //          //QApplication::processEvents();
-//      } 
+//      }
 *****************************************************************/
        Session * sess = it.value();
        if ( ! AddSession(sess, true)) {
@ -1083,7 +1088,7 @@ bool Machine::SaveSummaryCache()
        el.setAttribute("id", (quint32)sess->session());
        el.setAttribute("first", sess->realFirst());
        el.setAttribute("last", sess->realLast());
-        el.setAttribute("enabled", sess->enabled() ? "1" : "0");
+        el.setAttribute("enabled", sess->enabled(true) ? "1" : "0");
        el.setAttribute("events", sess->summaryOnly() ? "0" : "1");

        QHash<ChannelID, QVector<EventList *> >::iterator ev;
--- a/oscar/SleepLib/machine.h
+++ b/oscar/SleepLib/machine.h
@ -159,7 +159,7 @@ class Machine


    //! \brief Returns the machineID as a lower case hexadecimal string
-    QString hexid() { return QString().sprintf("%08lx", m_id); }
+    QString hexid() { return QString::asprintf("%08lx", m_id); }


    //! \brief Unused, increments the most recent sessionID
--- a/oscar/SleepLib/machine_common.cpp
+++ b/oscar/SleepLib/machine_common.cpp
@ -27,7 +27,7 @@ ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAP
          CPAP_UserFlag1, CPAP_UserFlag2, CPAP_UserFlag3, /*CPAP_BrokenSummary, CPAP_BrokenWaveform,*/ CPAP_RDI,
          CPAP_PresReliefMode, CPAP_PresReliefLevel, CPAP_PSMin, CPAP_PSMax, CPAP_Test1,
          CPAP_Test2, CPAP_HumidSetting,
-          CPAP_PressureSet, CPAP_IPAPSet, CPAP_EPAPSet, CPAP_EEPAP;
+          CPAP_PressureSet, CPAP_IPAPSet, CPAP_EPAPSet, CPAP_EEPAP, CPAP_EEPAPLo, CPAP_EEPAPHi;


 ChannelID RMS9_E01, RMS9_E02, RMS9_SetPressure, RMS9_MaskOnTime;
--- a/oscar/SleepLib/machine_common.h
+++ b/oscar/SleepLib/machine_common.h
@ -95,7 +95,7 @@ const quint32 PAP_SplitNight              = 0x8000;  // Split night capabilities
    \brief CPAP Machines mode of operation
  */
 enum CPAPMode { //:short
-    MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BILEVEL_FIXED, MODE_BILEVEL_AUTO_FIXED_PS, MODE_BILEVEL_AUTO_VARIABLE_PS, MODE_ASV, MODE_ASV_VARIABLE_EPAP, MODE_AVAPS
+    MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BILEVEL_FIXED, MODE_BILEVEL_AUTO_FIXED_PS, MODE_BILEVEL_AUTO_VARIABLE_PS, MODE_ASV, MODE_ASV_VARIABLE_EPAP, MODE_AVAPS, MODE_TRILEVEL_AUTO_VARIABLE_PDIFF
 };

 /*! \enum PRTypes
@ -112,6 +112,7 @@ enum PRTimeModes { //:short
 struct MachineInfo {
    MachineInfo() { type = MT_UNKNOWN; version = 0; cap=0; }
    MachineInfo(const MachineInfo & /*copy*/) = default;
+    ~MachineInfo() {};

    MachineInfo(MachineType type, quint32 cap, QString loadername, QString brand, QString model, QString modelnumber, QString serial, QString series, QDateTime lastimported, int version, QDate purgeDate = QDate()) :
        type(type), cap(cap), loadername(loadername), brand(brand), model(model), modelnumber(modelnumber), serial(serial), series(series), lastimported(lastimported), version(version), purgeDate(purgeDate) {}
@ -149,7 +150,7 @@ extern ChannelID AllAhiChannels;
 extern QVector<ChannelID> ahiChannels;

 extern ChannelID NoChannel, SESSION_ENABLED, CPAP_SummaryOnly;
-extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAPHi, CPAP_EEPAP,
+extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAPHi, CPAP_EEPAP, CPAP_EEPAPLo, CPAP_EEPAPHi,
       CPAP_Pressure, CPAP_PS, CPAP_PSMin, CPAP_PSMax,
       CPAP_Mode, CPAP_AHI,
       CPAP_PressureMin, CPAP_PressureMax, CPAP_Ramp, CPAP_RampTime, CPAP_RampPressure, CPAP_Obstructive,
--- a/oscar/SleepLib/machine_loader.cpp
+++ b/oscar/SleepLib/machine_loader.cpp
@ -7,6 +7,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */

+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QApplication>
 #include <QFile>
 #include <QDir>
--- a/Show More
+++ b/Show More