GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update unit switch points

Browse Source
This commit is contained in:
Georg Hagen
2025-01-09 23:54:00 +01:00
parent 5d7ef49142
commit 1b0d59940b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openVulkanoCpp/Base/UnitFormatter.cpp
View File

@@ -43,7 +43,7 @@ namespace OpenVulkano
{ {
if (metric) if (metric)
{ {
if (distance > units::length::meter_t(0) && distance < units::length::meter_t(0.1)) if (distance > units::length::meter_t(0) && distance < units::length::meter_t(1))
{ {
return FormatValue(units::length::millimeter_t(distance).value(), precision, trimTrailingZeros, " mm"); return FormatValue(units::length::millimeter_t(distance).value(), precision, trimTrailingZeros, " mm");
} }
@@ -58,7 +58,7 @@ namespace OpenVulkano
auto distanceFeet = units::length::foot_t(distance).value(); auto distanceFeet = units::length::foot_t(distance).value();
auto distanceInches = units::length::inch_t(distance).value(); auto distanceInches = units::length::inch_t(distance).value();
if (distanceFeet > 0 && distanceFeet < 0.1) if (distanceFeet > 0 && distanceFeet < 1)
{ {
return FormatValue(distanceInches, precision, trimTrailingZeros, " in"); return FormatValue(distanceInches, precision, trimTrailingZeros, " in");
} }

6
tests/Base/UnitFormatterTest.cpp
View File

@@ -24,7 +24,7 @@ TEST_CASE("testUnitFormatterWithTrailingZeros", "[UnitFormatter]")
units::area::square_meter_t negativeArea(-50.0); units::area::square_meter_t negativeArea(-50.0);
REQUIRE(metricFormatter.Format(positiveDistance) == "1.50 km"); REQUIRE(metricFormatter.Format(positiveDistance) == "1.50 km");
REQUIRE(metricFormatter.Format(smallDistance) == "0.50 m"); REQUIRE(metricFormatter.Format(smallDistance) == "500.00 mm");
REQUIRE(metricFormatter.Format(negativeDistance) == "-100.00 m"); REQUIRE(metricFormatter.Format(negativeDistance) == "-100.00 m");
REQUIRE(metricFormatter.Format(smallArea) == "0.01 m²"); REQUIRE(metricFormatter.Format(smallArea) == "0.01 m²");
REQUIRE(metricFormatter.Format(negativeArea) == "-50.00 m²"); REQUIRE(metricFormatter.Format(negativeArea) == "-50.00 m²");
@@ -52,7 +52,7 @@ TEST_CASE("testUnitFormatterWithoutTrailingZeros", "[UnitFormatter]")
units::area::square_meter_t negativeArea(-50.0); units::area::square_meter_t negativeArea(-50.0);
REQUIRE(metricFormatter.Format(positiveDistance) == "1.5 km"); REQUIRE(metricFormatter.Format(positiveDistance) == "1.5 km");
REQUIRE(metricFormatter.Format(smallDistance) == "0.5 m"); REQUIRE(metricFormatter.Format(smallDistance) == "500 mm");
REQUIRE(metricFormatter.Format(negativeDistance) == "-100 m"); REQUIRE(metricFormatter.Format(negativeDistance) == "-100 m");
REQUIRE(metricFormatter.Format(smallArea) == "0.01 m²"); REQUIRE(metricFormatter.Format(smallArea) == "0.01 m²");
REQUIRE(metricFormatter.Format(negativeArea) == "-50 m²"); REQUIRE(metricFormatter.Format(negativeArea) == "-50 m²");
@@ -63,6 +63,6 @@ TEST_CASE("testUnitFormatterWithoutTrailingZeros", "[UnitFormatter]")
REQUIRE(metricFormatter.Format(smallDistanceMetric) == "50 mm"); REQUIRE(metricFormatter.Format(smallDistanceMetric) == "50 mm");
REQUIRE(imperialFormatter.Format(smallDistanceImperial) == "1.18 in"); REQUIRE(imperialFormatter.Format(smallDistanceImperial) == "1.18 in");
REQUIRE(metricFormatter.Format(smallDistanceMetric) == "50 mm"); REQUIRE(metricFormatter.Format(smallDistanceMetric) == "50 mm");
REQUIRE(metricFormatter.Format(mediumDistanceMetric) == "0.5 m"); REQUIRE(metricFormatter.Format(mediumDistanceMetric) == "500 mm");
REQUIRE(metricFormatter.Format(largeDistanceMetric) == "100 m"); REQUIRE(metricFormatter.Format(largeDistanceMetric) == "100 m");
} }