mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use temperature_t for temperatures in struct stats_t

Browse source 
Use struct temperature_t for temperatures in struct stats_t and
use get_temperature_string() when printing these temperatures for
statistics and HTML export.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs 2018-02-18 21:55:57 +01:00 • committed by Dirk Hohndel
parent 928e7ed869
commit 95a23cf470
8 changed files with 48 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

17
qt-models/yearlystatisticsmodel.cpp
View file

@ -39,7 +39,6 @@ YearStatisticsItem::YearStatisticsItem(stats_t interval) : stats_interval(interv
QVariant YearStatisticsItem::data(int column, int role) const
{
double value;
QVariant ret;
if (role == Qt::FontRole) {
@ -91,19 +90,19 @@ QVariant YearStatisticsItem::data(int column, int role) const
ret = get_volume_string(stats_interval.max_sac);
break;
case AVG_TEMP:
if (stats_interval.combined_temp && stats_interval.combined_count) {
ret = QString::number(stats_interval.combined_temp / stats_interval.combined_count, 'f', 1);
if (stats_interval.combined_temp.mkelvin && stats_interval.combined_count) {
temperature_t avg_temp;
avg_temp.mkelvin = stats_interval.combined_temp.mkelvin / stats_interval.combined_count;
ret = get_temperature_string(avg_temp);
}
break;
case MIN_TEMP:
value = get_temp_units(stats_interval.min_temp, NULL);
if (value > -100.0)
ret = QString::number(value, 'f', 1);
if (stats_interval.min_temp.mkelvin)
ret = get_temperature_string(stats_interval.min_temp);
break;
case MAX_TEMP:
value = get_temp_units(stats_interval.max_temp, NULL);
if (value > -100.0)
ret = QString::number(value, 'f', 1);
if (stats_interval.max_temp.mkelvin)
ret = get_temperature_string(stats_interval.max_temp);
break;
}
return ret;