PRS1 ProductID codes are hexadecimal. Plus added Oximetry preferences page stub

This commit is contained in:
Mark Watkins 2011-10-11 07:29:15 +10:00
parent 210c60b5f1
commit 367a4526eb
2 changed files with 88 additions and 5 deletions

View File

@ -185,7 +185,7 @@ bool PRS1Loader::ParseProperties(Machine *m,QString filename)
}
bool ok;
QString pt=prop["ProductType"];
int i=pt.toInt(&ok,0);
int i=pt.toInt(&ok,16);
if (ok) {
if (ModelMap.find(i)!=ModelMap.end()) {
m->properties["SubModel"]=ModelMap[i];
@ -1211,9 +1211,9 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename)
void InitModelMap()
{
ModelMap[34]="RemStar Pro with C-Flex+";
ModelMap[35]="RemStar Auto with A-Flex";
ModelMap[37]="RemStar BiPAP Auto with Bi-Flex";
ModelMap[0x34]="RemStar Pro with C-Flex+";
ModelMap[0x35]="RemStar Auto with A-Flex";
ModelMap[0x37]="RemStar BiPAP Auto with Bi-Flex";
ModelMap[0x41]="BiPAP autoSV Advanced";
};

View File

@ -29,7 +29,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>5</number>
</property>
<widget class="QWidget" name="visualTab">
<attribute name="title">
@ -808,6 +808,89 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</widget>
<widget class="QWidget" name="oximetryTab">
<attribute name="title">
<string>Oximetry</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QLabel" name="label_21">
<property name="text">
<string>Yet another work in progress...</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Use Oximetry</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_20">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Type</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QComboBox" name="comboBox">
<item>
<property name="text">
<string>Contec CMS50</string>
</property>
</item>
<item>
<property name="text">
<string>Overpriced ResMed S9 Oximeter</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Sync with CPAP where possible</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>434</width>
<height>101</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>