suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #226 from WandererFan/QtyPrecision

Browse Source 
Fix 2628 Quantity::getUserString Fixed Precision
This commit is contained in:
Yorik van Havre 2016-07-21 18:39:02 -03:00 committed by GitHub
commit 90d181aec2
4 changed files with 75 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Base/UnitsSchemaCentimeters.cpp
View File

@ -21,18 +21,19 @@
***************************************************************************/ ***************************************************************************/
#include "PreCompiled.h" #include "PreCompiled.h"
#ifdef __GNUC__ #ifdef __GNUC__
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <QString> #include <QString>
#include <QLocale>
#include "Exception.h" #include "Exception.h"
#include "UnitsApi.h" #include "UnitsApi.h"
#include "UnitsSchemaCentimeters.h" #include "UnitsSchemaCentimeters.h"
#include <cmath> #include <cmath>
using namespace Base; using namespace Base;
QString UnitsSchemaCentimeters::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString) QString UnitsSchemaCentimeters::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString)
@ -55,5 +56,9 @@ QString UnitsSchemaCentimeters::schemaTranslate(Base::Quantity quant,double &fac
unitString = quant.getUnit().getString(); unitString = quant.getUnit().getString();
factor = 1.0; factor = 1.0;
} }
return QString::fromUtf8("%L1 %2").arg(quant.getValue() / factor).arg(unitString); //return QString::fromUtf8("%L1 %2").arg(quant.getValue() / factor).arg(unitString);
QLocale Lc = QLocale::system();
Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator);
QString Ln = Lc.toString((quant.getValue() / factor), 'f', Base::UnitsApi::getDecimals());
return QString::fromUtf8("%1 %2").arg(Ln).arg(unitString);
} }

62
src/Base/UnitsSchemaImperial1.cpp
View File

