kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: add back Imperial for Civil Engineering unit conversions

Browse Source 
Fixes: 1155f0d752 ("Base: simplify UnitsSchemas management")
This commit is contained in:
Ladislav Michl
2025-08-27 14:20:10 +02:00
parent 02e02b56a9
commit 1cd47c2dd4
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Base/UnitsSchemasData.h
View File

@@ -628,9 +628,16 @@ inline const UnitsSchemaSpec s8
};
inline const UnitsSchemaSpec s9
{ 7, "ImperialCivil", "ft", false, true, QT_TRANSLATE_NOOP("UnitsApi", "Imperial for Civil Eng (ft, ft/s)"), false,
{ 7, "ImperialCivil", "ft", false, true, QT_TRANSLATE_NOOP("UnitsApi", "Imperial for Civil Eng (ft, lb, mph)"), false,
{
{ "Angle" , {{ 0 , "toDMS" , 0 }}} // <== !
{ "Length" , {{ 0 , "ft" , 12 * 25.4 }}},
{ "Area" , {{ 0 , "ft^2" , 92'903.04 }}},
{ "Volume" , {{ 0 , "ft^3" , 28'316'846.592 }}},
{ "Mass" , {{ 0 , "lb" , 0.45359237 }}},
{ "Pressure" , {{ 0 , "psi" , 6.894744825494 }}},
{ "Stiffness", {{ 0 , "lbf/in", 4.448222 / 0.0254 }}},
{ "Velocity" , {{ 0 , "mph" , 447.04 }}},
{ "Angle" , {{ 0 , "toDMS" , 0 }}} // <== !
}
};

4
tests/src/Base/SchemaTests.cpp
View File

@@ -298,7 +298,7 @@ TEST_F(SchemaTest, imperial_decimal_0_mm_precision_1)
TEST_F(SchemaTest, imperial_civil_0_mm_precision_0)
{
const std::string result = setWithPrecision("ImperialCivil", 0.0, Unit::Length, 0);
const auto expect {"0 mm"};
const auto expect {"0 ft"};
EXPECT_EQ(result, expect);
}
@@ -306,7 +306,7 @@ TEST_F(SchemaTest, imperial_civil_0_mm_precision_0)
TEST_F(SchemaTest, imperial_civil_0_mm_precision_1)
{
const std::string result = setWithPrecision("ImperialCivil", 0.0, Unit::Length, 1);
const auto expect {"0.0 mm"};
const auto expect {"0.0 ft"};
EXPECT_EQ(result, expect);
}