chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-series-names

Browse Source
This commit is contained in:
Phil Olynyk 2020-03-23 14:45:26 -04:00
commit 1f4e989297
6 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTING.md
View File

@ -24,13 +24,14 @@ Setting aside the religious wars that can arise over any development methodology
0. Create your own fork of the repo and configure it to stay up-to-date with the upstream repo. 0. Create your own fork of the repo and configure it to stay up-to-date with the upstream repo.
* Go to https://gitlab.com/pholy/OSCAR-code and click on **Fork** in the top right of the project page. * Go to https://gitlab.com/pholy/OSCAR-code and click on **Fork** in the top right of the project page.
* In your fork's sidebar, go to **Settings > Repository** then click on **Expand** for "Mirroring repositories". * In your fork's sidebar, go to **Settings > Repository** then click on **Expand** for "Mirroring repositories".
* Enter "https://gitlab.com/pholy/OSCAR-code" for the repository **URL**, make sure the mirror is set to **Pull** and then click **Mirror repository**. * Enter "https://gitlab.com/pholy/OSCAR-code.git" for the repository **URL**, make sure the mirror is set to **Pull** and then click **Mirror repository**.
1. Create a branch to work on your feature or bugfix: 1. Create a branch to work on your feature or bugfix:
git clone https://gitlab.com/my-repo/OSCAR-code.git git clone https://gitlab.com/my-repo/OSCAR-code.git
cd OSCAR-code cd OSCAR-code
git checkout -b my-branch git checkout -b my-branch
**Note:** Because OSCAR includes the branch name in its [version string](https://semver.org/spec/v2.0.0.html), **the branch name must contain only alphanumeric characters or "-"** ([0-9a-zA-Z-]).
2. Write your code, committing to your branch as you go, using `git add` and `git commit -a`. 2. Write your code, committing to your branch as you go, using `git add` and `git commit -a`.

11
oscar/SleepLib/loader_plugins/dreem_loader.cpp
View File

@ -23,6 +23,17 @@
static QSet<QString> s_unexpectedMessages; static QSet<QString> s_unexpectedMessages;
DreemLoader::DreemLoader()
{
m_type = MT_SLEEPSTAGE;
csv = nullptr;
}
DreemLoader::~DreemLoader()
{
closeCSV();
}
bool bool
DreemLoader::Detect(const QString & path) DreemLoader::Detect(const QString & path)
{ {

4
oscar/SleepLib/loader_plugins/dreem_loader.h
View File

@ -20,8 +20,8 @@ const int dreem_data_version = 2;
class DreemLoader : public MachineLoader class DreemLoader : public MachineLoader
{ {
public: public:
DreemLoader() { m_type = MT_SLEEPSTAGE; } DreemLoader();
virtual ~DreemLoader() { } virtual ~DreemLoader();
virtual bool Detect(const QString & path); virtual bool Detect(const QString & path);

2
oscar/SleepLib/loader_plugins/zeo_loader.cpp
View File

@ -23,6 +23,7 @@
ZEOLoader::ZEOLoader() ZEOLoader::ZEOLoader()
{ {
m_type = MT_SLEEPSTAGE; m_type = MT_SLEEPSTAGE;
csv = nullptr;
} }
ZEOLoader::~ZEOLoader() ZEOLoader::~ZEOLoader()
@ -85,6 +86,7 @@ int ZEOLoader::Open(const QString & dirpath)
int ZEOLoader::OpenFile(const QString & filename) int ZEOLoader::OpenFile(const QString & filename)
{ {
if (!openCSV(filename)) { if (!openCSV(filename)) {
closeCSV();
return -1; return -1;
} }
int count = 0; int count = 0;

2
oscar/VERSION
View File

@ -1,4 +1,4 @@
// Update the string below to set OSCAR's version and release status. // Update the string below to set OSCAR's version and release status.
// See https://semver.org/spec/v2.0.0.html for details on format. // See https://semver.org/spec/v2.0.0.html for details on format.
#define VERSION "1.1.0-beta-2" #define VERSION "1.1.0-beta-2.1"

2
oscar/update_gitinfo.bat
View File

@ -12,7 +12,7 @@ git rev-parse --git-dir >nul 2>&1
if errorlevel 1 goto GitFail if errorlevel 1 goto GitFail
for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
if "%GIT_BRANCH%"=="HEAD" set GIT_BRANCH="" if "%GIT_BRANCH%"=="HEAD" set GIT_BRANCH=
for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i
git diff-index --quiet HEAD -- git diff-index --quiet HEAD --