@ -24,9 +24,9 @@
#include "PreCompiled.h" #include "PreCompiled.h"
#ifndef _PreComp_ #ifndef _PreComp_
# include <sstream> # include <sstream>
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <QString> #include <QString>
@ -34,28 +34,28 @@
#include "Exception.h" #include "Exception.h"
#include "UnitsApi.h" #include "UnitsApi.h"
#include "UnitsSchemaImperial1.h" #include "UnitsSchemaImperial1.h"
#include <cmath> #include <cmath>
using namespace Base; using namespace Base;
//void UnitsSchemaImperial1::setSchemaUnits(void){ //void UnitsSchemaImperial1::setSchemaUnits(void){
// // here you could change the constances used by the parser (defined in Quantity.cpp) // // here you could change the constances used by the parser (defined in Quantity.cpp)
// Quantity::Inch = Quantity (25.4 ,Unit(1)); // Quantity::Inch = Quantity (25.4 ,Unit(1));
// Quantity::Foot = Quantity (304.8 ,Unit(1)); // Quantity::Foot = Quantity (304.8 ,Unit(1));
// Quantity::Thou = Quantity (0.0254 ,Unit(1)); // Quantity::Thou = Quantity (0.0254 ,Unit(1));
// Quantity::Yard = Quantity (914.4 ,Unit(1)); // Quantity::Yard = Quantity (914.4 ,Unit(1));
// Quantity::Mile = Quantity (1609344.0 ,Unit(1)); // Quantity::Mile = Quantity (1609344.0 ,Unit(1));
//} //}
// //
//void UnitsSchemaImperial1::resetSchemaUnits(void){ //void UnitsSchemaImperial1::resetSchemaUnits(void){
// // set units to US customary / Imperial units // // set units to US customary / Imperial units
// Quantity::Inch = Quantity (25.4 ,Unit(1)); // Quantity::Inch = Quantity (25.4 ,Unit(1));
// Quantity::Foot = Quantity (304.8 ,Unit(1)); // Quantity::Foot = Quantity (304.8 ,Unit(1));
// Quantity::Thou = Quantity (0.0254 ,Unit(1)); // Quantity::Thou = Quantity (0.0254 ,Unit(1));
// Quantity::Yard = Quantity (914.4 ,Unit(1)); // Quantity::Yard = Quantity (914.4 ,Unit(1));
// Quantity::Mile = Quantity (1609344.0 ,Unit(1)); // Quantity::Mile = Quantity (1609344.0 ,Unit(1));
//} //}
QString UnitsSchemaImperial1::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString) QString UnitsSchemaImperial1::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString)
@ -63,7 +63,7 @@ QString UnitsSchemaImperial1::schemaTranslate(Base::Quantity quant,double &facto
double UnitValue = std::abs(quant.getValue()); double UnitValue = std::abs(quant.getValue());
Unit unit = quant.getUnit(); Unit unit = quant.getUnit();
// for imperial user/programmer mind; UnitValue is in internal system, that means // for imperial user/programmer mind; UnitValue is in internal system, that means
// mm/kg/s. And all combined units have to be calculated from there! // mm/kg/s. And all combined units have to be calculated from there!
// now do special treatment on all cases seems necessary: // now do special treatment on all cases seems necessary:
if(unit == Unit::Length){ // Length handling ============================ if(unit == Unit::Length){ // Length handling ============================
@ -73,7 +73,7 @@ QString UnitsSchemaImperial1::schemaTranslate(Base::Quantity quant,double &facto
}else if(UnitValue < 2.54){ // smaller then 0.1 inch -> Thou (mil) }else if(UnitValue < 2.54){ // smaller then 0.1 inch -> Thou (mil)
unitString = QString::fromLatin1("thou"); unitString = QString::fromLatin1("thou");
factor = 0.0254; factor = 0.0254;
}else if(UnitValue < 304.8){ }else if(UnitValue < 304.8){
unitString = QString::fromLatin1("\""); unitString = QString::fromLatin1("\"");
factor = 25.4; factor = 25.4;
}else if(UnitValue < 914.4){ }else if(UnitValue < 914.4){
@ -85,7 +85,7 @@ QString UnitsSchemaImperial1::schemaTranslate(Base::Quantity quant,double &facto
}else if(UnitValue < 1609344000.0 ){ }else if(UnitValue < 1609344000.0 ){
unitString = QString::fromLatin1("mi"); unitString = QString::fromLatin1("mi");
factor = 1609344.0; factor = 1609344.0;
}else{ // bigger then 1000 mi -> scientific notation }else{ // bigger then 1000 mi -> scientific notation
unitString = QString::fromLatin1("in"); unitString = QString::fromLatin1("in");
factor = 25.4; factor = 25.4;
} }
@ -111,7 +111,7 @@ QString UnitsSchemaImperial1::schemaTranslate(Base::Quantity quant,double &facto
}else if(UnitValue < 145038){ }else if(UnitValue < 145038){
unitString = QString::fromLatin1("ksi"); unitString = QString::fromLatin1("ksi");
factor = 145.038; factor = 145.038;
}else{ // bigger then 1000 ksi -> psi + scientific notation }else{ // bigger then 1000 ksi -> psi + scientific notation
unitString = QString::fromLatin1("psi"); unitString = QString::fromLatin1("psi");
factor = 0.145038; factor = 0.145038;
} }
@ -120,7 +120,11 @@ QString UnitsSchemaImperial1::schemaTranslate(Base::Quantity quant,double &facto
unitString = quant.getUnit().getString(); unitString = quant.getUnit().getString();
factor = 1.0; factor = 1.0;
} }
return QString::fromLatin1("%L1 %2").arg(quant.getValue() / factor).arg(unitString); //return QString::fromLatin1("%L1 %2").arg(quant.getValue() / factor).arg(unitString);
QLocale Lc = QLocale::system();
Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator);
QString Ln = Lc.toString((quant.getValue() / factor), 'f', Base::UnitsApi::getDecimals());
return QString::fromUtf8("%1 %2").arg(Ln).arg(unitString);
} }
@ -131,7 +135,7 @@ QString UnitsSchemaImperialDecimal::schemaTranslate(Base::Quantity quant,double
double UnitValue = std::abs(quant.getValue()); double UnitValue = std::abs(quant.getValue());
Unit unit = quant.getUnit(); Unit unit = quant.getUnit();
// for imperial user/programmer mind; UnitValue is in internal system, that means // for imperial user/programmer mind; UnitValue is in internal system, that means
// mm/kg/s. And all combined units have to be calculated from there! // mm/kg/s. And all combined units have to be calculated from there!
// now do special treatment on all cases seems necessary: // now do special treatment on all cases seems necessary:
if(unit == Unit::Length){ // Length handling ============================ if(unit == Unit::Length){ // Length handling ============================
@ -141,7 +145,7 @@ QString UnitsSchemaImperialDecimal::schemaTranslate(Base::Quantity quant,double
//}else if(UnitValue < 2.54){ // smaller then 0.1 inch -> Thou (mil) //}else if(UnitValue < 2.54){ // smaller then 0.1 inch -> Thou (mil)
// unitString = QString::fromLatin1("thou"); // unitString = QString::fromLatin1("thou");
// factor = 0.0254; // factor = 0.0254;
}else{ // bigger then 1000 mi -> scientific notation }else{ // bigger then 1000 mi -> scientific notation
unitString = QString::fromLatin1("in"); unitString = QString::fromLatin1("in");
factor = 25.4; factor = 25.4;
} }
@ -167,7 +171,7 @@ QString UnitsSchemaImperialDecimal::schemaTranslate(Base::Quantity quant,double
//}else if(UnitValue < 145038){ //}else if(UnitValue < 145038){
// unitString = QString::fromLatin1("ksi"); // unitString = QString::fromLatin1("ksi");
// factor = 145.038; // factor = 145.038;
}else{ // bigger then 1000 ksi -> psi + scientific notation }else{ // bigger then 1000 ksi -> psi + scientific notation
unitString = QString::fromLatin1("psi"); unitString = QString::fromLatin1("psi");
factor = 0.145038; factor = 0.145038;
} }
@ -176,11 +180,11 @@ QString UnitsSchemaImperialDecimal::schemaTranslate(Base::Quantity quant,double
unitString = quant.getUnit().getString(); unitString = quant.getUnit().getString();
factor = 1.0; factor = 1.0;
} }
//return QString::fromLatin1("%L1 %2").arg(quant.getValue() / factor).arg(unitString);
QLocale Lc = QLocale::system(); QLocale Lc = QLocale::system();
Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator); Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator);
QString Ln = Lc.toString(quant.getValue() / factor); QString Ln = Lc.toString((quant.getValue() / factor), 'f', Base::UnitsApi::getDecimals());
return QString::fromLatin1("%1 %2").arg(Ln).arg(unitString); return QString::fromUtf8("%1 %2").arg(Ln).arg(unitString);
//return QString::fromLatin1("%L1 %2").arg(quant.getValue() / factor).arg(unitString);
} }
@ -252,6 +256,6 @@ QString UnitsSchemaImperialBuilding::schemaTranslate(Base::Quantity quant,double
} }
QLocale Lc = QLocale::system(); QLocale Lc = QLocale::system();
Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator); Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator);
QString Ln = Lc.toString(quant.getValue() / factor); QString Ln = Lc.toString((quant.getValue() / factor), 'f', Base::UnitsApi::getDecimals());
return QString::fromLatin1("%1 %2").arg(Ln).arg(unitString); return QString::fromUtf8("%1 %2").arg(Ln).arg(unitString);
} }

