Normalize split chart inside addSeparation

Author: schaumb

src/base/math/range.h

@@ -42,7 +42,8 @@ template <std::floating_point T = double> struct Range
 
 	[[nodiscard]] bool includes(const T &value) const
 	{
-		return !less(value, min) && !less(max, value);
+		return !is_lt(std::weak_order(value, min))
+		    && !is_lt(std::weak_order(max, value));
 	}
 
 	[[nodiscard]] T rescale(const T &value, T def = 0.5) const

src/chart/generator/plotbuilder.cpp

@@ -357,6 +357,7 @@ void PlotBuilder::calcAxises(const Data::DataTable &dataTable,
 	for (auto &&[axis, needRanges, boundSize] :
 	    {std::tuple{mainAxis, mainRanges.empty(), mainBoundRect},
 	        {!mainAxis, subRanges.empty(), subBoundRect}}) {
+		if (!needRanges) continue;
 
 		for (auto &marker : plot->markers) {
 			auto &&markerSize = marker.getSizeBy(axis);
@@ -368,7 +369,7 @@ void PlotBuilder::calcAxises(const Data::DataTable &dataTable,
 			    {boundSize.rescale(markerSize.min, 0.0),
 			        boundSize.rescale(markerSize.max, 0.0)});
 		}
-		if (needRanges) stats.setIfRange(axis, boundSize);
+		stats.setIfRange(axis, boundSize);
 	}
 
 	for (auto &&[ch, ranges] :
@@ -595,17 +596,22 @@ PlotBuilder::addSeparation(const Buckets &buckets,
 		onMax += res[i].containsValues.size();
 	}
 
+	if (plot->getOptions()->coordSystem == CoordSystem::polar
+	    && axisIndex == AxisId::x)
+		onMax += splitSpace;
+
 	for (auto &&bucket : buckets)
 		for (auto &&[marker, idx] : bucket) {
 			auto buc = res[idx.itemId];
 			auto markerSize = marker.getSizeBy(axisIndex);
 
 			marker.setSizeBy(axisIndex,
-			    Base::Align{align,
-			        buc.atRange - buc.atRange.min
-			            + buc.containsValues.min}
+			    (Base::Align{align,
+			         buc.atRange - buc.atRange.min
+			             + buc.containsValues.min}
 			            .getAligned(markerSize - markerSize.min)
-			        + buc.atRange.min - buc.containsValues.min);
+			        + buc.atRange.min - buc.containsValues.min)
+			        / onMax);
 		}
 
 	auto alignedRange = maxRange;

src/chart/options/options.cpp

@@ -293,7 +293,9 @@ std::optional<LegendId> Options::getAutoLegend() const
 	return std::nullopt;
 }
 
-void Options::setAutoRange(bool hPositive, bool vPositive)
+void Options::setAutoRange(bool hPositive,
+    bool vPositive,
+    bool isSplit)
 {
 	auto &v = getChannels().at(AxisId::y);
 	auto &h = getChannels().at(AxisId::x);
@@ -302,7 +304,7 @@ void Options::setAutoRange(bool hPositive, bool vPositive)
 	auto &&cart = coordSystem.get() == CoordSystem::cartesian;
 	auto &&nrect = geometry != ShapeType::rectangle;
 
-	if (cart && hHasMeasure && (!vHasMeasure || nrect))
+	if ((cart || isSplit) && hHasMeasure && (!vHasMeasure || nrect))
 		setMeasureRange(h, hPositive);
 	else if (!cart && hHasMeasure && !vHasMeasure && v.hasDimension())
 		setRange(h, 0.0_perc, 133.0_perc);

src/chart/options/options.h

@@ -168,7 +168,9 @@ class Options : public OptionProperties
 	static MarkerInfoId generateMarkerInfoId();
 
 	void setAutoParameters();
-	void setAutoRange(bool hPositive, bool vPositive);
+	void setAutoRange(bool hPositive,
+	    bool vPositive,
+	    bool isSplit = false);
 
 	[[nodiscard]] bool labelsShownFor(
 	    const Data::SeriesIndex &series) const;

src/chart/rendering/drawaxes.cpp

@@ -176,15 +176,19 @@ const DrawAxes &&DrawAxes::init() &&
 		if (measEnabled == 0.0) continue;
 		auto step = axis.measure.step.combine();
 
+		using Math::Floating::less;
+
 		auto &&[min, max] = std::minmax(
 		    axis.measure.step.get_or_first(::Anim::first).value,
 		    axis.measure.step.get_or_first(::Anim::second).value,
-		    Math::Floating::less);
+		    less);
 
 		auto stepHigh =
-		    std::clamp(Math::Renard::R5().ceil(step), min, max);
-		auto stepLow =
-		    std::clamp(Math::Renard::R5().floor(step), min, max);
+		    std::clamp(Math::Renard::R5().ceil(step), min, max, less);
+		auto stepLow = std::clamp(Math::Renard::R5().floor(step),
+		    min,
+		    max,
+		    less);
 
 		if (Math::Floating::is_zero(axis.measure.range.size()))
 			step = stepHigh = stepLow = 1.0;