Corrected adjustment to number of decimal places when printing floats

2 files changed, 2 insertions, 16 deletions

diff --git a/src/ObjectModel/ObjectModel.cpp b/src/ObjectModel/ObjectModel.cpp
index b8e2c9ea..714f4470 100644
--- a/src/ObjectModel/ObjectModel.cpp
+++ b/src/ObjectModel/ObjectModel.cpp
@@ -193,20 +193,6 @@ void ExpressionValue::Release() noexcept
 	}
 }
 
-// Get the format string to use assuming this is a floating point number
-const char *_ecv_array ExpressionValue::GetFloatFormatString() const noexcept
-{
-	float f = 1.0;
-	unsigned int digitsAfterPoint = param;
-	while (digitsAfterPoint > 1 && fVal > f)
-	{
-		f *= 10.0;
-		--digitsAfterPoint;
-	}
-
-	return ::GetFloatFormatString(digitsAfterPoint);
-}
-
 #if SUPPORT_CAN_EXPANSION
 
 // Given that this is a CanExpansionBoardDetails value, extract the part requested according to the parameter and append it to the string
diff --git a/src/ObjectModel/ObjectModel.h b/src/ObjectModel/ObjectModel.h
index bcf77791..5a9227f2 100644
--- a/src/ObjectModel/ObjectModel.h
+++ b/src/ObjectModel/ObjectModel.h
@@ -71,7 +71,7 @@ class UniqueId;
 // Encapsulated time_t, used to facilitate overloading the ExpressionValue constructor
 struct DateTime
 {
-	explicit DateTime(time_t t) : tim(t) { }
+	explicit DateTime(time_t t) noexcept : tim(t) { }
 
 	time_t tim;
 };
@@ -192,7 +192,7 @@ struct ExpressionValue
 #endif
 
 	// Get the format string to use assuming this is a floating point number
-	const char *_ecv_array GetFloatFormatString() const noexcept;
+	const char *_ecv_array GetFloatFormatString() const noexcept { return ::GetFloatFormatString(fVal, param); }
 
 	// Append a string representation of this value to a string
 	void AppendAsString(const StringRef& str) const noexcept;