From 4729cafdccfb4e7d622ca9802a6569efcd925ffb Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Mon, 18 May 2015 16:37:09 +0100 Subject: [PATCH] Base: Fix GPa/MPa units in UnitsSchemaMKS.cpp Signed-off-by: Przemo Firszt --- src/Base/UnitsSchemaMKS.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Base/UnitsSchemaMKS.cpp b/src/Base/UnitsSchemaMKS.cpp index 9d34f8bb3a..3f87a8c24b 100644 --- a/src/Base/UnitsSchemaMKS.cpp +++ b/src/Base/UnitsSchemaMKS.cpp @@ -99,8 +99,11 @@ QString UnitsSchemaMKS::schemaTranslate(Base::Quantity quant,double &factor,QStr unitString = QString::fromLatin1("kPa"); factor = 1.0; }else if(UnitValue < 10000000.0){ - unitString = QString::fromLatin1("GPa"); + unitString = QString::fromLatin1("MPa"); factor = 1000.0; + }else if(UnitValue < 10000000000.0){ + unitString = QString::fromLatin1("GPa"); + factor = 1000000.0; }else{ // bigger then 1000 GPa -> scientific notation unitString = QString::fromLatin1("Pa"); factor = 1.0;