Merge remote-tracking branch 'origin/simon' into main

Author: simzer

CHANGELOG.md

@@ -7,6 +7,8 @@
 
 - Parts of markers outside of plot area are getting clipped. This behaviour can 
   be controlled by style.plot.overflow parameter.
+- channel title parameter has "auto" value by default. "null" will title switch
+  off.
 
 ### Fixed
 

src/apps/weblib/js-api/vizzu.d.ts

@@ -113,9 +113,9 @@ interface ChannelRange {
 	axis or legend. */
 interface Channel {
 	/** This title is shown on the axis or legend corresponding to the channel.
-	    If not specified, the title will be the name of the measure attached to
+	    If 'auto', the title will be the name of the measure attached to
 	    that channel. */
-	title?: string|null;
+	title?: string|'auto'|null;
 	/** List of {@link Data.Series.name|data series names} on the 
 	    channel. */
 	set? : Data.SeriesList|null;

src/chart/generator/diagram.cpp

@@ -247,8 +247,10 @@ Axis Diagram::calcAxis(ScaleId type, const Data::DataTable &dataTable)
 	if (!scale.isEmpty() && !scale.isPseudoDiscrete())
 	{
 		auto title =
-			scale.title.get().empty()
+			scale.title.get() == "auto" 
 			? scale.continousName(dataTable)
+			: scale.title.get() == "null"
+			? std::string()
 			: scale.title.get();
 
 		if (type == options->subAxisType()
@@ -278,7 +280,10 @@ void Diagram::calcDiscreteAxis(ScaleId type,
 
 	if (scale.discretesIds().empty() || !scale.isPseudoDiscrete()) return;
 
-	axis.title = scale.title.get();
+	axis.title =
+		scale.title.get() == "auto" || scale.title.get() == "null"
+		? std::string()
+		: scale.title.get();
 
 	if (type == ScaleId::x || type == ScaleId::y)
 	{

src/chart/options/scale.cpp

@@ -102,7 +102,7 @@ void Scale::reset()
 {
 	continousId = std::nullopt;
 	discretesIds->clear();
-	title.set(std::string());
+	title.set("auto");
 	labelLevel.set(0);
 }