[PATCH 1/2] Don't show '0.0%' gas percentages

Linus Torvalds torvalds at linux-foundation.org
Wed Jun 19 21:48:57 PDT 2013


From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed, 19 Jun 2013 18:22:09 -1000
Subject: [PATCH 1/2] 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 at linux-foundation.org>
---

Pretty self-evident..

 qt-ui/models.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index 4ef8bc6ca588..c2cce561577d 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -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;
-- 
1.8.3



More information about the subsurface mailing list