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

Fixes build error. thanks Roy.. plus fixed Med string mixup

Browse Source
This commit is contained in:
Mark Watkins 2014-05-17 18:34:16 +10:00
parent be43cffbfb
commit 483d92a74a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/SleepLib/common.cpp
View File

@ -458,7 +458,7 @@ void initializeStrings()
STR_TR_Min = QObject::tr("Min"); // Minimum STR_TR_Min = QObject::tr("Min"); // Minimum
STR_TR_Max = QObject::tr("Max"); // Maximum STR_TR_Max = QObject::tr("Max"); // Maximum
STR_TR_Max = QObject::tr("Med"); // Median STR_TR_Med = QObject::tr("Med"); // Median
STR_TR_Average = QObject::tr("Average"); STR_TR_Average = QObject::tr("Average");
STR_TR_Median = QObject::tr("Median"); STR_TR_Median = QObject::tr("Median");

2
sleepyhead/SleepLib/profiles.cpp
View File

@ -131,7 +131,7 @@ void Profile::DataFormatError(Machine *m)
QMessageBox::critical(nullptr, STR_MessageBox_Error, QMessageBox::critical(nullptr, STR_MessageBox_Error,
QObject::tr("Sorry, the purge operation failed, which means this version of SleepyHead can't start.")+"\n\n"+ QObject::tr("Sorry, the purge operation failed, which means this version of SleepyHead can't start.")+"\n\n"+
QObject::tr("The machine data folder needs to be removed manually.")+"\n\n"+ QObject::tr("The machine data folder needs to be removed manually.")+"\n\n"+
QObject::tr("This folder currently resides at the following location:")+\n\n"+ QObject::tr("This folder currently resides at the following location:")+"\n\n"+
QDir::toNativeSeparators(PREF[STR_GEN_DataFolder].toString()), QMessageBox::Ok); QDir::toNativeSeparators(PREF[STR_GEN_DataFolder].toString()), QMessageBox::Ok);
QApplication::exit(-1); QApplication::exit(-1);
} }

14
sleepyhead/daily.cpp
View File

@ -1063,9 +1063,9 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
const EventDataType maxperc=0.995F; const EventDataType maxperc=0.995F;
QString midname; QString midname;
if (ST_mid==ST_WAVG) midname=tr("Avg"); if (ST_mid==ST_WAVG) midname=STR_TR_WAvg;
else if (ST_mid==ST_AVG) midname=tr("Avg"); else if (ST_mid==ST_AVG) midname=STR_TR_Avg;
else if (ST_mid==ST_PERC) midname=tr("Med"); else if (ST_mid==ST_PERC) midname=STR_TR_Med;
QString html; QString html;
@ -1075,7 +1075,7 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
.arg(STR_TR_Channel) .arg(STR_TR_Channel)
.arg(STR_TR_Min) .arg(STR_TR_Min)
.arg(midname) .arg(midname)
.arg(tr("%1%").arg(percentile*100,0,'f',0)) .arg(tr("%1%2").arg(percentile*100,0,'f',0).arg(STR_UNIT_Percentage))
.arg(STR_TR_Max); .arg(STR_TR_Max);
ChannelID chans[]={ ChannelID chans[]={
@ -1116,19 +1116,19 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
mn=day->Min(code); mn=day->Min(code);
perc=day->percentile(code,percentile); perc=day->percentile(code,percentile);
if (ST_mid==ST_PERC) { if (ST_mid == ST_PERC) {
med=day->percentile(code,0.5); med=day->percentile(code,0.5);
tmp=day->wavg(code); tmp=day->wavg(code);
if (tmp>0 || mx==0) { if (tmp>0 || mx==0) {
tooltip+=QString("<br/>"+STR_TR_WAvg+": %1").arg(tmp,0,'f',2); tooltip+=QString("<br/>"+STR_TR_WAvg+": %1").arg(tmp,0,'f',2);
} }
} else if (ST_mid==ST_WAVG) { } else if (ST_mid == ST_WAVG) {
med=day->wavg(code); med=day->wavg(code);
tmp=day->percentile(code,0.5); tmp=day->percentile(code,0.5);
if (tmp>0 || mx==0) { if (tmp>0 || mx==0) {
tooltip+=QString("<br/>"+STR_TR_Median+": %1").arg(tmp,0,'f',2); tooltip+=QString("<br/>"+STR_TR_Median+": %1").arg(tmp,0,'f',2);
} }
} else if (ST_mid==ST_AVG) { } else if (ST_mid == ST_AVG) {
med=day->avg(code); med=day->avg(code);
tmp=day->percentile(code,0.5); tmp=day->percentile(code,0.5);
if (tmp>0 || mx==0) { if (tmp>0 || mx==0) {