From 1b0d59940b4906530db13c9670d08ebdf4029371 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Thu, 9 Jan 2025 23:54:00 +0100 Subject: [PATCH] Update unit switch points --- openVulkanoCpp/Base/UnitFormatter.cpp | 4 ++-- tests/Base/UnitFormatterTest.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openVulkanoCpp/Base/UnitFormatter.cpp b/openVulkanoCpp/Base/UnitFormatter.cpp index a2ee422..499bb26 100644 --- a/openVulkanoCpp/Base/UnitFormatter.cpp +++ b/openVulkanoCpp/Base/UnitFormatter.cpp @@ -43,7 +43,7 @@ namespace OpenVulkano { 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"); } @@ -58,7 +58,7 @@ namespace OpenVulkano auto distanceFeet = units::length::foot_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"); } diff --git a/tests/Base/UnitFormatterTest.cpp b/tests/Base/UnitFormatterTest.cpp index 8f2d2b3..8d7e5d0 100644 --- a/tests/Base/UnitFormatterTest.cpp +++ b/tests/Base/UnitFormatterTest.cpp @@ -24,7 +24,7 @@ TEST_CASE("testUnitFormatterWithTrailingZeros", "[UnitFormatter]") units::area::square_meter_t negativeArea(-50.0); 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(smallArea) == "0.01 m²"); REQUIRE(metricFormatter.Format(negativeArea) == "-50.00 m²"); @@ -52,7 +52,7 @@ TEST_CASE("testUnitFormatterWithoutTrailingZeros", "[UnitFormatter]") units::area::square_meter_t negativeArea(-50.0); 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(smallArea) == "0.01 m²"); REQUIRE(metricFormatter.Format(negativeArea) == "-50 m²"); @@ -63,6 +63,6 @@ TEST_CASE("testUnitFormatterWithoutTrailingZeros", "[UnitFormatter]") REQUIRE(metricFormatter.Format(smallDistanceMetric) == "50 mm"); REQUIRE(imperialFormatter.Format(smallDistanceImperial) == "1.18 in"); 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"); } \ No newline at end of file