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

Don't mangle the model name for ResMed machines.

Browse Source
This commit is contained in:
sawinglogz 2019-08-18 16:56:41 -04:00
parent ad09695531
commit 66d9340cbb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -629,6 +629,7 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
} }
MachineInfo info = newInfo(); MachineInfo info = newInfo();
// TODO: Refactor this into a separate function that can be used by PeekInfo and Open, see PRS1Loader::PeekProperties for an example.
// Parse # entries into idmap. // Parse # entries into idmap.
while (!f.atEnd()) { while (!f.atEnd()) {
QString line = f.readLine().trimmed(); QString line = f.readLine().trimmed();
@ -644,15 +645,16 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
value.replace("_"," "); value.replace("_"," ");
if (value.contains(STR_ResMed_S9)) { if (value.contains(STR_ResMed_S9)) {
value.replace(STR_ResMed_S9, ""); //value.replace(STR_ResMed_S9, "");
info.series = STR_ResMed_S9; info.series = STR_ResMed_S9;
} else if (value.contains(STR_ResMed_AirSense10)) { } else if (value.contains(STR_ResMed_AirSense10)) {
value.replace(STR_ResMed_AirSense10, ""); //value.replace(STR_ResMed_AirSense10, "");
info.series = STR_ResMed_AirSense10; info.series = STR_ResMed_AirSense10;
} else if (value.contains(STR_ResMed_AirCurve10)) { } else if (value.contains(STR_ResMed_AirCurve10)) {
value.replace(STR_ResMed_AirCurve10, ""); //value.replace(STR_ResMed_AirCurve10, "");
info.series = STR_ResMed_AirCurve10; info.series = STR_ResMed_AirCurve10;
} }
/*
value.replace("(",""); value.replace("(","");
value.replace(")",""); value.replace(")","");
if (value.contains("Adapt", Qt::CaseInsensitive)) { if (value.contains("Adapt", Qt::CaseInsensitive)) {
@ -660,6 +662,7 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
value.replace("Adapt", QObject::tr("VPAP Adapt")); value.replace("Adapt", QObject::tr("VPAP Adapt"));
} }
} }
*/
info.model = value.trimmed(); info.model = value.trimmed();
} else if (key == "PCD") { // Product Code } else if (key == "PCD") { // Product Code
info.modelnumber = value; info.modelnumber = value;
@ -1647,6 +1650,7 @@ int ResmedLoader::Open(const QString & dirpath)
emit updateMessage(QObject::tr("Parsing Identification File")); emit updateMessage(QObject::tr("Parsing Identification File"));
QApplication::processEvents(); QApplication::processEvents();
// TODO: Refactor this into a separate function that can be used by PeekInfo and Open, see PRS1Loader::PeekProperties for an example.
// Parse # entries into idmap. // Parse # entries into idmap.
while (!f.atEnd()) { while (!f.atEnd()) {
line = f.readLine().trimmed(); line = f.readLine().trimmed();
@ -1662,15 +1666,16 @@ int ResmedLoader::Open(const QString & dirpath)
} else if (key == "PNA") { // Product Name } else if (key == "PNA") { // Product Name
value.replace("_"," "); value.replace("_"," ");
if (value.contains(STR_ResMed_S9)) { if (value.contains(STR_ResMed_S9)) {
value.replace(STR_ResMed_S9, ""); //value.replace(STR_ResMed_S9, "");
info.series = STR_ResMed_S9; info.series = STR_ResMed_S9;
} else if (value.contains(STR_ResMed_AirSense10)) { } else if (value.contains(STR_ResMed_AirSense10)) {
value.replace(STR_ResMed_AirSense10, ""); //value.replace(STR_ResMed_AirSense10, "");
info.series = STR_ResMed_AirSense10; info.series = STR_ResMed_AirSense10;
} else if (value.contains(STR_ResMed_AirCurve10)) { } else if (value.contains(STR_ResMed_AirCurve10)) {
value.replace(STR_ResMed_AirCurve10, ""); //value.replace(STR_ResMed_AirCurve10, "");
info.series = STR_ResMed_AirCurve10; info.series = STR_ResMed_AirCurve10;
} }
/*
value.replace("(",""); value.replace("(","");
value.replace(")",""); value.replace(")","");
@ -1679,6 +1684,7 @@ int ResmedLoader::Open(const QString & dirpath)
value.replace("Adapt", QObject::tr("VPAP Adapt")); value.replace("Adapt", QObject::tr("VPAP Adapt"));
} }
} }
*/
info.model = value.trimmed(); info.model = value.trimmed();
continue; continue;