mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Update PRS1 series detection to use model name.
Also fix an issue with initializing the model names, since QObject::tr won't work at global initialization time. And series detection needs the untranslated names anyway.
This commit is contained in:
sawinglogz
parent
5a71e96ed6
commit
ea638cdbbb
@ -208,48 +208,48 @@ struct PRS1TestedModel
|
||||
QString model;
|
||||
int family;
|
||||
int familyVersion;
|
||||
QString name;
|
||||
const char* name;
|
||||
};
|
||||
|
||||
static const PRS1TestedModel s_PRS1TestedModels[] = {
|
||||
// This first set says "(Philips Respironics)" intead of "(System One)" on official reports.
|
||||
{ "251P", 0, 2, QObject::tr("REMstar Plus (System One)") }, // (brick)
|
||||
{ "450P", 0, 3, QObject::tr("REMstar Pro (System One)") },
|
||||
{ "451P", 0, 3, QObject::tr("REMstar Pro (System One)") },
|
||||
{ "550P", 0, 2, QObject::tr("REMstar Auto (System One)") },
|
||||
{ "550P", 0, 3, QObject::tr("REMstar Auto (System One)") },
|
||||
{ "551P", 0, 2, QObject::tr("REMstar Auto (System One)") },
|
||||
{ "750P", 0, 2, QObject::tr("BiPAP Auto (System One)") },
|
||||
{ "251P", 0, 2, "REMstar Plus (System One)" }, // (brick)
|
||||
{ "450P", 0, 3, "REMstar Pro (System One)" },
|
||||
{ "451P", 0, 3, "REMstar Pro (System One)" },
|
||||
{ "550P", 0, 2, "REMstar Auto (System One)" },
|
||||
{ "550P", 0, 3, "REMstar Auto (System One)" },
|
||||
{ "551P", 0, 2, "REMstar Auto (System One)" },
|
||||
{ "750P", 0, 2, "BiPAP Auto (System One)" },
|
||||
|
||||
{ "460P", 0, 4, QObject::tr("REMstar Pro (System One 60 Series)") },
|
||||
{ "461P", 0, 4, QObject::tr("REMstar Pro (System One 60 Series)") },
|
||||
{ "560P", 0, 4, QObject::tr("REMstar Auto (System One 60 Series)") },
|
||||
{ "560PBT", 0, 4, QObject::tr("REMstar Auto (System One 60 Series)") },
|
||||
{ "561P", 0, 4, QObject::tr("REMstar Auto (System One 60 Series)") },
|
||||
{ "660P", 0, 4, QObject::tr("BiPAP Pro (System One 60 Series)") },
|
||||
{ "760P", 0, 4, QObject::tr("BiPAP Auto (System One 60 Series)") },
|
||||
{ "460P", 0, 4, "REMstar Pro (System One 60 Series)" },
|
||||
{ "461P", 0, 4, "REMstar Pro (System One 60 Series)" },
|
||||
{ "560P", 0, 4, "REMstar Auto (System One 60 Series)" },
|
||||
{ "560PBT", 0, 4, "REMstar Auto (System One 60 Series)" },
|
||||
{ "561P", 0, 4, "REMstar Auto (System One 60 Series)" },
|
||||
{ "660P", 0, 4, "BiPAP Pro (System One 60 Series)" },
|
||||
{ "760P", 0, 4, "BiPAP Auto (System One 60 Series)" },
|
||||
|
||||
{ "200X110", 0, 6, QObject::tr("DreamStation CPAP") }, // (brick)
|
||||
{ "400G110", 0, 6, QObject::tr("DreamStation Go") },
|
||||
{ "400X110", 0, 6, QObject::tr("DreamStation CPAP Pro") },
|
||||
{ "400X150", 0, 6, QObject::tr("DreamStation CPAP Pro") },
|
||||
{ "500X110", 0, 6, QObject::tr("DreamStation Auto CPAP") },
|
||||
{ "500X150", 0, 6, QObject::tr("DreamStation Auto CPAP") },
|
||||
{ "502G150", 0, 6, QObject::tr("DreamStation Go Auto") },
|
||||
{ "600X110", 0, 6, QObject::tr("DreamStation BiPAP Pro") },
|
||||
{ "700X110", 0, 6, QObject::tr("DreamStation Auto BiPAP") },
|
||||
{ "200X110", 0, 6, "DreamStation CPAP" }, // (brick)
|
||||
{ "400G110", 0, 6, "DreamStation Go" },
|
||||
{ "400X110", 0, 6, "DreamStation CPAP Pro" },
|
||||
{ "400X150", 0, 6, "DreamStation CPAP Pro" },
|
||||
{ "500X110", 0, 6, "DreamStation Auto CPAP" },
|
||||
{ "500X150", 0, 6, "DreamStation Auto CPAP" },
|
||||
{ "502G150", 0, 6, "DreamStation Go Auto" },
|
||||
{ "600X110", 0, 6, "DreamStation BiPAP Pro" },
|
||||
{ "700X110", 0, 6, "DreamStation Auto BiPAP" },
|
||||
|
||||
{ "950P", 5, 0, QObject::tr("BiPAP AutoSV Advanced System One") },
|
||||
{ "960P", 5, 1, QObject::tr("BiPAP autoSV Advanced (System One 60 Series)") },
|
||||
{ "961P", 5, 1, QObject::tr("BiPAP autoSV Advanced (System One 60 Series)") },
|
||||
{ "960T", 5, 2, QObject::tr("BiPAP autoSV Advanced 30 (System One 60 Series)") }, // omits "(System One 60 Series)" on official reports
|
||||
{ "900X110", 5, 3, QObject::tr("DreamStation BiPAP autoSV") },
|
||||
{ "900X120", 5, 3, QObject::tr("DreamStation BiPAP autoSV") },
|
||||
{ "950P", 5, 0, "BiPAP AutoSV Advanced System One" },
|
||||
{ "960P", 5, 1, "BiPAP autoSV Advanced (System One 60 Series)" },
|
||||
{ "961P", 5, 1, "BiPAP autoSV Advanced (System One 60 Series)" },
|
||||
{ "960T", 5, 2, "BiPAP autoSV Advanced 30 (System One 60 Series)" }, // omits "(System One 60 Series)" on official reports
|
||||
{ "900X110", 5, 3, "DreamStation BiPAP autoSV" },
|
||||
{ "900X120", 5, 3, "DreamStation BiPAP autoSV" },
|
||||
|
||||
{ "1061T", 3, 3, QObject::tr("BiPAP S/T 30 (System One 60 Series)") },
|
||||
{ "1160P", 3, 3, QObject::tr("BiPAP AVAPS 30 (System One 60 Series)") },
|
||||
{ "1030X110", 3, 6, QObject::tr("DreamStation BiPAP S/T 30") },
|
||||
{ "1130X110", 3, 6, QObject::tr("DreamStation BiPAP AVAPS 30") },
|
||||
{ "1061T", 3, 3, "BiPAP S/T 30 (System One 60 Series)" },
|
||||
{ "1160P", 3, 3, "BiPAP AVAPS 30 (System One 60 Series)" },
|
||||
{ "1030X110", 3, 6, "DreamStation BiPAP S/T 30" },
|
||||
{ "1130X110", 3, 6, "DreamStation BiPAP AVAPS 30" },
|
||||
|
||||
{ "", 0, 0, "" },
|
||||
};
|
||||
@ -331,32 +331,31 @@ bool PRS1ModelInfo::IsBrick(const QString & model) const
|
||||
return is_brick;
|
||||
};
|
||||
|
||||
QString PRS1ModelInfo::Name(const QString & model) const
|
||||
const char* PRS1ModelInfo::Name(const QString & model) const
|
||||
{
|
||||
QString name;
|
||||
const char* name;
|
||||
if (m_modelNames.contains(model)) {
|
||||
name = m_modelNames[model];
|
||||
} else {
|
||||
name = QString(QObject::tr("Unknown Model (%1)")).arg(model);
|
||||
name = "Unknown Model";
|
||||
}
|
||||
return name;
|
||||
};
|
||||
|
||||
QMap<const char*,const char*> s_PRS1Series = {
|
||||
{ "System One 60 Series", ":/icons/prs1_60s.png" }, // needs to come before following substring
|
||||
{ "System One", ":/icons/prs1.png" },
|
||||
{ "DreamStation", ":/icons/dreamstation.png" },
|
||||
};
|
||||
|
||||
PRS1Loader::PRS1Loader()
|
||||
{
|
||||
#ifndef UNITTEST_MODE // no QPixmap without a QGuiApplication
|
||||
const QString PRS1_ICON = ":/icons/prs1.png";
|
||||
const QString PRS1_60_ICON = ":/icons/prs1_60s.png";
|
||||
const QString DREAMSTATION_ICON = ":/icons/dreamstation.png";
|
||||
|
||||
// QString s = newInfo().series;
|
||||
m_pixmap_paths["System One"] = PRS1_ICON;
|
||||
m_pixmaps["System One"] = QPixmap(PRS1_ICON);
|
||||
m_pixmap_paths["System One (60 Series)"] = PRS1_60_ICON;
|
||||
m_pixmaps["System One (60 Series)"] = QPixmap(PRS1_60_ICON);
|
||||
m_pixmap_paths["DreamStation"] = DREAMSTATION_ICON;
|
||||
m_pixmaps["DreamStation"] = QPixmap(DREAMSTATION_ICON);
|
||||
for (auto & series : s_PRS1Series.keys()) {
|
||||
QString path = s_PRS1Series[series];
|
||||
m_pixmap_paths[series] = path;
|
||||
m_pixmaps[series] = QPixmap(path);
|
||||
}
|
||||
#endif
|
||||
|
||||
m_type = MT_CPAP;
|
||||
@ -458,7 +457,6 @@ void parseModel(MachineInfo & info, const QString & modelnum)
|
||||
bool ok;
|
||||
int num = modelstr.toInt(&ok);
|
||||
|
||||
int series = ((num / 10) % 10);
|
||||
int type = (num / 100);
|
||||
|
||||
|
||||
@ -494,27 +492,20 @@ void parseModel(MachineInfo & info, const QString & modelnum)
|
||||
info.model = QObject::tr("Unknown Model");
|
||||
}
|
||||
|
||||
// TODO: Series is used to select which icon to use, so leave it for now.
|
||||
// TODO: The below isn't even complete, since the DreamStation logic is broken
|
||||
// and it gets set again elsewhere.
|
||||
// TODO: The series is redundant with the model name, but both generally get displayed.
|
||||
switch (series) {
|
||||
case 5:
|
||||
info.series = QObject::tr("System One");
|
||||
const char* name = s_PRS1ModelInfo.Name(modelnum);
|
||||
const char* series = nullptr;
|
||||
for (auto & s : s_PRS1Series.keys()) {
|
||||
if (QString(name).contains(s)) {
|
||||
series = s;
|
||||
break;
|
||||
case 6:
|
||||
info.series = QObject::tr("System One (60 Series)");
|
||||
break;
|
||||
case 7:
|
||||
// TODO: this is wrong.
|
||||
info.series = QObject::tr("DreamStation");
|
||||
break;
|
||||
default:
|
||||
info.series = QObject::tr("unknown");
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
if (series == nullptr) {
|
||||
qWarning() << "unknown series for" << name << modelnum;
|
||||
series = "unknown";
|
||||
}
|
||||
info.series = QObject::tr(series);
|
||||
}
|
||||
|
||||
bool PRS1Loader::PeekProperties(const QString & filename, QHash<QString,QString> & props)
|
||||
{
|
||||
@ -616,11 +607,6 @@ bool PRS1Loader::PeekProperties(MachineInfo & info, const QString & filename, Ma
|
||||
}
|
||||
}
|
||||
|
||||
if (dfv == 3) {
|
||||
info.series = QObject::tr("DreamStation");
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -403,7 +403,7 @@ class PRS1ModelInfo
|
||||
{
|
||||
protected:
|
||||
QHash<int, QHash<int, QStringList>> m_testedModels;
|
||||
QHash<QString,QString> m_modelNames;
|
||||
QHash<QString,const char*> m_modelNames;
|
||||
QSet<QString> m_bricks;
|
||||
|
||||
public:
|
||||
@ -413,7 +413,7 @@ public:
|
||||
bool IsTested(const QHash<QString,QString> & properties) const;
|
||||
bool IsTested(const QString & modelNumber, int family, int familyVersion) const;
|
||||
bool IsBrick(const QString & model) const;
|
||||
QString Name(const QString & model) const;
|
||||
const char* Name(const QString & model) const;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user