improve whitespaces, fix typos
This commit is contained in:
@@ -42,100 +42,125 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
|
||||
double UnitValue = std::abs(quant.getValue());
|
||||
Unit unit = quant.getUnit();
|
||||
|
||||
// now do special treatment on all cases seams nececarry:
|
||||
if(unit == Unit::Length){ // Length handling ============================
|
||||
if(UnitValue < 0.000000001){// smaller then 0.001 nm -> scientific notation
|
||||
// now do special treatment on all cases seems necessary:
|
||||
if (unit == Unit::Length) { // Length handling ============================
|
||||
if (UnitValue < 0.000000001) {// smaller then 0.001 nm -> scientific notation
|
||||
unitString = QString::fromLatin1("mm");
|
||||
factor = 1.0;
|
||||
}else if(UnitValue < 0.001){
|
||||
}
|
||||
else if(UnitValue < 0.001) {
|
||||
unitString = QString::fromLatin1("nm");
|
||||
factor = 0.000001;
|
||||
}else if(UnitValue < 0.1){
|
||||
}
|
||||
else if (UnitValue < 0.1) {
|
||||
unitString = QString::fromUtf8("\xC2\xB5m");
|
||||
factor = 0.001;
|
||||
}else if(UnitValue < 10000.0){
|
||||
}
|
||||
else if (UnitValue < 10000.0) {
|
||||
unitString = QString::fromLatin1("mm");
|
||||
factor = 1.0;
|
||||
}else if(UnitValue < 10000000.0){
|
||||
}
|
||||
else if (UnitValue < 10000000.0) {
|
||||
unitString = QString::fromLatin1("m");
|
||||
factor = 1000.0;
|
||||
}else if(UnitValue < 100000000000.0 ){
|
||||
}
|
||||
else if (UnitValue < 100000000000.0) {
|
||||
unitString = QString::fromLatin1("km");
|
||||
factor = 1000000.0;
|
||||
}else{ // bigger then 1000 km -> scientific notation
|
||||
}
|
||||
else { // bigger then 1000 km -> scientific notation
|
||||
unitString = QString::fromLatin1("mm");
|
||||
factor = 1.0;
|
||||
}
|
||||
}else if (unit == Unit::Area){
|
||||
}
|
||||
else if (unit == Unit::Area) {
|
||||
// TODO Cascade for the Areas
|
||||
// default action for all cases without special treatment:
|
||||
unitString = quant.getUnit().getString();
|
||||
factor = 1.0;
|
||||
}else if (unit == Unit::Angle){
|
||||
// TODO Cascade for the Areas
|
||||
// default action for all cases without special treatment:
|
||||
unitString = QString::fromUtf8("\xC2\xB0");
|
||||
factor = 1.0;
|
||||
}else if (unit == Unit::Mass){
|
||||
// TODO Cascade for the wights
|
||||
// default action for all cases without special treatment:
|
||||
unitString = quant.getUnit().getString();
|
||||
factor = 1.0;
|
||||
}else if (unit == Unit::Density){
|
||||
if(UnitValue < 0.0001){
|
||||
unitString = QString::fromLatin1("kg/m^3");
|
||||
factor = 0.000000001;
|
||||
}else if(UnitValue < 1.0){
|
||||
unitString = QString::fromLatin1("kg/cm^3");
|
||||
factor = 0.001;
|
||||
}else{
|
||||
unitString = QString::fromLatin1("kg/mm^3");
|
||||
factor = 1.0;
|
||||
}
|
||||
}else if (unit == Unit::ThermalConductivity){
|
||||
if (UnitValue < 1000){
|
||||
unitString = QString::fromLatin1("W/mm/K");
|
||||
factor = 1.0;
|
||||
}else{
|
||||
unitString = QString::fromLatin1("W/m/K");
|
||||
factor = 1000.0;
|
||||
}
|
||||
}else if (unit == Unit::ThermalExpansionCoefficient){
|
||||
if(UnitValue < 0.001){
|
||||
unitString = QString::fromLatin1("um/m/K");
|
||||
factor = 0.000001;
|
||||
}else{
|
||||
unitString = QString::fromLatin1("mm/mm/K");
|
||||
factor = 1.0;
|
||||
}
|
||||
}else if (unit == Unit::SpecificHeat){
|
||||
unitString = QString::fromLatin1("J/kg/K");
|
||||
factor = 1000000.0;
|
||||
}else if (unit == Unit::ThermalTransferCoefficient){
|
||||
unitString = QString::fromLatin1("W/m^2/K");
|
||||
factor = 1.0;
|
||||
}else if ((unit == Unit::Pressure) || (unit == Unit::Stress)){
|
||||
if(UnitValue < 10.0){// Pa is the smallest
|
||||
unitString = QString::fromLatin1("Pa");
|
||||
factor = 0.001;
|
||||
}else if(UnitValue < 10000.0){
|
||||
unitString = QString::fromLatin1("kPa");
|
||||
factor = 1.0;
|
||||
}else if(UnitValue < 10000000.0){
|
||||
unitString = QString::fromLatin1("MPa");
|
||||
factor = 1000.0;
|
||||
}else if(UnitValue < 10000000000.0){
|
||||
unitString = QString::fromLatin1("GPa");
|
||||
factor = 1000000.0;
|
||||
}else{ // bigger -> scientific notation
|
||||
unitString = QString::fromLatin1("Pa");
|
||||
factor = 1.0;
|
||||
}
|
||||
}else{
|
||||
// default action for all cases without special treatment:
|
||||
unitString = quant.getUnit().getString();
|
||||
factor = 1.0;
|
||||
}
|
||||
else if (unit == Unit::Angle) {
|
||||
// TODO Cascade for the Areas
|
||||
// default action for all cases without special treatment:
|
||||
unitString = QString::fromUtf8("\xC2\xB0");
|
||||
factor = 1.0;
|
||||
}
|
||||
else if (unit == Unit::Mass) {
|
||||
// TODO Cascade for the wights
|
||||
// default action for all cases without special treatment:
|
||||
unitString = quant.getUnit().getString();
|
||||
factor = 1.0;
|
||||
}
|
||||
else if (unit == Unit::Density) {
|
||||
if (UnitValue < 0.0001) {
|
||||
unitString = QString::fromLatin1("kg/m^3");
|
||||
factor = 0.000000001;
|
||||
}
|
||||
else if (UnitValue < 1.0) {
|
||||
unitString = QString::fromLatin1("kg/cm^3");
|
||||
factor = 0.001;
|
||||
}
|
||||
else {
|
||||
unitString = QString::fromLatin1("kg/mm^3");
|
||||
factor = 1.0;
|
||||
}
|
||||
}
|
||||
else if (unit == Unit::ThermalConductivity) {
|
||||
if (UnitValue < 1000) {
|
||||
unitString = QString::fromLatin1("W/mm/K");
|
||||
factor = 1.0;
|
||||
}
|
||||
else {
|
||||
unitString = QString::fromLatin1("W/m/K");
|
||||
factor = 1000.0;
|
||||
}
|
||||
}
|
||||
else if (unit == Unit::ThermalExpansionCoefficient) {
|
||||
if (UnitValue < 0.001) {
|
||||
unitString = QString::fromLatin1("um/m/K");
|
||||
factor = 0.000001;
|
||||
}
|
||||
else {
|
||||
unitString = QString::fromLatin1("mm/mm/K");
|
||||
factor = 1.0;
|
||||
}
|
||||
}
|
||||
else if (unit == Unit::SpecificHeat) {
|
||||
unitString = QString::fromLatin1("J/kg/K");
|
||||
factor = 1000000.0;
|
||||
}
|
||||
else if (unit == Unit::ThermalTransferCoefficient) {
|
||||
unitString = QString::fromLatin1("W/m^2/K");
|
||||
factor = 1.0;
|
||||
}
|
||||
else if ((unit == Unit::Pressure) || (unit == Unit::Stress)) {
|
||||
if (UnitValue < 10.0) {// Pa is the smallest
|
||||
unitString = QString::fromLatin1("Pa");
|
||||
factor = 0.001;
|
||||
}
|
||||
else if (UnitValue < 10000.0) {
|
||||
unitString = QString::fromLatin1("kPa");
|
||||
factor = 1.0;
|
||||
}
|
||||
else if (UnitValue < 10000000.0) {
|
||||
unitString = QString::fromLatin1("MPa");
|
||||
factor = 1000.0;
|
||||
}
|
||||
else if (UnitValue < 10000000000.0) {
|
||||
unitString = QString::fromLatin1("GPa");
|
||||
factor = 1000000.0;
|
||||
}
|
||||
else { // bigger -> scientific notation
|
||||
unitString = QString::fromLatin1("Pa");
|
||||
factor = 1.0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// default action for all cases without special treatment:
|
||||
unitString = quant.getUnit().getString();
|
||||
factor = 1.0;
|
||||
}
|
||||
|
||||
//return QString::fromUtf8("%L1 %2").arg(quant.getValue() / factor).arg(unitString);
|
||||
QLocale Lc = QLocale::system();
|
||||
Lc.setNumberOptions(Lc.OmitGroupSeparator | Lc.RejectGroupSeparator);
|
||||
|
||||
Reference in New Issue
Block a user