diff --git a/daily.cpp b/daily.cpp index da9b1ba5..9e7b9525 100644 --- a/daily.cpp +++ b/daily.cpp @@ -822,16 +822,6 @@ void Daily::Load(QDate date) } // if (!CPAP) html+="\n"; - if (oxi) { - html+=""; - html+=QString("\n").arg(tr("Oximeter Information")); - html+=""; - html+="\n"; - html+=""; - html+=QString("").arg(tr("SpO2 Desaturations")).arg(oxi->count(OXI_SPO2Drop)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_SPO2Drop)/3600.0)); - html+=QString("").arg(tr("Pulse Change events")).arg(oxi->count(OXI_PulseChange)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_PulseChange)/3600.0)); - html+=QString("").arg(tr("SpO2 Baseline Used")).arg(oxi->settings_wavg(OXI_SPO2Drop)); - } if ((cpap && !isBrick) || oxi) { html+="\n"; @@ -882,6 +872,16 @@ void Daily::Load(QDate date) html+="\n"; } + if (oxi) { + html+=""; + html+=QString("\n").arg(tr("Oximeter Information")); + html+=""; + html+="\n"; + html+=""; + html+=QString("").arg(tr("SpO2 Desaturations")).arg(oxi->count(OXI_SPO2Drop)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_SPO2Drop)/3600.0)); + html+=QString("").arg(tr("Pulse Change events")).arg(oxi->count(OXI_PulseChange)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_PulseChange)/3600.0)); + html+=QString("").arg(tr("SpO2 Baseline Used")).arg(oxi->settings_wavg(OXI_SPO2Drop)); + } if (cpap) { html+="";
 
%1

"+oxi->machine->properties[STR_PROP_Brand]+" "+oxi->machine->properties[STR_PROP_Model]+"
 
%1: %2 (%3)\%
%1: %2 (%3)\%
%1: %2\%
 
 
 
%1

"+oxi->machine->properties[STR_PROP_Brand]+" "+oxi->machine->properties[STR_PROP_Model]+"
 
%1: %2 (%3)\%
%1: %2 (%3)\%
%1: %2\%