Number precision style settings added.

simzer · simzer · commit e910ef316690 · 2021-12-16T13:52:26.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
   animation control methods are chainable.
 - CSS properties can be used to style vizzu charts
   E.g. `--vizzu-plot-marker-colorPalette: whatever` for `{style: {plot: {marker: {colorPalette: "whatever"}}}}`
+- `maxFractionDigits` style parameter added to labels showing numbers.
 - WASM build size reduction.
 
 ### Fixed
diff --git a/src/apps/weblib/js-api/vizzu.d.ts b/src/apps/weblib/js-api/vizzu.d.ts
@@ -279,6 +279,9 @@ interface Text {
 	    data such as marker and axis labels. 'grouped' uses thousand separators, 
 		'prefixed' uses scientific notation. */
 	numberFormat?: 'none'|'grouped'|'prefixed'|null;
+	/** The maximum number of digits in fraction part if the text contains a 
+	    number. */
+	maxFractionDigits?: number|null;
 }
 
 /** The following CSS like filters can be used to alter the color: 
diff --git a/src/base/conv/numtostr.h b/src/base/conv/numtostr.h
@@ -35,4 +35,4 @@ class NumberToString {
 
 }
 
-#endif //CONV_NUMTOSTR
+#endif
diff --git a/src/base/text/smartstring.cpp b/src/base/text/smartstring.cpp
@@ -71,26 +71,6 @@ void SmartString::trimBOM(std::string &string)
 	}
 }
 
-std::string SmartString::fromNumber(double value, NumberFormat format)
-{
-	switch(format) {
-		case NumberFormat::prefixed: {
-			return humanReadable(value);
-		}
-		case NumberFormat::grouped: {
-			Conv::NumberToString converter;
-			converter.fractionDigitCount = 10;
-			converter.integerGgrouping = ' ';
-			return converter(value);
-		}
-		default:
-		case NumberFormat::none: {
-			Conv::NumberToString converter;
-			return converter(value);
-		}
-	}
-}
-
 std::vector<std::string> SmartString::split(
 	const std::string &str, char delim, bool ignoreEmpty)
 {
@@ -139,15 +119,15 @@ std::vector<std::string> SmartString::split(const std::string &str,
 	return result;
 }
 
-std::string SmartString::humanReadable(double value, int digits,
-	const std::vector<std::string> &prefixes)
+std::string SmartString::fromNumber(double value, size_t digits)
 {
-	Math::EngineeringNumber num(value);
+	auto negative = value < 0;
+	auto absValue = std::abs(value);
 
-	std::string res = std::to_string(num.coefficient);
+	std::string res = std::to_string(absValue);
 
-	if (!Math::Floating(num.coefficient).isInteger()
-		&& num.coefficient < pow(10, digits - 1))
+	if (!Math::Floating(absValue).isInteger()
+		&& absValue < pow(10, digits - 1))
 	{
 		res = res.substr(0, digits + 1);
 	}
@@ -163,15 +143,49 @@ std::string SmartString::humanReadable(double value, int digits,
 			if (ch == '.') break;
 		}
 
-	if(!num.positive)
-		res = '-' + res;
+	if(negative) res = '-' + res;
+
+	return res;
+}
+
+std::string SmartString::fromNumber(
+	double value, 
+	NumberFormat format, 
+	size_t maxFractionDigits)
+{
+	switch(format) {
+		case NumberFormat::prefixed: {
+			return humanReadable(value, maxFractionDigits);
+		}
+		case NumberFormat::grouped: {
+			Conv::NumberToString converter;
+			converter.fractionDigitCount = maxFractionDigits;
+			converter.integerGgrouping = ' ';
+			return converter(value);
+		}
+		default:
+		case NumberFormat::none: {
+			Conv::NumberToString converter;
+			converter.fractionDigitCount = maxFractionDigits;
+			return converter(value);
+		}
+	}
+}
+
+std::string SmartString::humanReadable(double value, int maxFractionDigits,
+	const std::vector<std::string> &prefixes)
+{
+	Math::EngineeringNumber num(value);
+
+	std::string res = fromNumber(num.coefficient,
+		NumberFormat::none, maxFractionDigits);
 
 	if (num.exponent >= 0 && num.exponent < (int)prefixes.size())
 	{
 		auto prefix = prefixes.at(num.exponent);
 		return res + (!prefix.empty() ? " " + prefix : "");
 	}
-	else return fromNumber(value);
+	else return fromNumber(value, NumberFormat::none, maxFractionDigits);
 }
 
 std::string SmartString::deescape(const std::string &str)
diff --git a/src/base/text/smartstring.h b/src/base/text/smartstring.h
@@ -65,11 +65,14 @@ class SmartString
 
 	static void trimBOM(std::string &string);
 
+	static std::string fromNumber(double value, size_t digits);
+
 	static std::string fromNumber(double value,
-		NumberFormat format = NumberFormat::none);
+		NumberFormat format = NumberFormat::none,
+		size_t maxFractionDigits = 2);
 
 	static std::string humanReadable(double value,
-	    int digits = 6,
+	    int maxFractionDigits = 2,
 	    const std::vector<std::string> &prefixes
 	        = {"", "k", "M", "G", "T", "P", "E", "Z", "Y"});
 
diff --git a/src/chart/generator/marker.cpp b/src/chart/generator/marker.cpp
@@ -154,8 +154,7 @@ std::string Marker::toJson(const Data::DataCube &data) const {
 			"\"values\":{"
 				+ Text::SmartString::join(values, ",") +
 			"},"
-			"\"id\":"
-				+ Text::SmartString::fromNumber(idx) +
+			"\"id\":" + std::to_string(idx) +
 		"}";
 }
 
diff --git a/src/chart/main/style.cpp b/src/chart/main/style.cpp
@@ -98,7 +98,8 @@ Chart Chart::def()
 								.textAlign = Anim::Interpolated<Text::TextAlign>
 									(Text::TextAlign::center),
 								.backgroundColor = Gfx::Color(),
-								.numberFormat = ::Text::NumberFormat::grouped
+								.numberFormat = ::Text::NumberFormat::grouped,
+								.maxFractionDigits = 3
 							}
 						},
 						.orientation = Anim::Interpolated
@@ -133,7 +134,8 @@ Chart Chart::def()
 							.textAlign = Anim::Interpolated<Text::TextAlign>
 								(Text::TextAlign::left),
 							.backgroundColor = Gfx::Color(),
-							.numberFormat = ::Text::NumberFormat::prefixed
+							.numberFormat = ::Text::NumberFormat::prefixed,
+							.maxFractionDigits = 3
 						}
 					},
 					.position = Anim::Interpolated<AxisTitle::Position>
@@ -167,7 +169,8 @@ Chart Chart::def()
 								.textAlign = Anim::Interpolated<Text::TextAlign>
 										(Text::TextAlign::left),
 								.backgroundColor = Gfx::Color(),
-								.numberFormat = ::Text::NumberFormat::prefixed
+								.numberFormat = ::Text::NumberFormat::prefixed,
+								.maxFractionDigits = 3
 							}
 						},
 						.orientation = Anim::Interpolated
@@ -216,7 +219,8 @@ Chart Chart::def()
 							.textAlign = Anim::Interpolated<Text::TextAlign>
 								(Text::TextAlign::left),
 							.backgroundColor = Gfx::Color(),
-			 				.numberFormat = ::Text::NumberFormat::prefixed
+			 				.numberFormat = ::Text::NumberFormat::prefixed,
+							.maxFractionDigits = 3
 						}
 					},
 					.position = Anim::Interpolated<AxisTitle::Position>
@@ -250,7 +254,8 @@ Chart Chart::def()
 								.textAlign = Anim::Interpolated<Text::TextAlign>
 										(Text::TextAlign::left),
 								.backgroundColor = Gfx::Color(),
-								.numberFormat = ::Text::NumberFormat::prefixed
+								.numberFormat = ::Text::NumberFormat::prefixed,
+								.maxFractionDigits = 3
 							}
 						},
 						.orientation = Anim::Interpolated
@@ -313,7 +318,8 @@ Chart Chart::def()
 					.textAlign = Anim::Interpolated<Text::TextAlign>
 								(Text::TextAlign::left),
 					.backgroundColor = Gfx::Color(),
-					.numberFormat = ::Text::NumberFormat::prefixed
+					.numberFormat = ::Text::NumberFormat::prefixed,
+					.maxFractionDigits = 3
 				},
 			},
 			.label = {
@@ -334,7 +340,8 @@ Chart Chart::def()
 					.textAlign = Anim::Interpolated<Text::TextAlign>
 								(Text::TextAlign::left),
 					.backgroundColor = Gfx::Color(),
-					.numberFormat = ::Text::NumberFormat::prefixed
+					.numberFormat = ::Text::NumberFormat::prefixed,
+					.maxFractionDigits = 3
 				},
 			},
 			.marker = {
@@ -361,7 +368,8 @@ Chart Chart::def()
 				.textAlign = Anim::Interpolated<Text::TextAlign>
 								(Text::TextAlign::center),
 				.backgroundColor = Gfx::Color(),
-				.numberFormat = ::Text::NumberFormat::prefixed
+				.numberFormat = ::Text::NumberFormat::prefixed,
+				.maxFractionDigits = 3
 			},
 		},
 		.tooltip = {
diff --git a/src/chart/main/style.h b/src/chart/main/style.h
@@ -117,14 +117,16 @@ struct Text {
 	Param<Anim::Interpolated<TextAlign>> textAlign;
 	Param<Gfx::Color> backgroundColor;
 	Param<::Text::NumberFormat> numberFormat;
+	Param<double> maxFractionDigits;
 
 	void visit(auto &visitor)
 	{
 		visitor
 			(color, "color")
 			(textAlign, "textAlign")
 			(backgroundColor, "backgroundColor")
-			(numberFormat, "numberFormat");
+			(numberFormat, "numberFormat")
+			(maxFractionDigits, "maxFractionDigits");
 	}
 };
 
diff --git a/src/chart/rendering/drawinterlacing.cpp b/src/chart/rendering/drawinterlacing.cpp
@@ -185,7 +185,8 @@ void drawInterlacing::drawDataLabel(bool horizontal,
 	auto &labelStyle = style.plot.getAxis(axisIndex).label;
 
 	auto str = Text::SmartString::fromNumber(value,
-	    *labelStyle.numberFormat);
+		*labelStyle.numberFormat,
+		*labelStyle.maxFractionDigits);
 
 	if (!unit.empty())
 	{
diff --git a/src/chart/rendering/drawitem.cpp b/src/chart/rendering/drawitem.cpp
@@ -250,7 +250,8 @@ std::string drawItem::getLabelText(size_t index) const
 	if (values[index].value.hasValue())
 	{
 		valueStr = Text::SmartString::fromNumber(value,
-		    *labelStyle.numberFormat);
+		    *labelStyle.numberFormat,
+		    *labelStyle.maxFractionDigits);
 
 		if(!values[index].value.unit.empty())
 		{
diff --git a/src/chart/rendering/drawlegend.cpp b/src/chart/rendering/drawlegend.cpp
@@ -144,8 +144,9 @@ void drawLegend::drawContinous(const Diag::Axis &axis)
 
 void drawLegend::extremaLabel(double value, int pos)
 {
-	auto format = *style.label.numberFormat;
-	auto text = Text::SmartString::fromNumber(value, format);
+	auto text = Text::SmartString::fromNumber(value, 
+		*style.label.numberFormat,
+		*style.label.maxFractionDigits);
 	auto itemRect = getItemRect(pos);
 	drawLabel(getLabelRect(itemRect), text, style.label, 
 		events.label, canvas, true, weight * enabled);
diff --git a/src/data/table/columninfo.cpp b/src/data/table/columninfo.cpp
@@ -164,13 +164,6 @@ double ColumnInfo::registerValue(const std::string &value)
 	throw std::logic_error("internal error, no series type");
 }
 
-std::string ColumnInfo::valueAsString(double value) const
-{
-	if (type == Continous) return Text::SmartString::fromNumber(value);
-	if (type == Discrete) return values.at(value);
-	return "N.A.";
-}
-
 std::string ColumnInfo::toString(double value) const
 {
 	if (type == Continous) return std::to_string(value);
diff --git a/src/data/table/columninfo.h b/src/data/table/columninfo.h
@@ -40,7 +40,6 @@ class ColumnInfo
 
 	double registerValue(const std::string &value);
 	double registerValue(double value);
-	std::string valueAsString(double value) const;
 	std::string toString(double value) const;
 	const char *toDiscreteString(double value) const;
 
diff --git a/test/unit/base/conv/numtostr.cpp b/test/unit/base/conv/numtostr.cpp
@@ -45,6 +45,7 @@ static auto tests = collection::add_suite("Conv::NumberToString")
 	check() << converter(12345678) == "12345678";
 	check() << converter(123456789) == "123456789";
 	check() << converter(123456789123) == "123456789123";
+	check() << converter(12345678912345678) == "12345678912345678";
 })
 
 .add_case( "NumberToString digit groupping conversion",

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,9 @@ interface Text {`
`279`	`279`	`data such as marker and axis labels. 'grouped' uses thousand separators,`
`280`	`280`	`'prefixed' uses scientific notation. */`
`281`	`281`	`numberFormat?: 'none'\|'grouped'\|'prefixed'\|null;`
	`282`	`+ /** The maximum number of digits in fraction part if the text contains a`
	`283`	`+ number. */`
	`284`	`+ maxFractionDigits?: number\|null;`
`282`	`285`	`}`
`283`	`286`
`284`	`287`	`/** The following CSS like filters can be used to alter the color:`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,4 @@ class NumberToString {`
`35`	`35`
`36`	`36`	`}`
`37`	`37`
`38`		`-#endif //CONV_NUMTOSTR`
	`38`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,7 @@ std::string Marker::toJson(const Data::DataCube &data) const {`
`154`	`154`	`"\"values\":{"`
`155`	`155`	`+ Text::SmartString::join(values, ",") +`
`156`	`156`	`"},"`
`157`		`- "\"id\":"`
`158`		`- + Text::SmartString::fromNumber(idx) +`
	`157`	`+ "\"id\":" + std::to_string(idx) +`
`159`	`158`	`"}";`
`160`	`159`	`}`
`161`	`160`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,8 @@ void drawInterlacing::drawDataLabel(bool horizontal,`
`185`	`185`	`auto &labelStyle = style.plot.getAxis(axisIndex).label;`
`186`	`186`
`187`	`187`	`auto str = Text::SmartString::fromNumber(value,`
`188`		`- *labelStyle.numberFormat);`
	`188`	`+ *labelStyle.numberFormat,`
	`189`	`+ *labelStyle.maxFractionDigits);`
`189`	`190`
`190`	`191`	`if (!unit.empty())`
`191`	`192`	`{`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,8 @@ std::string drawItem::getLabelText(size_t index) const`
`250`	`250`	`if (values[index].value.hasValue())`
`251`	`251`	`{`
`252`	`252`	`valueStr = Text::SmartString::fromNumber(value,`
`253`		`- *labelStyle.numberFormat);`
	`253`	`+ *labelStyle.numberFormat,`
	`254`	`+ *labelStyle.maxFractionDigits);`
`254`	`255`
`255`	`256`	`if(!values[index].value.unit.empty())`
`256`	`257`	`{`