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

Fix for PRS1 model numbers that don't end in P

Browse Source
This commit is contained in:
Mark Watkins 2014-10-01 02:13:05 +10:00
parent 8bde451b89
commit a8b5d847f9
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -214,18 +214,24 @@ QString PRS1Loader::checkDir(const QString & path)
void parseModel(MachineInfo & info, QString modelnum) void parseModel(MachineInfo & info, QString modelnum)
{ {
info.modelnumber = modelnum; info.modelnumber = modelnum;
if (!modelnum.endsWith("P")) {
qDebug() << "Weird PRS1 Model number" << modelnum;
}
modelnum.chop(1);
int country = modelnum[modelnum.length() - 1].digitValue();
modelnum.chop(1);
int ser = modelnum[modelnum.length() - 1].digitValue();
modelnum.chop(1);
bool ok;
int typ = modelnum.toInt(&ok);
switch (typ) { QString modelstr;
for (int i=0; i<modelnum.size(); i++) {
QChar c = modelnum.at(i);
if (c.isDigit()) {
modelstr += c;
} else break;
}
bool ok;
int num = modelstr.toInt(&ok);
int series = ((num / 10) % 10);
int type = (num / 100);
int country = num % 10;
switch (type) {
case 4: // cpap case 4: // cpap
info.model = QObject::tr("RemStar Pro with C-Flex+"); info.model = QObject::tr("RemStar Pro with C-Flex+");
break; break;
@ -248,7 +254,7 @@ void parseModel(MachineInfo & info, QString modelnum)
info.model = QObject::tr("Unknown Model"); info.model = QObject::tr("Unknown Model");
} }
switch (ser) { switch (series) {
case 5: case 5:
info.series = QObject::tr("System One"); info.series = QObject::tr("System One");
break; break;
@ -493,10 +499,13 @@ int PRS1Loader::OpenMachine(QString path)
// Have a peek first to get the serial number. // Have a peek first to get the serial number.
PeekProperties(info, propertyfile); PeekProperties(info, propertyfile);
QString modelstr = info.modelnumber; QString modelstr;
for (int i=0; i<info.modelnumber.size(); i++) {
if (modelstr.endsWith("P")) QChar c = info.modelnumber.at(i);
modelstr.chop(1); if (c.isDigit()) {
modelstr += c;
} else break;
}
bool ok; bool ok;
int model = modelstr.toInt(&ok); int model = modelstr.toInt(&ok);