chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Prefs value for Upper Percentile in statistics page

Browse Source
This commit is contained in:
Phil Olynyk 2017-08-01 21:31:59 -04:00 committed by Mark Watkins
parent d361d665aa
commit 58e251f251
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sleepyhead/statistics.cpp
View File

@ -541,11 +541,14 @@ Statistics::Statistics(QObject *parent) :
rows.push_back(StatisticsRow("PulseChange", SC_CPH, MT_OXIMETER)); rows.push_back(StatisticsRow("PulseChange", SC_CPH, MT_OXIMETER));
// These are for formatting the headers for the first column // These are for formatting the headers for the first column
int percentile=trunc(p_profile->general->prefCalcPercentile()); // Pholynyk, 10Mar2016
char perCentStr[20];
snprintf(perCentStr, 20, "%d%% %%1", percentile); //
calcnames[SC_UNDEFINED] = ""; calcnames[SC_UNDEFINED] = "";
calcnames[SC_MEDIAN] = tr("%1 Median"); calcnames[SC_MEDIAN] = tr("%1 Median");
calcnames[SC_AVG] = tr("Average %1"); calcnames[SC_AVG] = tr("Average %1");
calcnames[SC_WAVG] = tr("Average %1"); calcnames[SC_WAVG] = tr("Average %1");
calcnames[SC_90P] = tr("90% %1"); // this gets converted to whatever the upper percentile is set to calcnames[SC_90P] = tr(perCentStr); // this gets converted to whatever the upper percentile is set to
calcnames[SC_MIN] = tr("Min %1"); calcnames[SC_MIN] = tr("Min %1");
calcnames[SC_MAX] = tr("Max %1"); calcnames[SC_MAX] = tr("Max %1");
calcnames[SC_CPH] = tr("%1 Index"); calcnames[SC_CPH] = tr("%1 Index");
@ -2157,6 +2160,9 @@ QString StatisticsRow::value(QDate start, QDate end)
QString value; QString value;
float days = p_profile->countDays(type, start, end); float days = p_profile->countDays(type, start, end);
float percentile=p_profile->general->prefCalcPercentile()/100.0; // Pholynyk, 10Mar2016
EventDataType percent = percentile; // was 0.90F
// Handle special data sources first // Handle special data sources first
if (calc == SC_AHI) { if (calc == SC_AHI) {
value = QString("%1").arg(calcAHI(start, end), 0, 'f', decimals); value = QString("%1").arg(calcAHI(start, end), 0, 'f', decimals);
@ -2187,7 +2193,7 @@ QString StatisticsRow::value(QDate start, QDate end)
val = p_profile->calcPercentile(code, 0.5F, type, start, end); val = p_profile->calcPercentile(code, 0.5F, type, start, end);
break; break;
case SC_90P: case SC_90P:
val = p_profile->calcPercentile(code, 0.9F, type, start, end); val = p_profile->calcPercentile(code, percent, type, start, end);
break; break;
case SC_MIN: case SC_MIN:
val = p_profile->calcMin(code, type, start, end); val = p_profile->calcMin(code, type, start, end);