mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Remove unused ParseSummaryF* functions, move ParseSummary from PRS1Import to PRS1DataChunk.
This commit is contained in:
sawinglogz
parent
e47c4934ef
commit
685527b993
@ -3216,94 +3216,6 @@ bool PRS1DataChunk::ParseSummaryF0V23()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PRS1Import::ParseSummaryF0V4()
|
|
||||||
{
|
|
||||||
bool ok;
|
|
||||||
ok = summary->ParseSummaryF0V4();
|
|
||||||
|
|
||||||
for (int i=0; i < summary->m_parsedData.count(); i++) {
|
|
||||||
PRS1ParsedEvent* e = summary->m_parsedData.at(i);
|
|
||||||
if (e->m_type != EV_PRS1_SETTING) {
|
|
||||||
qWarning() << "Summary had non-setting event:" << (int) e->m_type;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
PRS1ParsedSettingEvent* s = (PRS1ParsedSettingEvent*) e;
|
|
||||||
switch (s->m_setting) {
|
|
||||||
case PRS1_SETTING_CPAP_MODE:
|
|
||||||
session->settings[CPAP_Mode] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE:
|
|
||||||
session->settings[CPAP_Pressure] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE_MIN:
|
|
||||||
session->settings[CPAP_PressureMin] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE_MAX:
|
|
||||||
session->settings[CPAP_PressureMax] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP:
|
|
||||||
session->settings[CPAP_EPAP] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP:
|
|
||||||
session->settings[CPAP_IPAP] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS:
|
|
||||||
session->settings[CPAP_PS] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MIN:
|
|
||||||
session->settings[CPAP_EPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MAX:
|
|
||||||
session->settings[CPAP_EPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MIN:
|
|
||||||
session->settings[CPAP_IPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MAX:
|
|
||||||
session->settings[CPAP_IPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MIN:
|
|
||||||
session->settings[CPAP_PSMin] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MAX:
|
|
||||||
session->settings[CPAP_PSMax] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_FLEX_MODE:
|
|
||||||
session->settings[PRS1_FlexMode] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_FLEX_LEVEL:
|
|
||||||
session->settings[PRS1_FlexLevel] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_RAMP_TIME:
|
|
||||||
session->settings[CPAP_RampTime] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_RAMP_PRESSURE:
|
|
||||||
session->settings[CPAP_RampPressure] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_HUMID_STATUS:
|
|
||||||
session->settings[PRS1_HumidStatus] = (bool) e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_HEATED_TUBING:
|
|
||||||
session->settings[PRS1_HeatedTubing] = (bool) e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_HUMID_LEVEL:
|
|
||||||
session->settings[PRS1_HumidLevel] = e->m_value;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
qWarning() << "Unknown PRS1 setting type" << (int) s->m_setting;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
summary_duration = summary->duration;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool PRS1DataChunk::ParseSummaryF0V4(void)
|
bool PRS1DataChunk::ParseSummaryF0V4(void)
|
||||||
{
|
{
|
||||||
const unsigned char * data = (unsigned char *)this->m_data.constData();
|
const unsigned char * data = (unsigned char *)this->m_data.constData();
|
||||||
@ -3366,73 +3278,6 @@ bool PRS1DataChunk::ParseSummaryF0V4(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PRS1Import::ParseSummaryF3()
|
|
||||||
{
|
|
||||||
bool ok;
|
|
||||||
ok = summary->ParseSummaryF3();
|
|
||||||
|
|
||||||
for (int i=0; i < summary->m_parsedData.count(); i++) {
|
|
||||||
PRS1ParsedEvent* e = summary->m_parsedData.at(i);
|
|
||||||
if (e->m_type != EV_PRS1_SETTING) {
|
|
||||||
qWarning() << "Summary had non-setting event:" << (int) e->m_type;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
PRS1ParsedSettingEvent* s = (PRS1ParsedSettingEvent*) e;
|
|
||||||
switch (s->m_setting) {
|
|
||||||
case PRS1_SETTING_CPAP_MODE:
|
|
||||||
session->settings[CPAP_Mode] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE:
|
|
||||||
session->settings[CPAP_Pressure] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE_MIN:
|
|
||||||
session->settings[CPAP_PressureMin] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE_MAX:
|
|
||||||
session->settings[CPAP_PressureMax] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP:
|
|
||||||
session->settings[CPAP_EPAP] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP:
|
|
||||||
session->settings[CPAP_IPAP] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS:
|
|
||||||
session->settings[CPAP_PS] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MIN:
|
|
||||||
session->settings[CPAP_EPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MAX:
|
|
||||||
session->settings[CPAP_EPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MIN:
|
|
||||||
session->settings[CPAP_IPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MAX:
|
|
||||||
session->settings[CPAP_IPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MIN:
|
|
||||||
session->settings[CPAP_PSMin] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MAX:
|
|
||||||
session->settings[CPAP_PSMax] = e->value();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
qWarning() << "Unknown PRS1 setting type" << (int) s->m_setting;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
summary_duration = summary->duration;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// TODO: This is probably only F3V6, as it uses mainblock, only present in fileVersion 3.
|
// TODO: This is probably only F3V6, as it uses mainblock, only present in fileVersion 3.
|
||||||
bool PRS1DataChunk::ParseSummaryF3(void)
|
bool PRS1DataChunk::ParseSummaryF3(void)
|
||||||
{
|
{
|
||||||
@ -3479,75 +3324,6 @@ bool PRS1DataChunk::ParseSummaryF3(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PRS1Import::ParseSummaryF5V012()
|
|
||||||
{
|
|
||||||
bool ok;
|
|
||||||
ok = summary->ParseSummaryF5V012();
|
|
||||||
|
|
||||||
for (int i=0; i < summary->m_parsedData.count(); i++) {
|
|
||||||
PRS1ParsedEvent* e = summary->m_parsedData.at(i);
|
|
||||||
if (e->m_type != EV_PRS1_SETTING) {
|
|
||||||
qWarning() << "Summary had non-setting event:" << (int) e->m_type;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
PRS1ParsedSettingEvent* s = (PRS1ParsedSettingEvent*) e;
|
|
||||||
switch (s->m_setting) {
|
|
||||||
case PRS1_SETTING_CPAP_MODE:
|
|
||||||
session->settings[CPAP_Mode] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MIN:
|
|
||||||
session->settings[CPAP_EPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MAX:
|
|
||||||
session->settings[CPAP_EPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MIN:
|
|
||||||
session->settings[CPAP_IPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MAX:
|
|
||||||
session->settings[CPAP_IPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MIN:
|
|
||||||
session->settings[CPAP_PSMin] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MAX:
|
|
||||||
session->settings[CPAP_PSMax] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_FLEX_MODE:
|
|
||||||
session->settings[PRS1_FlexMode] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_FLEX_LEVEL:
|
|
||||||
session->settings[PRS1_FlexLevel] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_RAMP_TIME:
|
|
||||||
session->settings[CPAP_RampTime] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_RAMP_PRESSURE:
|
|
||||||
session->settings[CPAP_RampPressure] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_HUMID_STATUS:
|
|
||||||
session->settings[PRS1_HumidStatus] = (bool) e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_HEATED_TUBING:
|
|
||||||
session->settings[PRS1_HeatedTubing] = (bool) e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_HUMID_LEVEL:
|
|
||||||
session->settings[PRS1_HumidLevel] = e->m_value;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
qWarning() << "Unknown PRS1 setting type" << (int) s->m_setting;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
summary_duration = summary->duration;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PRS1DataChunk::ParseSummaryF5V012(void)
|
bool PRS1DataChunk::ParseSummaryF5V012(void)
|
||||||
{
|
{
|
||||||
const unsigned char * data = (unsigned char *)this->m_data.constData();
|
const unsigned char * data = (unsigned char *)this->m_data.constData();
|
||||||
@ -3635,55 +3411,6 @@ void PRS1DataChunk::ParseHumidifierSetting(int humid, bool supportsHeatedTubing)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PRS1Import::ParseSummaryF5V3()
|
|
||||||
{
|
|
||||||
bool ok;
|
|
||||||
ok = summary->ParseSummaryF5V3();
|
|
||||||
|
|
||||||
for (int i=0; i < summary->m_parsedData.count(); i++) {
|
|
||||||
PRS1ParsedEvent* e = summary->m_parsedData.at(i);
|
|
||||||
if (e->m_type != EV_PRS1_SETTING) {
|
|
||||||
qWarning() << "Summary had non-setting event:" << (int) e->m_type;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
PRS1ParsedSettingEvent* s = (PRS1ParsedSettingEvent*) e;
|
|
||||||
switch (s->m_setting) {
|
|
||||||
case PRS1_SETTING_CPAP_MODE:
|
|
||||||
session->settings[CPAP_Mode] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MIN:
|
|
||||||
session->settings[CPAP_EPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MAX:
|
|
||||||
session->settings[CPAP_EPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MIN:
|
|
||||||
session->settings[CPAP_IPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MAX:
|
|
||||||
session->settings[CPAP_IPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MIN:
|
|
||||||
session->settings[CPAP_PSMin] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MAX:
|
|
||||||
session->settings[CPAP_PSMax] = e->value();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
qWarning() << "Unknown PRS1 setting type" << (int) s->m_setting;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
summary_duration = summary->duration;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool PRS1DataChunk::ParseSummaryF5V3(void)
|
bool PRS1DataChunk::ParseSummaryF5V3(void)
|
||||||
{
|
{
|
||||||
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) MODE_ASV_VARIABLE_EPAP));
|
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) MODE_ASV_VARIABLE_EPAP));
|
||||||
@ -3716,73 +3443,6 @@ bool PRS1DataChunk::ParseSummaryF5V3(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PRS1Import::ParseSummaryF0V6()
|
|
||||||
{
|
|
||||||
bool ok;
|
|
||||||
ok = summary->ParseSummaryF0V6();
|
|
||||||
|
|
||||||
for (int i=0; i < summary->m_parsedData.count(); i++) {
|
|
||||||
PRS1ParsedEvent* e = summary->m_parsedData.at(i);
|
|
||||||
if (e->m_type != EV_PRS1_SETTING) {
|
|
||||||
qWarning() << "Summary had non-setting event:" << (int) e->m_type;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
PRS1ParsedSettingEvent* s = (PRS1ParsedSettingEvent*) e;
|
|
||||||
switch (s->m_setting) {
|
|
||||||
case PRS1_SETTING_CPAP_MODE:
|
|
||||||
session->settings[CPAP_Mode] = e->m_value;
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE:
|
|
||||||
session->settings[CPAP_Pressure] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE_MIN:
|
|
||||||
session->settings[CPAP_PressureMin] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PRESSURE_MAX:
|
|
||||||
session->settings[CPAP_PressureMax] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP:
|
|
||||||
session->settings[CPAP_EPAP] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP:
|
|
||||||
session->settings[CPAP_IPAP] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS:
|
|
||||||
session->settings[CPAP_PS] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MIN:
|
|
||||||
session->settings[CPAP_EPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_EPAP_MAX:
|
|
||||||
session->settings[CPAP_EPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MIN:
|
|
||||||
session->settings[CPAP_IPAPLo] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_IPAP_MAX:
|
|
||||||
session->settings[CPAP_IPAPHi] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MIN:
|
|
||||||
session->settings[CPAP_PSMin] = e->value();
|
|
||||||
break;
|
|
||||||
case PRS1_SETTING_PS_MAX:
|
|
||||||
session->settings[CPAP_PSMax] = e->value();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
qWarning() << "Unknown PRS1 setting type" << (int) s->m_setting;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
summary_duration = summary->duration;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool PRS1DataChunk::ParseSummaryF0V6()
|
bool PRS1DataChunk::ParseSummaryF0V6()
|
||||||
{
|
{
|
||||||
// DreamStation machines...
|
// DreamStation machines...
|
||||||
@ -3964,7 +3624,7 @@ bool PRS1Import::ImportSummary()
|
|||||||
session->setPhysMin(CPAP_PS, 0);
|
session->setPhysMin(CPAP_PS, 0);
|
||||||
|
|
||||||
bool ok;
|
bool ok;
|
||||||
ok = this->ParseSummary();
|
ok = summary->ParseSummary();
|
||||||
|
|
||||||
for (int i=0; i < summary->m_parsedData.count(); i++) {
|
for (int i=0; i < summary->m_parsedData.count(); i++) {
|
||||||
PRS1ParsedEvent* e = summary->m_parsedData.at(i);
|
PRS1ParsedEvent* e = summary->m_parsedData.at(i);
|
||||||
@ -4073,9 +3733,9 @@ bool PRS1Import::ImportSummary()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PRS1Import::ParseSummary()
|
bool PRS1DataChunk::ParseSummary()
|
||||||
{
|
{
|
||||||
// TODO: The below is probably wrong. It should move to PRS1DataChunk when it gets fixed.
|
// TODO: The below mainblock creation is probably wrong. It should move to to its own function when it gets fixed.
|
||||||
/* Example data block
|
/* Example data block
|
||||||
000000c6@0000: 00 [10] 01 [00 01 02 01 01 00 02 01 00 04 01 40 07
|
000000c6@0000: 00 [10] 01 [00 01 02 01 01 00 02 01 00 04 01 40 07
|
||||||
000000c6@0010: 01 60 1e 03 02 0c 14 2c 01 14 2d 01 40 2e 01 02
|
000000c6@0010: 01 60 1e 03 02 0c 14 2c 01 14 2d 01 40 2e 01 02
|
||||||
@ -4085,33 +3745,33 @@ bool PRS1Import::ParseSummary()
|
|||||||
000000c6@0050: 08 [61 60] 0a [00 00 00 00 03 00 00 00 02 00 02 00
|
000000c6@0050: 08 [61 60] 0a [00 00 00 00 03 00 00 00 02 00 02 00
|
||||||
000000c6@0060: 05 00 2b 11 00 10 2b 5c 07 12 00 00] 03 [00 00 01
|
000000c6@0060: 05 00 2b 11 00 10 2b 5c 07 12 00 00] 03 [00 00 01
|
||||||
000000c6@0070: 1a 00 38 04] */
|
000000c6@0070: 1a 00 38 04] */
|
||||||
if (summary->fileVersion == 3) {
|
if (this->fileVersion == 3) {
|
||||||
// Parse summary structures into bytearray map according to size given in header block
|
// Parse summary structures into bytearray map according to size given in header block
|
||||||
const unsigned char * data = (unsigned char *)summary->m_data.constData();
|
const unsigned char * data = (unsigned char *)this->m_data.constData();
|
||||||
int size = summary->m_data.size();
|
int size = this->m_data.size();
|
||||||
|
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
int bsize;
|
int bsize;
|
||||||
short val, len;
|
short val, len;
|
||||||
do {
|
do {
|
||||||
val = data[pos++];
|
val = data[pos++];
|
||||||
auto it = summary->hblock.find(val);
|
auto it = this->hblock.find(val);
|
||||||
if (it == summary->hblock.end()) {
|
if (it == this->hblock.end()) {
|
||||||
qDebug() << "Block parse error in ParseSummary" << session->session();
|
qDebug() << "Block parse error in ParseSummary" << this->sessionid;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
bsize = it.value();
|
bsize = it.value();
|
||||||
|
|
||||||
if (val != 1) {
|
if (val != 1) {
|
||||||
// store the data block for later reference
|
// store the data block for later reference
|
||||||
summary->hbdata[val] = QByteArray((const char *)(&data[pos]), bsize);
|
this->hbdata[val] = QByteArray((const char *)(&data[pos]), bsize);
|
||||||
} else {
|
} else {
|
||||||
// Parse the nested data structure which contains settings
|
// Parse the nested data structure which contains settings
|
||||||
int p2 = 0;
|
int p2 = 0;
|
||||||
do {
|
do {
|
||||||
val = data[pos + p2++];
|
val = data[pos + p2++];
|
||||||
len = data[pos + p2++];
|
len = data[pos + p2++];
|
||||||
summary->mainblock[val] = QByteArray((const char *)(&data[pos+p2]), len);
|
this->mainblock[val] = QByteArray((const char *)(&data[pos+p2]), len);
|
||||||
p2 += len;
|
p2 += len;
|
||||||
} while ((p2 < bsize) && ((pos+p2) < size));
|
} while ((p2 < bsize) && ((pos+p2) < size));
|
||||||
}
|
}
|
||||||
@ -4122,33 +3782,33 @@ bool PRS1Import::ParseSummary()
|
|||||||
// Family 3 = BIPAP AVAPS
|
// Family 3 = BIPAP AVAPS
|
||||||
// Family 5 = BIPAP AutoSV
|
// Family 5 = BIPAP AutoSV
|
||||||
|
|
||||||
switch (summary->family) {
|
switch (this->family) {
|
||||||
case 0:
|
case 0:
|
||||||
if (summary->familyVersion == 6) {
|
if (this->familyVersion == 6) {
|
||||||
return summary->ParseSummaryF0V6();
|
return this->ParseSummaryF0V6();
|
||||||
} else if (summary->familyVersion == 4) {
|
} else if (this->familyVersion == 4) {
|
||||||
return summary->ParseSummaryF0V4();
|
return this->ParseSummaryF0V4();
|
||||||
} else {
|
} else {
|
||||||
return summary->ParseSummaryF0V23();
|
return this->ParseSummaryF0V23();
|
||||||
}
|
}
|
||||||
case 3:
|
case 3:
|
||||||
return summary->ParseSummaryF3();
|
return this->ParseSummaryF3();
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
if (summary->familyVersion == 1) {
|
if (this->familyVersion == 1) {
|
||||||
return summary->ParseSummaryF5V012();
|
return this->ParseSummaryF5V012();
|
||||||
} else if (summary->familyVersion == 0) {
|
} else if (this->familyVersion == 0) {
|
||||||
return summary->ParseSummaryF5V012();
|
return this->ParseSummaryF5V012();
|
||||||
} else if (summary->familyVersion == 2) {
|
} else if (this->familyVersion == 2) {
|
||||||
return summary->ParseSummaryF5V012();
|
return this->ParseSummaryF5V012();
|
||||||
} else if (summary->familyVersion == 3) {
|
} else if (this->familyVersion == 3) {
|
||||||
return summary->ParseSummaryF5V3();
|
return this->ParseSummaryF5V3();
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
qWarning() << "unexpected family" << summary->family << "familyVersion" << summary->familyVersion;
|
qWarning() << "unexpected family" << this->family << "familyVersion" << this->familyVersion;
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
@ -131,6 +131,9 @@ public:
|
|||||||
//! \brief Parse a single data chunk from a .000 file containing compliance data for a brick
|
//! \brief Parse a single data chunk from a .000 file containing compliance data for a brick
|
||||||
bool ParseCompliance(void);
|
bool ParseCompliance(void);
|
||||||
|
|
||||||
|
//! \brief Figures out which Summary Parser to call, based on machine family/version and calls it.
|
||||||
|
bool ParseSummary();
|
||||||
|
|
||||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 2 or 3 machine
|
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 2 or 3 machine
|
||||||
bool ParseSummaryF0V23(void);
|
bool ParseSummaryF0V23(void);
|
||||||
|
|
||||||
@ -226,9 +229,6 @@ public:
|
|||||||
//! \brief Imports the .002 summary file.
|
//! \brief Imports the .002 summary file.
|
||||||
bool ImportSummary();
|
bool ImportSummary();
|
||||||
|
|
||||||
//! \brief Figures out which Summary Parser to call, based on machine family/version and calls it.
|
|
||||||
bool ParseSummary();
|
|
||||||
|
|
||||||
//! \brief Figures out which Event Parser to call, based on machine family/version and calls it.
|
//! \brief Figures out which Event Parser to call, based on machine family/version and calls it.
|
||||||
bool ParseEvents();
|
bool ParseEvents();
|
||||||
|
|
||||||
@ -242,18 +242,6 @@ public:
|
|||||||
bool ParseOximetery();
|
bool ParseOximetery();
|
||||||
|
|
||||||
|
|
||||||
//! \brief Summary parser for 60 series Family 0 CPAP/APAP models
|
|
||||||
bool ParseSummaryF0V4();
|
|
||||||
//! \brief Summary parser for 1060 series AVAPS models
|
|
||||||
bool ParseSummaryF3();
|
|
||||||
//! \brief Summary parser for 50 series Family 5-0 through 5-2 BiPAP/AutoSV models
|
|
||||||
bool ParseSummaryF5V012();
|
|
||||||
//! \brief Summary parser for 60 series Family 5-3 BiPAP/AutoSV models
|
|
||||||
bool ParseSummaryF5V3();
|
|
||||||
|
|
||||||
//! \brief Summary parser for DreamStation series CPAP/APAP models
|
|
||||||
bool ParseSummaryF0V6();
|
|
||||||
|
|
||||||
//! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine
|
//! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine
|
||||||
bool ParseF0Events();
|
bool ParseF0Events();
|
||||||
//! \brief Parse a single data chunk from a .002 file containing event data for a AVAPS 1060P machine
|
//! \brief Parse a single data chunk from a .002 file containing event data for a AVAPS 1060P machine
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user