Really display liters with script el

In commit 125ddd955c04 ("Display liters with script el") Robert only fixed
the C routine we use to show units. Strangely, we had a separately
implemented C++ function as well. Instead of implementing this in two
spots I now simply have the C++ function use the C function to do the
actual work and then wrap this into an easier to use (from UI code)
QString output.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 5 insertions, 10 deletions

diff --git a/qt-gui.cpp b/qt-gui.cpp
index 224fdd597..41b2e5f12 100644
--- a/qt-gui.cpp
+++ b/qt-gui.cpp
@@ -299,15 +299,10 @@ QString get_temp_unit()
 
 QString get_volume_string(volume_t volume, bool showunit, int mbar)
 {
-	if (prefs.units.volume == units::LITER) {
-		double liter = volume.mliter / 1000.0;
-		return QString("%1%2").arg(liter, 0, 'f', liter >= 40.0 ? 0 : 1).arg(showunit ? translate("gettextFromC", "l") : "");
-	} else {
-		double cuft = ml_to_cuft(volume.mliter);
-		if (mbar)
-			cuft *= bar_to_atm(mbar / 1000.0);
-		return QString("%1%2").arg(cuft, 0, 'f', cuft >= 20.0 ? 0 : (cuft >= 2.0 ? 1 : 2)).arg(showunit ? translate("gettextFromC", "cuft") : "");
-	}
+	const char *unit;
+	int decimals;
+	double value = get_volume_units(volume.mliter, &decimals, &unit);
+	return QString("%1%2").arg(value, 0, 'f', decimals).arg(showunit ? unit : "");
 }
 
 QString get_volume_unit()
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index 9b92f8197..496c32cdb 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -538,7 +538,7 @@ volume_t string_to_volume(const char *str, pressure_t workp)
 	QString local_cuft = CylindersModel::tr("cuft");
 	volume_t volume;
 
-	if (rest.startsWith("l") || rest.startsWith(local_l))
+	if (rest.startsWith("l") || rest.startsWith("ℓ") || rest.startsWith(local_l))
 		goto l;
 	if (rest.startsWith("cuft") || rest.startsWith(local_cuft))
 		goto cuft;