diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp index 2716d60cbf..ed3c20acef 100644 --- a/src/Base/UnitsApi.cpp +++ b/src/Base/UnitsApi.cpp @@ -65,56 +65,56 @@ int UnitsApi::UserPrefDecimals = 2; QString UnitsApi::getDescription(UnitSystem system) { switch (system) { - case UnitSystem::SI1: - return tr("Standard (mm, kg, s, degree)"); - case UnitSystem::SI2: - return tr("MKS (m, kg, s, degree)"); - case UnitSystem::Imperial1: - return tr("US customary (in, lb)"); - case UnitSystem::ImperialDecimal: - return tr("Imperial decimal (in, lb)"); - case UnitSystem::Centimeters: - return tr("Building Euro (cm, m², m³)"); - case UnitSystem::ImperialBuilding: - return tr("Building US (ft-in, sqft, cft)"); - case UnitSystem::MmMin: - return tr("Metric small parts & CNC(mm, mm/min)"); - case UnitSystem::ImperialCivil: - return tr("Imperial for Civil Eng (ft, ft/sec)"); - case UnitSystem::FemMilliMeterNewton: - return tr("FEM (mm, N, s)"); - case UnitSystem::MeterDecimal: - return tr("Meter decimal (m, m², m³)"); - default: - return tr("Unknown schema"); + case UnitSystem::SI1: + return tr("Standard (mm, kg, s, degree)"); + case UnitSystem::SI2: + return tr("MKS (m, kg, s, degree)"); + case UnitSystem::Imperial1: + return tr("US customary (in, lb)"); + case UnitSystem::ImperialDecimal: + return tr("Imperial decimal (in, lb)"); + case UnitSystem::Centimeters: + return tr("Building Euro (cm, m², m³)"); + case UnitSystem::ImperialBuilding: + return tr("Building US (ft-in, sqft, cft)"); + case UnitSystem::MmMin: + return tr("Metric small parts & CNC(mm, mm/min)"); + case UnitSystem::ImperialCivil: + return tr("Imperial for Civil Eng (ft, ft/sec)"); + case UnitSystem::FemMilliMeterNewton: + return tr("FEM (mm, N, s)"); + case UnitSystem::MeterDecimal: + return tr("Meter decimal (m, m², m³)"); + default: + return tr("Unknown schema"); } } UnitsSchemaPtr UnitsApi::createSchema(UnitSystem system) { switch (system) { - case UnitSystem::SI1: - return std::make_unique(); - case UnitSystem::SI2: - return std::make_unique(); - case UnitSystem::Imperial1: - return std::make_unique(); - case UnitSystem::ImperialDecimal: - return std::make_unique(); - case UnitSystem::Centimeters: - return std::make_unique(); - case UnitSystem::ImperialBuilding: - return std::make_unique(); - case UnitSystem::MmMin: - return std::make_unique(); - case UnitSystem::ImperialCivil: - return std::make_unique(); - case UnitSystem::FemMilliMeterNewton: - return std::make_unique(); - case UnitSystem::MeterDecimal: - return std::make_unique(); - default: - break; + case UnitSystem::SI1: + return std::make_unique(); + case UnitSystem::SI2: + return std::make_unique(); + case UnitSystem::Imperial1: + return std::make_unique(); + case UnitSystem::ImperialDecimal: + return std::make_unique(); + case UnitSystem::Centimeters: + return std::make_unique(); + case UnitSystem::ImperialBuilding: + return std::make_unique(); + case UnitSystem::MmMin: + return std::make_unique(); + case UnitSystem::ImperialCivil: + return std::make_unique(); + case UnitSystem::FemMilliMeterNewton: + return std::make_unique(); + case UnitSystem::MeterDecimal: + return std::make_unique(); + default: + break; } return nullptr; diff --git a/src/Base/UnitsSchema.h b/src/Base/UnitsSchema.h index e6e6c11f30..7eb3c86ca4 100644 --- a/src/Base/UnitsSchema.h +++ b/src/Base/UnitsSchema.h @@ -34,7 +34,8 @@ namespace Base /** Units systems */ enum class UnitSystem { - SI1 = 0, /** internal (mm,kg,s) SI system (http://en.wikipedia.org/wiki/International_System_of_Units) */ + SI1 = 0, /** internal (mm,kg,s) SI system + (http://en.wikipedia.org/wiki/International_System_of_Units) */ SI2 = 1, /** MKS (m,kg,s) SI system */ Imperial1 = 2, /** the Imperial system (http://en.wikipedia.org/wiki/Imperial_units) */ ImperialDecimal = 3, /** Imperial with length in inch only */ @@ -43,8 +44,8 @@ enum class UnitSystem MmMin = 6, /** Lengths in mm, Speed in mm/min. Angle in degrees. Useful for small parts & CNC */ ImperialCivil = 7, /** Lengths in ft, Speed in ft/sec. Used in Civil Eng in North America */ FemMilliMeterNewton = 8, /** Lengths in mm, Mass in t, TimeSpan in s, thus force is in N */ - MeterDecimal = 9, /** Lengths in metres always */ - NumUnitSystemTypes // must be the last item! + MeterDecimal = 9, /** Lengths in metres always */ + NumUnitSystemTypes // must be the last item! }; diff --git a/src/Base/UnitsSchemaMeterDecimal.cpp b/src/Base/UnitsSchemaMeterDecimal.cpp index f9d2c2898b..c3cb27d5ae 100644 --- a/src/Base/UnitsSchemaMeterDecimal.cpp +++ b/src/Base/UnitsSchemaMeterDecimal.cpp @@ -30,7 +30,7 @@ #include "PreCompiled.h" #ifdef __GNUC__ -# include +#include #endif #include @@ -41,7 +41,9 @@ using namespace Base; -QString UnitsSchemaMeterDecimal::schemaTranslate(const Base::Quantity& quant, double &factor, QString &unitString) +QString UnitsSchemaMeterDecimal::schemaTranslate(const Base::Quantity& quant, + double& factor, + QString& unitString) { Unit unit = quant.getUnit(); if (unit == Unit::Length) {