28
src/Base/UnitsSchemaInternal.cpp
View File

@ -21,19 +21,20 @@
***************************************************************************/ ***************************************************************************/
#include "PreCompiled.h" #include "PreCompiled.h"
#ifdef __GNUC__ #ifdef __GNUC__
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <QString> #include <QString>
#include <QLocale>
#include "Exception.h" #include "Exception.h"
#include "UnitsApi.h" #include "UnitsApi.h"
#include "UnitsSchemaInternal.h" #include "UnitsSchemaInternal.h"
#include <cmath> #include <cmath>
using namespace Base; using namespace Base;
QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString) QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString)
@ -61,7 +62,7 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
}else if(UnitValue < 100000000000.0 ){ }else if(UnitValue < 100000000000.0 ){
unitString = QString::fromLatin1("km"); unitString = QString::fromLatin1("km");
factor = 1000000.0; factor = 1000000.0;
}else{ // bigger then 1000 km -> scientific notation }else{ // bigger then 1000 km -> scientific notation
unitString = QString::fromLatin1("mm"); unitString = QString::fromLatin1("mm");
factor = 1.0; factor = 1.0;
} }
@ -80,7 +81,7 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
// default action for all cases without special treatment: // default action for all cases without special treatment:
unitString = quant.getUnit().getString(); unitString = quant.getUnit().getString();
factor = 1.0; factor = 1.0;
}else if (unit == Unit::Density){ }else if (unit == Unit::Density){
if(UnitValue < 0.0001){ if(UnitValue < 0.0001){
unitString = QString::fromLatin1("kg/m^3"); unitString = QString::fromLatin1("kg/m^3");
factor = 0.000000001; factor = 0.000000001;
@ -104,7 +105,7 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
}else if(UnitValue < 10000000000.0){ }else if(UnitValue < 10000000000.0){
unitString = QString::fromLatin1("GPa"); unitString = QString::fromLatin1("GPa");
factor = 1000000.0; factor = 1000000.0;
}else{ // bigger -> scientific notation }else{ // bigger -> scientific notation
unitString = QString::fromLatin1("Pa"); unitString = QString::fromLatin1("Pa");
factor = 1.0; factor = 1.0;
} }
@ -113,6 +114,9 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
unitString = quant.getUnit().getString(); unitString = quant.getUnit().getString();
factor = 1.0; factor = 1.0;
} }
return QString::fromUtf8("%L1 %2").arg(quant.getValue() / factor).arg(unitString); //return QString::fromUtf8("%L1 %2").arg(quant.getValue() / factor).arg(unitString);
QLocale Lc = QLocale::system();
Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator);
QString Ln = Lc.toString((quant.getValue() / factor), 'f', Base::UnitsApi::getDecimals());
return QString::fromUtf8("%1 %2").arg(Ln).arg(unitString);
} }

