").arg(date.toString(Qt::ISODate))+""+
- QObject::tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->series()+" "+cpap->model())+" ";
+ html+= ""+tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->series()+" "+cpap->model())+" ";
int daysto = date.daysTo(QDate::currentDate());
QString daystring;
- if (daysto == 1) daystring += QObject::tr("last night");
- else if (daysto == 2) daystring += QObject::tr("yesterday");
- else daystring += QObject::tr("%2 days ago").arg(date.daysTo(QDate::currentDate()));
+ if (daysto == 1) daystring += tr("last night");
+ else if (daysto == 2) daystring += tr("yesterday");
+ else daystring += tr("%2 days ago").arg(date.daysTo(QDate::currentDate()));
- html += QObject::tr("was %1 (on %2)").arg(daystring).arg(date.toString(Qt::SystemLocaleLongDate)) + " ";
+ html += tr("was %1 (on %2)").arg(daystring).arg(date.toString(Qt::SystemLocaleLongDate)) + " ";
EventDataType hours = day->hours();
html += " ";
@@ -171,11 +135,11 @@ QString GenerateWelcomeHTML()
int seconds = int(hours * 3600.0) % 60;
int minutes = int(hours * 60) % 60;
int hour = hours;
- QString timestr = QObject::tr("%1 hours, %2 minutes and %3 seconds").arg(hour).arg(minutes).arg(seconds);
+ QString timestr = tr("%1 hours, %2 minutes and %3 seconds").arg(hour).arg(minutes).arg(seconds);
const EventDataType compliance_min = 4.0;
- if (hours > compliance_min) html += QObject::tr("Your machine was on for %1.").arg(timestr)+" ";
- else html += QObject::tr("You only had the mask on for %1.").arg(timestr)+" ";
+ if (hours > compliance_min) html += tr("Your machine was on for %1.").arg(timestr)+" ";
+ else html += tr("You only had the mask on for %1.").arg(timestr)+" ";
int averagedays = 7; // how many days to look back
@@ -186,10 +150,10 @@ QString GenerateWelcomeHTML()
EventDataType ahi = (day->count(CPAP_Obstructive) + day->count(CPAP_Hypopnea) + day->count(CPAP_ClearAirway) + day->count(CPAP_Apnea)) / hours;
EventDataType ahidays = calcAHI(starttime, date);
- const QString under = QObject::tr("under");
- const QString over = QObject::tr("over");
- const QString close = QObject::tr("reasonably close to");
- const QString equal = QObject::tr("equal to");
+ const QString under = tr("under");
+ const QString over = tr("over");
+ const QString close = tr("reasonably close to");
+ const QString equal = tr("equal to");
QString comp;
@@ -203,7 +167,7 @@ QString GenerateWelcomeHTML()
comp = equal;
}
- html += QObject::tr("You had an AHI of %1, which is %2 your %3 day average of %4.").arg(ahi,0,'f',2).arg(comp).arg(averagedays).arg(ahidays,0,'f',2);
+ html += tr("You had an AHI of %1, which is %2 your %3 day average of %4.").arg(ahi,0,'f',2).arg(comp).arg(averagedays).arg(ahidays,0,'f',2);
html += " ";
@@ -212,30 +176,30 @@ QString GenerateWelcomeHTML()
if (cpapmode == MODE_CPAP) {
EventDataType pressure = day->settings_max(CPAP_Pressure);
- html += QObject::tr("Your CPAP machine blasted you with a constant %1%2 of air").arg(pressure).arg(schema::channel[CPAP_Pressure].units());
+ html += tr("Your CPAP machine blasted you with a constant %1%2 of air").arg(pressure).arg(schema::channel[CPAP_Pressure].units());
} else if (cpapmode == MODE_APAP) {
EventDataType pressure = day->percentile(CPAP_Pressure, perc/100.0);
- html += QObject::tr("Your pressure was under %1%2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_Pressure].units()).arg(perc);
+ html += tr("Your pressure was under %1%2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_Pressure].units()).arg(perc);
} else if (cpapmode == MODE_BILEVEL_FIXED) {
EventDataType ipap = day->settings_max(CPAP_IPAP);
EventDataType epap = day->settings_min(CPAP_EPAP);
- html += QObject::tr("Your machine blasted you with a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units());
+ html += tr("Your machine blasted you with a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units());
} else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) {
EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0);
EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0);
- html += QObject::tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units()).arg(perc);
+ html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units()).arg(perc);
} else if (cpapmode == MODE_ASV){
EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0);
EventDataType epap = qRound(day->settings_wavg(CPAP_EPAP));
- html += QObject::tr("Your EPAP pressure fixed at %1%2.").arg(epap).arg(schema::channel[CPAP_EPAP].units())+" ";
- html += QObject::tr("Your IPAP pressure was under %1%2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc);
+ html += tr("Your EPAP pressure fixed at %1%2.").arg(epap).arg(schema::channel[CPAP_EPAP].units())+" ";
+ html += tr("Your IPAP pressure was under %1%2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc);
} else if (cpapmode == MODE_ASV_VARIABLE_EPAP){
EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0);
EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0);
- html += QObject::tr("Your EPAP pressure was under %1%2 for %3% of the time.").arg(epap).arg(schema::channel[CPAP_EPAP].units()).arg(perc)+" ";
- html += QObject::tr("Your IPAP pressure was under %1%2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc);
+ html += tr("Your EPAP pressure was under %1%2 for %3% of the time.").arg(epap).arg(schema::channel[CPAP_EPAP].units()).arg(perc)+" ";
+ html += tr("Your IPAP pressure was under %1%2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc);
}
html += " ";
@@ -255,43 +219,17 @@ QString GenerateWelcomeHTML()
comp = equal;
}
- html += QObject::tr("Your average leaks were %1 %2, which is %3 your %4 day average of %5.").arg(leak,0,'f',2).arg(schema::channel[CPAP_Leak].units()).arg(comp).arg(averagedays).arg(leakdays,0,'f',2);
+ html += tr("Your average leaks were %1 %2, which is %3 your %4 day average of %5.").arg(leak,0,'f',2).arg(schema::channel[CPAP_Leak].units()).arg(comp).arg(averagedays).arg(leakdays,0,'f',2);
html += " ";
- html += "
";
} else {
- html += "
"+QObject::tr("No CPAP data has been imported yet.")+"
";
+ html += "
"+tr("No CPAP data has been imported yet.")+"
";
}
- if (haveoximeterdata) {
- QDate oxidate=p_profile->LastDay(MT_OXIMETER);
- int daysto = oxidate.daysTo(QDate::currentDate());
-
- html += "
"+QObject::tr("Most recent Oximetery data: %1 ").arg(oxidate.toString(Qt::SystemLocaleLongDate)).arg(oxidate.toString(Qt::ISODate));
- if (daysto == 1) html += QObject::tr("(last night)");
- else if (daysto == 2) html += QObject::tr("(yesterday)");
- else html += QObject::tr("(%2 day ago)").arg(oxidate.daysTo(QDate::currentDate()));
- html+="
";
- } else {
- html += "
"+QObject::tr("No oximetery data has been imported yet.")+"
";
- }
-
}
-
- // The SDCard warning does not need to be seen anymore for people who DON'T use ResMed S9's.. show first import and only when S9 is present
- bool showCardWarning = (cpap == nullptr);
-
- QList mlist = p_profile->GetMachines(MT_CPAP);
- for (int i=0; iseries().compare("S9") == 0) showCardWarning = true;
- }
-
-
- if (showCardWarning) {
- html += QString("
")+
+/* html += QString("
")+
"
"
"
"+QObject::tr("Very Important Warning For ResMed S9 Users")+"
"
-
- "
![](\"qrc:/icons/sdcard-lock.png\"){kind=icon}