chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into translations

Browse Source
This commit is contained in:
ArieKlerk 2020-05-29 19:29:23 +02:00
commit f2dda2cfba
6 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Htmldocs/release_notes.html
View File

@ -16,6 +16,7 @@
<ul>
<li>BiPAP S/T (C Series) (1061401)</li>
<li>REMstar Pro (System One 60 Series) (461CA)</li>
<li>DreamStation CPAP Pro (400X130)</li>
<li>DreamStation BiPAP Pro (600X150)</li>
<li>DreamStation Auto BiPAP (700X120, 700X150)</li>
<li><i>Note: Ventilator alarms are not currently imported.</i></li>
@ -23,6 +24,7 @@
<li>[new] Add the "peak flow" channel reported by pre-DreamStation ventilators.</li>
<li>[new] Automatically detect and resolve graphics-related crashes on Windows.</li>
<li>[new] Support AVAPS in the Overview pressure chart.</li>
<li>[new] Added Italian and Turkish translations.</li>
<li>[fix] Fix missing bars in the Overview pressure chart for Philips Respironics devices.</li>
<li>[fix] Add missing Philips Respironics pressure channels to CSV export.</li>
<li>[fix] Fix zero Philips Respironics AHI in CSV session export.</li>

1
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -272,6 +272,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
{ "200X110", 0, 6, "DreamStation CPAP" }, // (brick)
{ "400G110", 0, 6, "DreamStation Go" },
{ "400X110", 0, 6, "DreamStation CPAP Pro" },
{ "400X130", 0, 6, "DreamStation CPAP Pro" },
{ "400X150", 0, 6, "DreamStation CPAP Pro" },
{ "500X110", 0, 6, "DreamStation Auto CPAP" },
{ "500X120", 0, 6, "DreamStation Auto CPAP" },

9
oscar/SleepLib/loader_plugins/weinmann_loader.cpp
View File

@ -1,6 +1,7 @@
/* SleepLib Weinmann SOMNOsoft/Balance Loader Implementation
/* SleepLib Weinmann SOMNOsoft/Balance Loader Implementation
*
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* Copyright (c) 2020 The OSCAR Team
*
* 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
@ -179,6 +180,12 @@ int WeinmannLoader::Open(const QString & dirpath)
int comp_end = index[FlowOffset];
int comp_size = comp_end - comp_start;
// TODO: This entire loader needs significant work. For now just
// hard-code values here to make sure we don't crash in the loop below.
if (comp_size < 5 * 0xd6) {
qWarning() << "Weinmann loader comp_size too short:" << comp_size;
return -1;
}
quint8 * comp = new quint8 [comp_size];
memset((char *)comp, 0, comp_size);

2
oscar/UpdaterWindow.cpp
View File

@ -155,7 +155,7 @@ void UpdaterWindow::updateFinished(QNetworkReply *reply)
if (reply->error() != QNetworkReply::NoError) {
qDebug() << "Update Check Error: "+reply->errorString();
disconnect(netmanager, SIGNAL(finished(QNetworkReply *)), this, SLOT(updateFinished(QNetworkReply *)));
mainwin->Notify(tr("OSCAR Updates are currently unvailable for this platform"),tr("OSCAR Updates"));
mainwin->Notify(tr("OSCAR Updates are currently unavailable for this platform"),tr("OSCAR Updates"));
} else {
QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();

2
oscar/VERSION
View File

@ -1,5 +1,5 @@
// 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.
#define VERSION "1.1.1-rc-3"
#define VERSION "1.1.1-rc-4"

3
oscar/translation.cpp
View File

@ -58,7 +58,8 @@ void initTranslations()
langNames["pt"] = "Português";
langNames["pt_BR"] = "Português (Brazil)";
langNames["ro"] = "Românește";
langNames["zh"] = "\xe6\xbc\xa2\xe8\xaa\x9e\xe7\xb9\x81\xe9\xab\x94\xe5\xad\x97";
langNames["tr"] = "Türkçe";
langNames["zh"] = "\xe6\xbc\xa2\xe8\xaa\x9e\xe7\xb9\x81\xe9\xab\x94\xe5\xad\x97";
langNames[DefaultLanguage]="English (US)";