23
src/Base/UnitsSchemaMKS.cpp
View File

@ -21,18 +21,19 @@
***************************************************************************/ ***************************************************************************/
#include "PreCompiled.h" #include "PreCompiled.h"
#ifdef __GNUC__ #ifdef __GNUC__
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <QString> #include <QString>
#include <QLocale>
#include "Exception.h" #include "Exception.h"
#include "UnitsApi.h" #include "UnitsApi.h"
#include "UnitsSchemaMKS.h" #include "UnitsSchemaMKS.h"
#include <cmath> #include <cmath>
using namespace Base; using namespace Base;
QString UnitsSchemaMKS::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString) QString UnitsSchemaMKS::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString)
@ -60,7 +61,7 @@ QString UnitsSchemaMKS::schemaTranslate(Base::Quantity quant,double &factor,QStr
}else if(UnitValue < 100000000000.0 ){ }else if(UnitValue < 100000000000.0 ){
unitString = QString::fromLatin1("km"); unitString = QString::fromLatin1("km");
factor = 1000000.0; factor = 1000000.0;
}else{ // bigger then 1000 km -> scientific notation }else{ // bigger then 1000 km -> scientific notation
unitString = QString::fromLatin1("mm"); unitString = QString::fromLatin1("mm");
factor = 1.0; factor = 1.0;
} }
@ -104,7 +105,7 @@ QString UnitsSchemaMKS::schemaTranslate(Base::Quantity quant,double &factor,QStr
}else if(UnitValue < 10000000000.0){ }else if(UnitValue < 10000000000.0){
unitString = QString::fromLatin1("GPa"); unitString = QString::fromLatin1("GPa");
factor = 1000000.0; factor = 1000000.0;
}else{ // bigger then 1000 GPa -> scientific notation }else{ // bigger then 1000 GPa -> scientific notation
unitString = QString::fromLatin1("Pa"); unitString = QString::fromLatin1("Pa");
factor = 1.0; factor = 1.0;
} }
@ -113,5 +114,9 @@ QString UnitsSchemaMKS::schemaTranslate(Base::Quantity quant,double &factor,QStr
unitString = quant.getUnit().getString(); unitString = quant.getUnit().getString();
factor = 1.0; factor = 1.0;
} }
return QString::fromUtf8("%L1 %2").arg(quant.getValue() / factor).arg(unitString); //return QString::fromUtf8("%L1 %2").arg(quant.getValue() / factor).arg(unitString);
QLocale Lc = QLocale::system();
Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator);
QString Ln = Lc.toString((quant.getValue() / factor), 'f', Base::UnitsApi::getDecimals());
return QString::fromUtf8("%1 %2").arg(Ln).arg(unitString);
} }