mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-06 03:00:43 +00:00
Merge master, fix unreadable and zero-length file conflict
This commit is contained in:
Phil Olynyk
commit
3edff07151
@ -2,7 +2,7 @@
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- [Qt 5.12.2] (the current LTS release as of OSCAR 1.0.0)
|
||||
- [Qt 5.12.5] (the current LTS release as of OSCAR 1.1.0)
|
||||
- [macOS 10.12 Sierra] or higher for building (required by Qt 5.12)
|
||||
- Command-Line Tools for Xcode 9.2, and optionally [Xcode] itself
|
||||
- Xcode 9.2 is the last version that runs on macOS 10.12
|
||||
@ -37,16 +37,16 @@ NOTE: Official builds are currently made with [macOS 10.14 Mojave] and Command-L
|
||||
_Alternatively, the command-line tools installer .dmg can be downloaded from the [Xcode] download site, but you will need a (free) developer account and will
|
||||
need to pick the appropriate download for your version of macOS._
|
||||
|
||||
4. Install Qt 5.12.2 (as "build" user, if created), approx. 3GB:
|
||||
1. Mount qt-opensource-mac-x64-5.12.2.dmg
|
||||
2. Launch qt-opensource-mac-x64-5.12.2
|
||||
4. Install Qt (as "build" user, if created), approx. 3GB:
|
||||
1. Mount qt-opensource-mac-x64-5.12.5.dmg
|
||||
2. Launch qt-opensource-mac-x64-5.12.5
|
||||
3. Next, Skip, Continue, (optionally change the installation directory), Continue
|
||||
* Qt is entirely self-contained and can be installed anywhere. It defaults to ~/Qt5.12.2.
|
||||
* Qt is entirely self-contained and can be installed anywhere. It defaults to ~/Qt5.12.5.
|
||||
* If you only have the command-line tools installed, the Qt installer will complain that "You need to install Xcode and set up Xcode command line tools." Simply click OK.
|
||||
4. Expand Qt 5.12.2 and select "macOS", Continue
|
||||
4. Expand Qt 5.12.5 and select "macOS", Continue
|
||||
5. Select "I have read and agree..." and Continue, Install
|
||||
6. Uncheck "Launch Qt Creator", Done
|
||||
7. Eject qt-opensource-mac-x64-5.12.2
|
||||
7. Eject qt-opensource-mac-x64-5.12.5
|
||||
|
||||
## Build
|
||||
|
||||
@ -56,20 +56,20 @@ NOTE: Official builds are currently made with [macOS 10.14 Mojave] and Command-L
|
||||
cd OSCAR-code
|
||||
mkdir build
|
||||
cd build
|
||||
~/Qt5.12.2/5.12.2/clang_64/bin/qmake ../oscar/oscar.pro
|
||||
~/Qt5.12.5/5.12.5/clang_64/bin/qmake ../oscar/oscar.pro
|
||||
make
|
||||
|
||||
The application is in OSCAR.app.
|
||||
|
||||
2. (Optional) Package for distribution:
|
||||
|
||||
~/Qt5.12.2/5.12.2/clang_64/bin/macdeployqt OSCAR.app -dmg
|
||||
~/Qt5.12.5/5.12.5/clang_64/bin/macdeployqt OSCAR.app -dmg
|
||||
|
||||
The dmg is at OSCAR.dmg.
|
||||
|
||||
## (Optional) Using Qt Creator
|
||||
|
||||
1. Launch Qt Creator where you installed Qt above, by default ~/Qt5.12.2/Qt Creator.app.
|
||||
1. Launch Qt Creator where you installed Qt above, by default ~/Qt5.12.5/Qt Creator.app.
|
||||
2. File > Open File or Project... and select ~/OSCAR-code/oscar/oscar.pro (or wherever you cloned it above), then click "Configure Project".
|
||||
3. Configure building:
|
||||
1. Click on "Projects" in the left panel.
|
||||
@ -77,19 +77,19 @@ NOTE: Official builds are currently made with [macOS 10.14 Mojave] and Command-L
|
||||
3. Click to expand "Details" for the **qmake** build step.
|
||||
4. Uncheck "Enable Qt Quick Compiler", click "No" to defer recompiling.
|
||||
4. Configure packaging for distribution:
|
||||
1. Copy the "Build directory" path from the **Build Settings** panel above. (Default is "/Users/build/OSCAR-code/build-oscar-Desktop_Qt_5_12_2_clang_64bit-Release")
|
||||
1. Copy the "Build directory" path from the **Build Settings** panel above. (Default is "/Users/build/OSCAR-code/build-oscar-Desktop_Qt_5_12_5_clang_64bit-Release")
|
||||
2. Tools > External > Configure...
|
||||
3. Select "Add Tool" from the "Add" drop-down menu near the bottom of the window.
|
||||
4. Set the name to "Deploy".
|
||||
5. Set the Description to "Creates a distributable .dmg".
|
||||
6. Set the Executable to the full path where you installed Qt: "/Users/build/Qt5.12.2/5.12.2/clang_64/bin/macdeployqt".
|
||||
6. Set the Executable to the full path where you installed Qt: "/Users/build/Qt5.12.5/5.12.5/clang_64/bin/macdeployqt".
|
||||
7. Set the Arguments to "OSCAR.app -dmg".
|
||||
8. Set the working directory to the build directory path copied in step 1.
|
||||
9. Click OK.
|
||||
5. To compile, select Build > Build Project "oscar". The application is in OSCAR.app.
|
||||
6. To create a .dmg, select Tools > External > Deploy. The dmg is at OSCAR.dmg.
|
||||
|
||||
[Qt 5.12.2]: http://download.qt.io/archive/qt/5.12/5.12.2/qt-opensource-mac-x64-5.12.2.dmg
|
||||
[Qt 5.12.5]: http://download.qt.io/archive/qt/5.12/5.12.5/qt-opensource-mac-x64-5.12.5.dmg
|
||||
[macOS 10.14 Mojave]: https://apps.apple.com/us/app/macos-mojave/id1398502828?ls=1&mt=12
|
||||
[macOS 10.13 High Sierra]: https://apps.apple.com/us/app/macos-high-sierra/id1246284741?ls=1&mt=12
|
||||
[macOS 10.12 Sierra]: https://apps.apple.com/us/app/macos-sierra/id1127487414?ls=1&mt=12
|
||||
|
||||
@ -1,103 +1,75 @@
|
||||
Creating OSCAR development environment on Windows, compiling, and building installers
|
||||
=====================================================================================
|
||||
|
||||
This document is intended to be brief notes on how to install the necessary
|
||||
components to build OSCAR and create installers for Windows 32-bit and 64-bit
|
||||
versions.
|
||||
This document is intended to be a brief description of how to install the necessary components to build OSCAR and create installers for Windows 32-bit and 64-bit versions.
|
||||
|
||||
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.
|
||||
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 following programs and files are required to create Windows installers:
|
||||
|
||||
- Inno Setup 6.0.2 from <http://www.jrsoftware.org/isdl.php>. Download and
|
||||
install innosetup-qsp-6.0.2.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 version
|
||||
5.12.2. More recent versions may also work but I have not tested any.
|
||||
- Inno Setup 6.0.2 from <http://www.jrsoftware.org/isdl.php>. Download and install innosetup-qsp-6.0.2.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 version 5.12.4. More recent versions may also work but I have not tested any.
|
||||
|
||||
**Installing Inno Setup 6**
|
||||
|
||||
Inno Setup 6.0.2 is found on <http://www.jrsoftware.org/isdl.php>. Download and
|
||||
install innosetup-qsp-6.0.2.exe.
|
||||
Inno Setup 6.0.2 is found on <http://www.jrsoftware.org/isdl.php>. Download and install innosetup-qsp-6.0.2.exe.
|
||||
|
||||
The deployment batch file assumes that Inno Setup is installed into its default
|
||||
location: C:\\Program Files (x86)\\Inno Setup 6. If you put it somewhere else,
|
||||
you will have to change the batch file.
|
||||
The deployment batch file assumes that Inno Setup is installed into its default location: C:\\Program Files (x86)\\Inno Setup 6. If you put it somewhere else, you will have to change the batch file.
|
||||
|
||||
Run the installer, accepting options to install inno script studio (for possible
|
||||
future use) and install Inno Setup Preprocessor. Encryption support is not
|
||||
needed, so do not select it.
|
||||
Run the installer, accepting options to install inno script studio (for possible future use) and install Inno Setup Preprocessor. Encryption support is not needed, so do not select it.
|
||||
|
||||
**Installing GIT for Windows**
|
||||
|
||||
Go to <https://gitforwindows.org/> and click on the Download button. Run the
|
||||
installer, which presents lots of options:
|
||||
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 and optional Unix tools from the Command Prompt.” If you do
|
||||
this, rather than “Git from the command line and also from 3rd-party
|
||||
software,” you will not need to install Gawk separately, as it is included
|
||||
with Git for Windows.
|
||||
|
||||
- Select “Use Git and optional Unix tools from the Command Prompt.” If you do this, rather than “Git from the command line and also from 3rd-party software,” you will not need to install Gawk separately, as it is included with Git for Windows.
|
||||
|
||||
- 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.
|
||||
|
||||
- Leave extra options as they default (enable file system caching, enable Git
|
||||
credential manager, but not symbolic links).
|
||||
- Select “Use Windows’ default console window.” I find the Windows default console to be satisfactory on Windows 10.
|
||||
|
||||
- Leave extra options as they default (enable file system caching, enable Git credential manager, but not symbolic links).
|
||||
|
||||
GIT for Windows adds itself to your path.
|
||||
|
||||
**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.
|
||||
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.0.6-online.exe. Run the
|
||||
installer:
|
||||
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:
|
||||
|
||||
- Logon with your QT account or create an account if needed.
|
||||
|
||||
- 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)
|
||||
|
||||
- Choose your installation directory (I picked E:\\Qt, but there are no dependencies on where QT is located)
|
||||
|
||||
- Select components:
|
||||
|
||||
- In QT 5.12.2:
|
||||
- In QT 5.12.4:
|
||||
|
||||
- MinGW 7.3.0 32-bit
|
||||
|
||||
- MinGW 7.3.0 64-bit
|
||||
|
||||
- Sources
|
||||
|
||||
- In Developer and Designer Tools:
|
||||
|
||||
- QT Creator 4.8.2 CDB Debug (this may not be required)
|
||||
- QT Creator 4.10.0 CDB Debug (this may not be required)
|
||||
|
||||
- MinGW 7.3.0 32-bit
|
||||
|
||||
@ -107,59 +79,40 @@ And complete the installation (this also takes a while).
|
||||
|
||||
**Getting Started 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.
|
||||
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.
|
||||
|
||||
Start QT. There are two QT Oscar project files: OSCAR_QT.pro in the Oscar-code
|
||||
directory, and Oscar.pro in the Oscar-code\\oscar directory. You may use
|
||||
*either* project file. Both will create a running version of Oscar. I find
|
||||
building with Oscar.pro in the Oscar-code\\oscar directory to be very slightly
|
||||
faster, but the difference is negligible.
|
||||
Start QT. There are two QT Oscar project files: OSCAR_QT.pro in the Oscar-code directory, and Oscar.pro in the Oscar-code\\oscar directory. You may use *either* project file. Both will create a running version of Oscar. I find building with Oscar.pro in the Oscar-code\\oscar directory to be very slightly faster, but the difference is negligible.
|
||||
|
||||
QT it will ask you to select your kits and configure them. Select both MinGW
|
||||
7.3.0 32-bit and 64-bit kits.
|
||||
QT it will ask you to select your kits and configure them. Select both MinGW 7.3.0 32-bit and 64-bit kits.
|
||||
|
||||
Click on Projects in the left panel to show your active project (“oscar”) and
|
||||
**Build & Run** settings. Click on the **Build** line for either 32-bit or
|
||||
64-bit.
|
||||
Click on Projects in the left panel to show your active project (“oscar”) and **Build & Run** settings. Click on the **Build** line for either 32-bit or 64-bit.
|
||||
|
||||
In the Build settings in the center panel, select “Release” rather than the
|
||||
default “Debug” in the pull-down at the top of the Build Settings. Click on
|
||||
Details for the qmake build step. By default, “Enable Qt Quick Compiler” is
|
||||
checked. Remove that check – errors result if it is on. QT will ask if you want
|
||||
to recompile everything now. Don’t, as there is more to do before compiling.
|
||||
Make this same change for the Release build for both 32-bit and 64-bit kits. And
|
||||
if you ever want to use the Build Debug pull-down, you may need to do the same.
|
||||
In the Build settings in the center panel, select “Release” rather than the default “Debug” in the pull-down at the top of the Build Settings. Click on Details for the qmake build step. By default, “Enable Qt Quick Compiler” is checked. Remove that check – errors result if it is on. QT will ask if you want to recompile everything now. Don’t, as there is more to do before compiling. Make this same change for the Release build for both 32-bit and 64-bit kits. If you want to use the QT Creator Debug tools, select the Build Debug pull-down and disable the QT Quick Compiler there as well.
|
||||
|
||||
To create a “release” directory and installer, you need to add a custom process
|
||||
step to the Release build configuration. Be sure to select “Release” rather than
|
||||
the default “Debug” in the pull-down at the top of the Build Settings.
|
||||
With these changes, you can build, debug, and run Oscar from QT Creator. However, to run Oscar from a Windows shortcut, not in the QT environment, you must create a deployment directory that contains all files required by Oscar. Creating an installer also requires an additional step.
|
||||
|
||||
Create a custom process step as the final build step. Put the fully qualified
|
||||
path for deploy.bat in the command field. Don’t touch “working directory.” Any
|
||||
string you care to place in the “arguments” field will be appended to the
|
||||
installer executable file name.
|
||||
A deploy.bat file performs both functions. It creates a release directory and an installer. You can include this deployment file in QT Creator in one of two ways. You can include it as part of QT Creator's build process, or you can do this as a separate deployment step.
|
||||
|
||||
To include deployment as part of the Release build process, add a custom process step to the configuration. Be sure to select “Release” rather than the default “Debug” in the pull-down at the top of the Build Settings.
|
||||
|
||||
Create a custom process step as the final build step. Put the fully qualified path for deploy.bat in the command field. Don’t touch “working directory.” Any string you care to place in the “arguments” field will be appended to the installer executable file name.
|
||||
|
||||
Do the same for both 32-bit and 64-bit Build settings.
|
||||
|
||||
Now you should be able to build the OSCAR project from the QT Build menu.
|
||||
|
||||
To make 32-bit or 64-bit builds, just make sure the correct Build item is
|
||||
selected in the Build & Run section on the left.
|
||||
To make 32-bit or 64-bit builds, just make sure the correct Build item is selected in the Build & Run section on the left.
|
||||
|
||||
If you prefer to run deploy.bat as a separate deployment step, select Run under the kit name in the Build & Run section. Under Run Settings, select Add Deploy Step. Now create a custom process step just as described earlier. Menu item Build/Deploy will now run this deployment script.
|
||||
|
||||
**Compiling and building from the command line**
|
||||
|
||||
If you prefer to build from the command line and not use QT Creator, a batch
|
||||
script buildall.bat will build and create installers for both 32-bit and 64-bit
|
||||
versions of Windows. This script has some hard-coded paths, so will need to be
|
||||
modified for your system configuration.
|
||||
If you prefer to build from the command line and not use QT Creator, a batch script buildall.bat will build and create installers for both 32-bit and 64-bit versions of Windows. This script has some hard-coded paths, so will need to be modified for your system configuration. This batch file is not well tested, as I prefer to build from QT Creator.
|
||||
|
||||
**The Deploy.BAT file**
|
||||
|
||||
The deployment batch file creates two folders inside the shadow build folder:
|
||||
|
||||
Release – everything needed to run OSCAR. You can run OSCAR from this directory
|
||||
just by clicking on it.
|
||||
Release – everything needed to run OSCAR. You can run OSCAR from this directory just by clicking on it.
|
||||
|
||||
Installer – contains an installer exe file that will install this product.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
setlocal
|
||||
:::@echo off
|
||||
set qtpath=E:\Qt
|
||||
set qtVersion=5.12.2
|
||||
set qtVersion=5.12.4
|
||||
|
||||
:::
|
||||
::: Build 32- and 64-bit versions of OSCAR for Windows.
|
||||
|
||||
20
Doxyfile
20
Doxyfile
@ -44,7 +44,7 @@ PROJECT_NAME = OSCAR
|
||||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER = 1.0.x
|
||||
PROJECT_NUMBER = 1.1.x
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer
|
||||
@ -74,7 +74,7 @@ OUTPUT_DIRECTORY = ./doxydoc
|
||||
# source files, where putting all generated files in the same directory would
|
||||
# otherwise cause performance problems for the file system.
|
||||
|
||||
CREATE_SUBDIRS = NO
|
||||
CREATE_SUBDIRS = YES
|
||||
|
||||
# The OUTPUT_LANGUAGE tag is used to specify the language in which all
|
||||
# documentation generated by doxygen is written. Doxygen will use this
|
||||
@ -172,7 +172,7 @@ JAVADOC_AUTOBRIEF = NO
|
||||
# will behave just like regular Qt-style comments (thus requiring
|
||||
# an explicit \brief command for a brief description.)
|
||||
|
||||
QT_AUTOBRIEF = NO
|
||||
QT_AUTOBRIEF = YES
|
||||
|
||||
# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
|
||||
# treat a multi-line C++ special comment block (i.e. a block of //! or ///
|
||||
@ -332,7 +332,7 @@ SYMBOL_CACHE_SIZE = 0
|
||||
# Private class members and static file members will be hidden unless
|
||||
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
|
||||
|
||||
EXTRACT_ALL = NO
|
||||
EXTRACT_ALL = YES
|
||||
|
||||
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
|
||||
# will be included in the documentation.
|
||||
@ -342,7 +342,7 @@ EXTRACT_PRIVATE = NO
|
||||
# If the EXTRACT_STATIC tag is set to YES all static members of a file
|
||||
# will be included in the documentation.
|
||||
|
||||
EXTRACT_STATIC = NO
|
||||
EXTRACT_STATIC = YES
|
||||
|
||||
# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
|
||||
# defined locally in source files will be included in the documentation.
|
||||
@ -444,7 +444,7 @@ SORT_MEMBER_DOCS = YES
|
||||
# by member name. If set to NO (the default) the members will appear in
|
||||
# declaration order.
|
||||
|
||||
SORT_BRIEF_DOCS = NO
|
||||
SORT_BRIEF_DOCS = YES
|
||||
|
||||
# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
|
||||
# will sort the (brief and detailed) documentation of class members so that
|
||||
@ -962,7 +962,7 @@ DOCSET_PUBLISHER_ID = org.doxygen.Publisher
|
||||
|
||||
# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
|
||||
|
||||
DOCSET_PUBLISHER_NAME = Publisher
|
||||
DOCSET_PUBLISHER_NAME = The OSCAR Team
|
||||
|
||||
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
|
||||
# will be generated that can be used as input for tools like the
|
||||
@ -1099,12 +1099,12 @@ ENUM_VALUES_PER_LINE = 4
|
||||
# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
|
||||
# Windows users are probably better off using the HTML help feature.
|
||||
|
||||
GENERATE_TREEVIEW = NO
|
||||
GENERATE_TREEVIEW = YES
|
||||
|
||||
# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
|
||||
# and Class Hierarchy pages using a tree view instead of an ordered list.
|
||||
|
||||
USE_INLINE_TREES = NO
|
||||
USE_INLINE_TREES = YES
|
||||
|
||||
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
|
||||
# used to set the initial width (in pixels) of the frame in which the tree
|
||||
@ -1180,7 +1180,7 @@ SERVER_BASED_SEARCH = NO
|
||||
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
|
||||
# generate Latex output.
|
||||
|
||||
GENERATE_LATEX = YES
|
||||
GENERATE_LATEX = NO
|
||||
|
||||
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
|
||||
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
|
||||
|
||||
@ -109,7 +109,7 @@ void Day::addSession(Session *s)
|
||||
if (mi != machines.end()) {
|
||||
if (mi.value() != s->machine()) {
|
||||
qDebug() << "OSCAR can't add session" << s->session()
|
||||
<< "["+QDateTime::fromTime_t(s->first()).toString("MMM dd, yyyy hh:mm:ss")+"]"
|
||||
<< "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]"
|
||||
<< "from machine" << mi.value()->serial() << "to machine" << s->machine()->serial()
|
||||
<< "to this day record, as it already contains a different machine of the same MachineType" << s->type();
|
||||
return;
|
||||
@ -803,6 +803,23 @@ qint64 Day::total_time(MachineType type)
|
||||
return total; //d_totaltime;
|
||||
}
|
||||
|
||||
ChannelID Day::getPressureChannelID() {
|
||||
// Determined the preferred pressure channel (CPAP_IPAP or CPAP_Pressure)
|
||||
CPAPMode cpapmode = (CPAPMode)(int)settings_max(CPAP_Mode);
|
||||
ChannelID preferredID = CPAP_Pressure;
|
||||
if (cpapmode == MODE_ASV || cpapmode == MODE_ASV_VARIABLE_EPAP || cpapmode == MODE_AVAPS)
|
||||
preferredID = CPAP_IPAP;
|
||||
|
||||
// If preferred channel has data, return it
|
||||
if (channelHasData(preferredID))
|
||||
return preferredID;
|
||||
|
||||
// Otherwise return the other pressure channel
|
||||
if (preferredID == CPAP_IPAP)
|
||||
return CPAP_Pressure;
|
||||
else
|
||||
return CPAP_IPAP;
|
||||
}
|
||||
|
||||
bool Day::hasEnabledSessions()
|
||||
{
|
||||
@ -1479,7 +1496,7 @@ QString Day::getPressureSettings()
|
||||
} else if (mode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
|
||||
return QObject::tr("Min EPAP %1 Max IPAP %2 PS %3-%4 (%5)").arg(settings_min(CPAP_EPAPLo),0,'f',1).arg(settings_max(CPAP_IPAPHi),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units);
|
||||
} else if (mode == MODE_ASV) {
|
||||
return QObject::tr("EPAP %1 PS %2-%3 (%6)").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units);
|
||||
return QObject::tr("EPAP %1 PS %2-%3 (%4)").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units);
|
||||
} else if (mode == MODE_ASV_VARIABLE_EPAP) {
|
||||
return QObject::tr("Min EPAP %1 Max IPAP %2 PS %3-%4 (%5)").
|
||||
arg(settings_min(CPAP_EPAPLo),0,'f',1).
|
||||
|
||||
@ -213,6 +213,9 @@ class Day
|
||||
//! \brief Closes all Events files for this Days Sessions
|
||||
void CloseEvents();
|
||||
|
||||
//! \brief Get the ChannelID to be used for reporting pressure
|
||||
ChannelID getPressureChannelID();
|
||||
|
||||
//! \brief Returns true if this Day contains loaded Event Data for this channel.
|
||||
bool channelExists(ChannelID id);
|
||||
|
||||
|
||||
@ -234,6 +234,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
|
||||
{ "400X150", 0, 6, "DreamStation CPAP Pro" },
|
||||
{ "500X110", 0, 6, "DreamStation Auto CPAP" },
|
||||
{ "500X150", 0, 6, "DreamStation Auto CPAP" },
|
||||
{ "500G110", 0, 6, "DreamStation Go Auto" },
|
||||
{ "502G150", 0, 6, "DreamStation Go Auto" },
|
||||
{ "600X110", 0, 6, "DreamStation BiPAP Pro" },
|
||||
{ "700X110", 0, 6, "DreamStation Auto BiPAP" },
|
||||
@ -2552,7 +2553,10 @@ bool PRS1DataChunk::ParseEventsF3V6(void)
|
||||
duration = data[pos];
|
||||
this->AddEvent(new PRS1HypopneaEvent(t - duration, 0));
|
||||
break;
|
||||
// case 0x0c?
|
||||
case 0x0c: // Apnea Alarm
|
||||
// no additional data
|
||||
// TODO: add a PRS1Event for this
|
||||
break;
|
||||
// case 0x0d?
|
||||
// case 0x0e?
|
||||
// case 0x0f?
|
||||
@ -4035,7 +4039,7 @@ bool PRS1DataChunk::ParseSummaryF3V6(void)
|
||||
}
|
||||
const unsigned char * data = (unsigned char *)this->m_data.constData();
|
||||
int chunk_size = this->m_data.size();
|
||||
static const int minimum_sizes[] = { 1, 0x2e, 9, 7, 4, 2, 1, 2, 2, 1, 0x18, 2, 4 }; // F5V3 = { 1, 0x38, 4, 2, 4, 0x1e, 2, 4, 9 };
|
||||
static const int minimum_sizes[] = { 1, 0x2b, 9, 7, 4, 2, 1, 2, 2, 1, 0x18, 2, 4 }; // F5V3 = { 1, 0x38, 4, 2, 4, 0x1e, 2, 4, 9 };
|
||||
static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
|
||||
// NOTE: The sizes contained in hblock can vary, even within a single machine, as can the length of hblock itself!
|
||||
|
||||
@ -4083,9 +4087,10 @@ bool PRS1DataChunk::ParseSummaryF3V6(void)
|
||||
ok = this->ParseSettingsF3V6(data + pos, size);
|
||||
break;
|
||||
case 2: // seems equivalent to F5V3 #9, comes right after settings, 9 bytes, identical values
|
||||
// TODO: This may be structurally similar to settings: a list of (code, length, value).
|
||||
CHECK_VALUE(data[pos], 0);
|
||||
CHECK_VALUE(data[pos+1], 1);
|
||||
CHECK_VALUE(data[pos+2], 0);
|
||||
//CHECK_VALUE(data[pos+2], 0); // Apnea Alarm (0=off, 1=10, 2=20)
|
||||
CHECK_VALUE(data[pos+3], 1);
|
||||
CHECK_VALUE(data[pos+4], 1);
|
||||
CHECK_VALUE(data[pos+5], 0);
|
||||
@ -4141,7 +4146,7 @@ bool PRS1DataChunk::ParseSummaryF3V6(void)
|
||||
this->AddEvent(new PRS1ParsedSliceEvent(tt, EquipmentOff));
|
||||
//CHECK_VALUES(data[pos+2], 1, 4); // bitmask, have seen 1, 4, 6, 0x41
|
||||
//CHECK_VALUE(data[pos+3], 0x17); // 0x16, etc.
|
||||
CHECK_VALUES(data[pos+4], 0, 1);
|
||||
//CHECK_VALUES(data[pos+4], 0, 1); // or 2
|
||||
//CHECK_VALUE(data[pos+5], 0x15); // 0x16, etc.
|
||||
//CHECK_VALUES(data[pos+6], 0, 1); // or 2
|
||||
break;
|
||||
@ -4272,7 +4277,7 @@ bool PRS1DataChunk::ParseSettingsF3V6(const unsigned char* data, int size)
|
||||
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, data[pos]));
|
||||
}
|
||||
break;
|
||||
case 0x2d: // Ramp Pressure (with ASV/ventilator pressure encoding)
|
||||
case 0x2d: // Ramp Pressure (with ASV/ventilator pressure encoding), only present when ramp is on
|
||||
this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, data[pos], GAIN));
|
||||
break;
|
||||
case 0x2e: // Bi-Flex level or Rise Time
|
||||
@ -4281,7 +4286,11 @@ bool PRS1DataChunk::ParseSettingsF3V6(const unsigned char* data, int size)
|
||||
// and to Bi-Flex Setting (level) on mode 1.
|
||||
break;
|
||||
case 0x2f: // Rise Time lock? (was flex lock on F0V6, 0x80 for locked)
|
||||
CHECK_VALUE(data[pos], 0);
|
||||
if (cpapmode == PRS1_MODE_S) {
|
||||
CHECK_VALUES(data[pos], 0, 0x80); // Bi-Flex Lock
|
||||
} else {
|
||||
CHECK_VALUE(data[pos], 0); // Rise Time Lock? not yet observed on F3V6
|
||||
}
|
||||
break;
|
||||
case 0x35: // Humidifier setting
|
||||
this->ParseHumidifierSettingV3(data[pos], data[pos+1], true);
|
||||
@ -4653,8 +4662,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
|
||||
if (data[pos] != 0 && data[pos] != 3) {
|
||||
CHECK_VALUES(data[pos], 1, 2); // 1 when EZ-Start is enabled? 2 when Auto-Trial? 3 when Auto-Trial is off or Opti-Start isn't off?
|
||||
}
|
||||
if (len == 2) { // 400G has extra byte
|
||||
CHECK_VALUE(data[pos+1], 0);
|
||||
if (len == 2) { // 400G, 500G has extra byte
|
||||
CHECK_VALUES(data[pos+1], 0, 0x20); // Maybe related to Opti-Start?
|
||||
}
|
||||
break;
|
||||
case 0x0a: // CPAP pressure setting
|
||||
@ -4736,8 +4745,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
|
||||
case 0x35: // Humidifier setting
|
||||
this->ParseHumidifierSettingV3(data[pos], data[pos+1], true);
|
||||
break;
|
||||
case 0x36:
|
||||
CHECK_VALUE(data[pos], 0);
|
||||
case 0x36: // Mask Resistance Lock
|
||||
CHECK_VALUES(data[pos], 0, 0x80);
|
||||
break;
|
||||
case 0x38: // Mask Resistance
|
||||
if (data[pos] != 0) { // 0 == mask resistance off
|
||||
@ -4889,7 +4898,7 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
|
||||
CHECK_VALUE(data[pos+0x1c], 0x00);
|
||||
//CHECK_VALUES(data[pos+0x1d], 0x0c, 0x0d);
|
||||
//CHECK_VALUES(data[pos+0x1e], 0x31, 0x3b);
|
||||
// TODO: 400G has 8 more bytes?
|
||||
// TODO: 400G and 500G has 8 more bytes?
|
||||
// TODO: 400G sometimes has another 4 on top of that?
|
||||
}
|
||||
break;
|
||||
@ -4914,13 +4923,13 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
|
||||
this->ParseHumidifierSettingV3(data[pos+2], data[pos+3]);
|
||||
break;
|
||||
case 0x0e:
|
||||
// only seen once on 400G?
|
||||
CHECK_VALUE(data[pos], 0);
|
||||
// only seen once on 400G, many times on 500G
|
||||
CHECK_VALUES(data[pos], 0, 6);
|
||||
CHECK_VALUE(data[pos+1], 0);
|
||||
CHECK_VALUE(data[pos+2], 7);
|
||||
CHECK_VALUE(data[pos+3], 7);
|
||||
CHECK_VALUE(data[pos+4], 7);
|
||||
CHECK_VALUE(data[pos+5], 0);
|
||||
//CHECK_VALUES(data[pos+2], 7, 9);
|
||||
//CHECK_VALUES(data[pos+3], 7, 15);
|
||||
//CHECK_VALUES(data[pos+4], 7, 12);
|
||||
//CHECK_VALUES(data[pos+5], 0, 3);
|
||||
break;
|
||||
case 0x05:
|
||||
// AutoCPAP-related? First appeared on 500X, follows 4, before 8, look like pressure values
|
||||
@ -6177,7 +6186,11 @@ bool PRS1DataChunk::ReadHeader(QFile & f)
|
||||
this->m_filepos = f.pos();
|
||||
this->m_header = f.read(15);
|
||||
if (this->m_header.size() != 15) {
|
||||
qWarning() << this->m_path << "file too short?";
|
||||
if (this->m_header.size() == 0) {
|
||||
qWarning() << this->m_path << "empty, skipping";
|
||||
} else {
|
||||
qWarning() << this->m_path << "file too short?";
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@ -1078,7 +1078,14 @@ int ResmedLoader::scanFiles(Machine * mach, const QString & datalog_path, QDate
|
||||
}
|
||||
|
||||
// Forget about it if it can't be read.
|
||||
if (!fi.isReadable())
|
||||
if (!fi.isReadable()) {
|
||||
qWarning() << fi.fileName() << "is unreadable and has been ignored";
|
||||
continue;
|
||||
}
|
||||
|
||||
// Skip empty files
|
||||
if (fi.size() == 0) {
|
||||
qWarning() << fi.fileName() << "is empty and has been ignored";
|
||||
continue;
|
||||
|
||||
filename = fi.fileName();
|
||||
|
||||
@ -286,7 +286,16 @@ bool Machine::AddSession(Session *s)
|
||||
return false;
|
||||
}
|
||||
if (sessionlist.contains(s->session())) {
|
||||
qCritical() << "Machine::AddSession called with duplicate session" << s->session() << "for machine" << serial();
|
||||
qCritical() << "Machine::AddSession called with duplicate session" << s->session()
|
||||
<< "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]"
|
||||
<< "for machine" << serial();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (s->first() == 0) {
|
||||
qWarning() << "Machine::AddSession called with session" << s->session()
|
||||
<< "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]"
|
||||
<< "with first=0";
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -298,7 +307,6 @@ bool Machine::AddSession(Session *s)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
updateChannels(s);
|
||||
|
||||
if (s->session() > highest_sessionid) {
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#include <QDebug>
|
||||
|
||||
using namespace std;
|
||||
|
||||
// Do not change these without considering the consequences.. For one the Loader needs changing & version increase
|
||||
@ -52,7 +53,7 @@ enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_PERC, ST_90P, ST_MIN, ST_
|
||||
enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURNAL, MT_POSITION, MT_UNCATEGORIZED = 99};
|
||||
//void InitMapsWithoutAwesomeInitializerLists();
|
||||
|
||||
/***** NEVER USED ---
|
||||
/***** NEVER USED --- 8/2019
|
||||
// PAP Device Capabilities
|
||||
const quint32 CAP_Fixed = 0x0000001; // Constant PAP
|
||||
const quint32 CAP_Variable = 0x0000002; // Variable Base (EPAP) pressure
|
||||
|
||||
@ -15,15 +15,6 @@
|
||||
#include <QString>
|
||||
#include "machine_common.h"
|
||||
|
||||
namespace GraphFlags {
|
||||
const quint32 Shadow = 1;
|
||||
const quint32 Foobar = 2;
|
||||
const quint32 XTicker = 4;
|
||||
const quint32 YTicker = 8;
|
||||
const quint32 XGrid = 16;
|
||||
const quint32 YGrid = 32;
|
||||
}
|
||||
|
||||
enum ChannelCalcType {
|
||||
Calc_Zero, Calc_Min, Calc_Middle, Calc_Perc, Calc_Max, Calc_UpperThresh, Calc_LowerThresh
|
||||
};
|
||||
@ -57,6 +48,16 @@ enum Function {
|
||||
NONE = 0, AVG, WAVG, MIN, MAX, SUM, CNT, P90, CPH, SPH, HOURS, SET
|
||||
};
|
||||
|
||||
///
|
||||
/// \brief The ChanType enum defines the type of data channel. Bit flags so multiple settings are possible.
|
||||
/// DATA: A single number such as Height, ZombieMeter.
|
||||
/// SETTING: Machine setting, such as EPR, temperature, Ramp enabled.
|
||||
/// FLAG: Event flags reported by CPAP machine. Each flag has its own channel.
|
||||
/// MINOR_FLAG: More event flags such as PressurePulse and TimedBreath.
|
||||
/// SPAN: A flag that has a timespan associated with it (CSR, LeakSpan, Ramp, ...).
|
||||
/// WAVEFORM: A waveform such as flow rate.
|
||||
/// UNKNOWN: Some PRS1 flags, but not sure what they are for. Considered to be minor flags.
|
||||
///
|
||||
enum ChanType {
|
||||
DATA = 1,
|
||||
SETTING = 2,
|
||||
@ -91,26 +92,57 @@ class Channel
|
||||
void addColor(Function f, QColor color) { m_colors[f] = color; }
|
||||
void addOption(int i, QString option) { m_options[i] = option; }
|
||||
|
||||
//! \brief Unique identifier of channel. Value set when channel is created. See schema.cpp and loader modules.
|
||||
inline ChannelID id() const { return m_id; }
|
||||
|
||||
//! \brief Type of channel, such as WAVEFORM, FLAG, etc. See ChanType enum.
|
||||
inline ChanType type() const { return m_type; }
|
||||
|
||||
//! \brief Data format such as integer vs RTF, called Field Type in channel initializers in schema.cpp
|
||||
inline DataType datatype() const { return m_datatype; }
|
||||
|
||||
//! \brief Type of machine (CPAP, Oximeter, Journal, etc.) as defined in machine_common.h. Set in channel initializers in schema.cpp
|
||||
inline MachineType machtype() const { return m_machtype; }
|
||||
|
||||
//! \brief Unique string identifier for this channel. Must not be translated. Later used as a unique key to identify graph derived from this channel.
|
||||
const QString &code() { return m_code; }
|
||||
|
||||
//! \brief Full name of channel. Translatable. Used generally for channel names such as rows on Statistics page.
|
||||
const QString &fullname() { return m_fullname; }
|
||||
|
||||
//! \brief Short description of what this channel does. Translatable. Used in tooltips for graphs to explain what the graph shows.
|
||||
const QString &description() { return m_description; }
|
||||
|
||||
//! \brief Short-form label to indicate this channel on screen. Translatable. Used for vertical labels in graphs.
|
||||
//! Can be changed in Preferences dialog.
|
||||
const QString &label() { return m_label; }
|
||||
|
||||
//! \brief Units, such as cmH2O, events per hour, etc. See STR_UNIT_* for possible values.
|
||||
const QString &units() { return m_unit; }
|
||||
|
||||
//! \brief Seems to be some kind of sort order for event flags. Not sure this is used.
|
||||
inline short order() const { return m_order; }
|
||||
|
||||
//! \brief Whether or not chart of this channel is to be shown on Overview page
|
||||
//! Initial settings of this flag for individual channels set in schema.cpp.
|
||||
//! May be changed by user in Preferences Dialog.
|
||||
bool showInOverview() { return m_showInOverview; }
|
||||
|
||||
//! \brief Upper threshold for channel, apparently used in Statistics.cpp for calculation purposes. Not sure if it is used elsewhere.
|
||||
inline EventDataType upperThreshold() const { return m_upperThreshold; }
|
||||
|
||||
//! \brief Lower threshold for channel, apparently used in Statistics.cpp for calculation purposes. Not sure if it is used elsewhere.
|
||||
inline EventDataType lowerThreshold() const { return m_lowerThreshold; }
|
||||
|
||||
//! \brief Does not appear to be used?
|
||||
inline QColor upperThresholdColor() const { return m_upperThresholdColor; }
|
||||
|
||||
//! \brief Does not appear to be used?
|
||||
inline QColor lowerThresholdColor() const { return m_lowerThresholdColor; }
|
||||
|
||||
inline ChannelID linkid() const { return m_link; }
|
||||
|
||||
//! \brief Links channels. Links to better versions of this data type.
|
||||
inline ChannelID linkid() const { return m_link; }
|
||||
|
||||
void setFullname(QString fullname) { m_fullname = fullname; }
|
||||
void setLabel(QString label) { m_label = label; }
|
||||
@ -125,6 +157,7 @@ class Channel
|
||||
|
||||
void setShowInOverview(bool b) { m_showInOverview = b; }
|
||||
|
||||
//! \brief Retrieves options that may have been set for the channel. Used for CPAP Mode, EPR level.
|
||||
QString option(int i) {
|
||||
if (m_options.contains(i)) {
|
||||
return m_options[i];
|
||||
@ -132,6 +165,8 @@ class Channel
|
||||
|
||||
return QString();
|
||||
}
|
||||
|
||||
//! \brief Default color for plotting this channel
|
||||
inline QColor defaultColor() const { return m_defaultcolor; }
|
||||
inline void setDefaultColor(QColor color) { m_defaultcolor = color; }
|
||||
QHash<int, QString> m_options;
|
||||
@ -142,11 +177,11 @@ class Channel
|
||||
inline bool enabled() const { return m_enabled; }
|
||||
void setEnabled(bool value) { m_enabled = value; }
|
||||
|
||||
//! \brief Types of calculations that can be plotted on this channel and color to be used for plotting
|
||||
QHash<ChannelCalcType, ChannelCalc> calc;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
int m_id;
|
||||
|
||||
ChanType m_type;
|
||||
@ -226,102 +261,11 @@ class ChannelList
|
||||
QHash<QString, QHash<QString, Channel *> > groups;
|
||||
QString m_doctype;
|
||||
};
|
||||
|
||||
extern ChannelList channel;
|
||||
|
||||
/*enum LayerType {
|
||||
UnspecifiedLayer, Waveform, Flag, Overlay, Group
|
||||
};
|
||||
|
||||
|
||||
// ?????
|
||||
class Layer
|
||||
{
|
||||
public:
|
||||
Layer(ChannelID code, QColor colour, QString label=QString());
|
||||
virtual ~Layer();
|
||||
Layer *addLayer(Layer *layer);// { m_layers.push_back(layer); return layer; }
|
||||
void setMin(EventDataType min) { m_min=min; m_hasmin=true; }
|
||||
void setMax(EventDataType max) { m_max=max; m_hasmax=true; }
|
||||
EventDataType Min() { return m_min; }
|
||||
EventDataType Max() { return m_max; }
|
||||
bool visible() { return m_visible; }
|
||||
void setVisible(bool b) { m_visible=b; }
|
||||
protected:
|
||||
LayerType m_type;
|
||||
ChannelID m_code;
|
||||
QColor m_colour;
|
||||
QString m_label;
|
||||
EventDataType m_min;
|
||||
EventDataType m_max;
|
||||
bool m_hasmin;
|
||||
bool m_hasmax;
|
||||
bool m_visible;
|
||||
QVector<Layer *> m_layers;
|
||||
};
|
||||
|
||||
class WaveformLayer: public Layer
|
||||
{
|
||||
public:
|
||||
WaveformLayer(ChannelID code, QColor colour, float min=0, float max=0);
|
||||
virtual ~WaveformLayer();
|
||||
};
|
||||
|
||||
enum FlagVisual { Bar, Span, Dot };
|
||||
class OverlayLayer: public Layer
|
||||
{
|
||||
public:
|
||||
OverlayLayer(ChannelID code, QColor colour, FlagVisual visual=Bar);
|
||||
virtual ~OverlayLayer();
|
||||
protected:
|
||||
FlagVisual m_visual;
|
||||
};
|
||||
class GroupLayer: public Layer // Effectively an empty Layer container
|
||||
{
|
||||
public:
|
||||
GroupLayer();
|
||||
virtual ~GroupLayer();
|
||||
};
|
||||
class FlagGroupLayer: public GroupLayer
|
||||
{
|
||||
public:
|
||||
FlagGroupLayer();
|
||||
virtual ~FlagGroupLayer();
|
||||
};
|
||||
class FlagLayer: public Layer
|
||||
{
|
||||
public:
|
||||
FlagLayer(ChannelID code, QColor colour, FlagVisual visual=Bar);
|
||||
virtual ~FlagLayer();
|
||||
protected:
|
||||
FlagVisual m_visual;
|
||||
};
|
||||
class Graph
|
||||
{
|
||||
public:
|
||||
Graph(QString name,quint32 flags=GraphFlags::XTicker | GraphFlags::YTicker | GraphFlags::XGrid);
|
||||
Layer *addLayer(Layer *layer) { m_layers.push_back(layer); return layer; }
|
||||
int height() { if (m_visible) return m_height; else return 0;}
|
||||
void setHeight(int h) { m_height=h; }
|
||||
bool visible() { return m_visible; }
|
||||
void setVisible(bool b) { m_visible=b; }
|
||||
protected:
|
||||
QString m_name;
|
||||
int m_height;
|
||||
QVector<Layer *> m_layers;
|
||||
bool m_visible;
|
||||
};
|
||||
class GraphGroup
|
||||
{
|
||||
public:
|
||||
GraphGroup(QString name);
|
||||
GraphGroup();
|
||||
Graph *addGraph(Graph *graph) { m_graphs.push_back(graph); return graph; }
|
||||
protected:
|
||||
QVector<Graph *>m_graphs;
|
||||
}; */
|
||||
|
||||
void init();
|
||||
|
||||
} // namespace
|
||||
} // namespace schema
|
||||
|
||||
#endif // SCHEMA_H
|
||||
|
||||
@ -64,6 +64,13 @@ inline QString channelInfo(ChannelID code) {
|
||||
// + (schema::channel[code].units() != "0" ? "\n("+schema::channel[code].units()+")" : "");
|
||||
}
|
||||
|
||||
// Charts displayed on the Daily page are defined in the Daily::Daily constructor. They consist of some hard-coded charts and a table
|
||||
// of channel codes for which charts are generated. If the list of channel codes is changed, the graph order lists below will need to
|
||||
// be changed correspondingly.
|
||||
//
|
||||
// Note that "graph codes" are strings used to identify graphs and are not the same as "channel codes." The mapping between channel codes
|
||||
// and graph codes is found in schema.cpp. (What we here call 'graph cdoes' are called 'lookup codes' in schema.cpp.)
|
||||
//
|
||||
//
|
||||
// List here the graph codes in the order they are to be displayed.
|
||||
// Do NOT list a code twice, or Oscar will crash when the profile is closed!
|
||||
@ -1714,9 +1721,11 @@ void Daily::Load(QDate date)
|
||||
|
||||
htmlLeftFooter ="</body></html>";
|
||||
|
||||
// SessionBar colors. Colors alternate.
|
||||
QColor cols[]={
|
||||
COLOR_Gold,
|
||||
QColor("light blue"),
|
||||
// QColor("light blue"),
|
||||
QColor("skyblue"),
|
||||
};
|
||||
const int maxcolors=sizeof(cols)/sizeof(QColor);
|
||||
QList<Session *>::iterator i;
|
||||
|
||||
@ -10,8 +10,10 @@ Which was written and copyright 2011-2018 © Mark Watkins
|
||||
<b>Changes and fixes in OSCAR <u>**AFTER**</u> v1.1.0-testing-4</b>
|
||||
<ul>
|
||||
<li>Portions of OSCAR are © 2019 by The OSCAR Team</li>
|
||||
<li>[new] Default graphs and View/reset graphs use a different order for advanced CPAP modes</li>
|
||||
<li>[new] Default and View/reset graphs use a different order for AVS and AVAPS CPAP modes</li>
|
||||
<li>[new] Add preference setting to include serial number on machine settings list</li>
|
||||
<li>[fix] Place date, time, and Oscar version information in report footers</li>
|
||||
<li>[fix] Update identification of ResMed S9 machines on Welcome page</li>
|
||||
<li>[fix] Correct formatting of event number in Daily Events tab</li>
|
||||
<li>[fix] Correct timezone offset for somnopose imports</li>
|
||||
<li>[fix] Show a progress bar when setting Overview range to a large number of days</li>
|
||||
|
||||
@ -556,7 +556,10 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
|
||||
}
|
||||
|
||||
if (first) {
|
||||
QString footer = QObject::tr("OSCAR v%1").arg(VersionString);
|
||||
QDateTime timestamp = QDateTime::currentDateTime();
|
||||
QString footer = QObject::tr("%1 OSCAR v%2").arg(timestamp.toString(MedDateFormat+" hh:mm"))
|
||||
.arg(ReleaseStatus == "r" ? ShortVersionString : VersionString+" (" + gitRevision() + ")");
|
||||
|
||||
|
||||
QRectF bounds = painter.boundingRect(QRectF(0, virt_height, virt_width, normal_height), footer,
|
||||
QTextOption(Qt::AlignHCenter));
|
||||
|
||||
@ -706,8 +706,11 @@ QString Statistics::generateFooter(bool showinfo)
|
||||
|
||||
if (showinfo) {
|
||||
html += "<hr><div align=center><font size='-1'><i>";
|
||||
html += tr("This report was generated by OSCAR v%1").arg(ShortVersionString) + "<br/>"
|
||||
+tr("OSCAR is free open-source CPAP report software");
|
||||
QDateTime timestamp = QDateTime::currentDateTime();
|
||||
html += tr("This report was prepared on %1 by OSCAR v%2").arg(timestamp.toString(MedDateFormat + " hh:mm"))
|
||||
.arg(ReleaseStatus == "r" ? ShortVersionString : VersionString + " (" + gitRevision() + ")")
|
||||
+ "<br/>"
|
||||
+ tr("OSCAR is free open-source CPAP report software");
|
||||
html += "</i></font></div>";
|
||||
}
|
||||
|
||||
@ -855,15 +858,25 @@ const QString heading_color="#ffffff";
|
||||
const QString subheading_color="#e0e0e0";
|
||||
//const int rxthresh = 5;
|
||||
|
||||
// Sort machines by first day of use
|
||||
bool machineCompareFirstDay(Machine* left, Machine *right) {
|
||||
return left->FirstDay() > right->FirstDay();
|
||||
}
|
||||
|
||||
|
||||
QString Statistics::GenerateMachineList()
|
||||
{
|
||||
QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
|
||||
QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER);
|
||||
QList<Machine *> mach;
|
||||
|
||||
std::sort(cpap_machines.begin(), cpap_machines.end(), machineCompareFirstDay);
|
||||
std::sort(oximeters.begin(), oximeters.end(), machineCompareFirstDay);
|
||||
|
||||
mach.append(cpap_machines);
|
||||
mach.append(oximeters);
|
||||
|
||||
|
||||
QString html;
|
||||
if (mach.size() > 0) {
|
||||
html += "<div align=center><br/>";
|
||||
|
||||
@ -44,11 +44,11 @@ void Welcome::refreshPage()
|
||||
|
||||
bool noMachines = mlist.isEmpty() && posmachines.isEmpty() && oximachines.isEmpty() && stgmachines.isEmpty();
|
||||
|
||||
bool showCardWarning = !noMachines;
|
||||
bool showCardWarning = noMachines;
|
||||
|
||||
// The SDCard warning does not need to be seen anymore for people who DON'T use ResMed S9's.. show first import and only when S9 is present
|
||||
for (auto & mach :mlist) {
|
||||
if (mach->series().compare("S9") == 0) showCardWarning = true;
|
||||
if (mach->brand().contains(STR_MACH_ResMed) && mach->series().contains("S9")) showCardWarning = true;
|
||||
}
|
||||
|
||||
ui->S9Warning->setVisible(showCardWarning);
|
||||
@ -227,34 +227,35 @@ QString Welcome::GenerateCPAPHTML()
|
||||
html += "<br/>";
|
||||
|
||||
CPAPMode cpapmode = (CPAPMode)(int)day->settings_max(CPAP_Mode);
|
||||
ChannelID pressChanID = day->getPressureChannelID(); // Get channel id for pressure that we should report
|
||||
double perc= p_profile->general->prefCalcPercentile();
|
||||
|
||||
if (cpapmode == MODE_CPAP) {
|
||||
EventDataType pressure = day->settings_max(CPAP_Pressure);
|
||||
html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[CPAP_Pressure].units());
|
||||
EventDataType pressure = day->settings_max(pressChanID);
|
||||
html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[pressChanID].units());
|
||||
} else if (cpapmode == MODE_APAP) {
|
||||
EventDataType pressure = day->percentile(CPAP_Pressure, perc/100.0);
|
||||
html += tr("Your pressure was under %1 %2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_Pressure].units()).arg(perc);
|
||||
EventDataType pressure = day->percentile(pressChanID, perc/100.0);
|
||||
html += tr("Your pressure was under %1 %2 for %3% of the time.").arg(pressure).arg(schema::channel[pressChanID].units()).arg(perc);
|
||||
} else if (cpapmode == MODE_BILEVEL_FIXED) {
|
||||
EventDataType ipap = day->settings_max(CPAP_IPAP);
|
||||
EventDataType ipap = day->settings_max(pressChanID);
|
||||
EventDataType epap = day->settings_min(CPAP_EPAP);
|
||||
html += tr("Your machine used a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units());
|
||||
html += tr("Your machine used a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units());
|
||||
} else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) {
|
||||
EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0);
|
||||
EventDataType ipap = day->percentile(pressChanID, perc/100.0);
|
||||
EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0);
|
||||
html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units()).arg(perc);
|
||||
html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc);
|
||||
} else if (cpapmode == MODE_ASV){
|
||||
EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0);
|
||||
EventDataType ipap = day->percentile(pressChanID, perc/100.0);
|
||||
EventDataType epap = qRound(day->settings_wavg(CPAP_EPAP));
|
||||
|
||||
html += tr("Your EPAP pressure fixed at %1 %2.").arg(epap).arg(schema::channel[CPAP_EPAP].units())+"<br/>";
|
||||
html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc);
|
||||
html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc);
|
||||
} else if (cpapmode == MODE_ASV_VARIABLE_EPAP){
|
||||
EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0);
|
||||
EventDataType ipap = day->percentile(pressChanID, perc/100.0);
|
||||
EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0);
|
||||
|
||||
html += tr("Your EPAP pressure was under %1 %2 for %3% of the time.").arg(epap).arg(schema::channel[CPAP_EPAP].units()).arg(perc)+"<br/>";
|
||||
html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc);
|
||||
html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc);
|
||||
}
|
||||
html += "<br/>";
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user