Don't show '0.0%' gas percentages

It's just distracting.  Leave it empty.  No helium should be visually
very different from actual trimix, and for oxygen, zero means something
different anyway (it's air).  In neither case is '0.0%' a good string to
show, just show it as empty.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-06-19 18:22:09 -10:00 committed by Dirk Hohndel
parent 45d9ca09de
commit bc24b9320f

View file

@ -59,6 +59,16 @@ int CylindersModel::columnCount(const QModelIndex& parent) const
return COLUMNS;
}
static QVariant percent_string(fraction_t fraction)
{
int permille = fraction.permille;
if (!permille)
return QVariant();
return QString("%1%").arg(permille / 10.0, 0, 'f', 1);
}
QVariant CylindersModel::data(const QModelIndex& index, int role) const
{
QVariant ret;
@ -109,10 +119,10 @@ QVariant CylindersModel::data(const QModelIndex& index, int role) const
ret = get_pressure_string(cyl->end, TRUE);
break;
case O2:
ret = QString("%1%").arg(cyl->gasmix.o2.permille / 10.0, 0, 'f', 1);
ret = percent_string(cyl->gasmix.o2);
break;
case HE:
ret = QString("%1%").arg(cyl->gasmix.he.permille / 10.0, 0, 'f', 1);
ret = percent_string(cyl->gasmix.he);
break;
}
break;