From f50a19df2f33707bec71a7d0eb8aaf98ce10861e Mon Sep 17 00:00:00 2001 From: Harald Geyer Date: Tue, 10 Oct 2017 11:17:59 +0000 Subject: [PATCH] Fix rendering of Unit::ThermalConductivity The old behaviour was: >>> Quantity('0.9 W/m/K').UserString u'0.00 W/mm/K' >>> Quantity('1.1 W/m/K').UserString u'1.10 W/m/K' >>> Quantity('1100 W/m/K').UserString u'1100.00 W/m/K' The new behaviour is: >>> Quantity('0.9 W/m/K').UserString u'0.90 W/m/K' >>> Quantity('1.1 W/m/K').UserString u'1.10 W/m/K' >>> Quantity('1100 W/m/K').UserString u'1.10 W/mm/K' --- src/Base/UnitsSchemaInternal.cpp | 2 +- src/Base/UnitsSchemaMKS.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Base/UnitsSchemaInternal.cpp b/src/Base/UnitsSchemaInternal.cpp index 1116e5d3a5..dfa74390c2 100644 --- a/src/Base/UnitsSchemaInternal.cpp +++ b/src/Base/UnitsSchemaInternal.cpp @@ -114,7 +114,7 @@ QString UnitsSchemaInternal::schemaTranslate(const Quantity &quant, double &fact } } else if (unit == Unit::ThermalConductivity) { - if (UnitValue < 1000) { + if (UnitValue > 1000000) { unitString = QString::fromLatin1("W/mm/K"); factor = 1000000.0; } diff --git a/src/Base/UnitsSchemaMKS.cpp b/src/Base/UnitsSchemaMKS.cpp index fec428e237..65a1a355c0 100644 --- a/src/Base/UnitsSchemaMKS.cpp +++ b/src/Base/UnitsSchemaMKS.cpp @@ -143,7 +143,7 @@ QString UnitsSchemaMKS::schemaTranslate(const Quantity &quant, double &factor, Q } } else if (unit == Unit::ThermalConductivity) { - if (UnitValue < 1000) { + if (UnitValue > 1000000) { unitString = QString::fromLatin1("W/mm/K"); factor = 1000000.0; }