fix center align + axis + override

Author: schaumb

src/chart/generator/plotbuilder.cpp

@@ -345,10 +345,6 @@ void PlotBuilder::calcAxises(const Data::DataTable &dataTable,
 	        (mainAxis == AxisId::x ? subBoundRect : mainBoundRect)
 	            .min));
 
-	if (!mainRanges.empty())
-		plot->getOptions()->mainAxis().range = {};
-	if (!subRanges.empty()) plot->getOptions()->subAxis().range = {};
-
 	mainBoundRect =
 	    plot->getOptions()->mainAxis().range.getRange(mainBoundRect);
 	subBoundRect =
@@ -526,7 +522,7 @@ void PlotBuilder::addAlignment(const Buckets &buckets,
 	if (axisProps.align == Base::Align::Type::none) return;
 
 	if (axisProps.align == Base::Align::Type::center) {
-		auto &&halfSize = axisRange.size() / 2.0;
+		auto &&halfSize = axisRange.middle();
 		axisRange = {axisRange.min - halfSize,
 		    axisRange.max - halfSize};
 	}
@@ -585,19 +581,21 @@ PlotBuilder::addSeparation(const Buckets &buckets,
 	        max.size(),
 	        plot->getStyle().calculatedSize());
 
-	res[0].atRange =
-	    res[0].containsValues - res[0].containsValues.min;
-	auto onMax = res[0].containsValues.size();
-	for (auto i = 1U; i < res.size(); ++i) {
-		if (!res[i].enabled) continue;
-		onMax += splitSpace;
-		res[i].atRange =
-		    res[i].containsValues + onMax - res[i].containsValues.min;
-		onMax += res[i].containsValues.size();
+	double onMax = 0.0;
+	bool first = true;
+	for (auto &&resItem : res) {
+		if (!resItem.enabled) continue;
+		if (first)
+			first = false;
+		else
+			onMax += splitSpace;
+		resItem.atRange = resItem.containsValues + onMax
+		                - resItem.containsValues.min;
+		onMax += resItem.containsValues.size();
 	}
 
 	if (plot->getOptions()->coordSystem == CoordSystem::polar
-	    && axisIndex == AxisId::x)
+	    && axisIndex == AxisId::x && !first)
 		onMax += splitSpace;
 
 	for (auto &&bucket : buckets)
@@ -616,24 +614,25 @@ PlotBuilder::addSeparation(const Buckets &buckets,
 
 	auto alignedRange = maxRange;
 	if (align == Base::Align::Type::center) {
-		auto &&halfSize = maxRange.size() / 2.0;
+		auto &&halfSize = maxRange.middle();
 		alignedRange = {maxRange.min - halfSize,
 		    maxRange.max - halfSize};
 	}
 
 	for (auto &resItem : res) {
 		if (!resItem.enabled) continue;
 
-		resItem.atRange =
-		    ((resItem.atRange - resItem.atRange.min) * maxRange.size()
-		            / resItem.containsValues.size()
-		        + resItem.atRange.min - resItem.containsValues.min
-		        + maxRange.min)
-		    / onMax;
+		auto aligned =
+		    Base::Align{align, resItem.containsValues}.getAligned(
+		        maxRange);
+
+		resItem.atRange = (aligned + resItem.atRange.min
+		                      - resItem.containsValues.min)
+		                / onMax;
 
 		resItem.containsValues = {
-		    maxRange.rescale(resItem.containsValues.min),
-		    maxRange.rescale(resItem.containsValues.max)};
+		    aligned.rescale(resItem.containsValues.min),
+		    aligned.rescale(resItem.containsValues.max)};
 	}
 
 	stats.setIfRange(axisIndex, alignedRange);

src/chart/rendering/drawaxes.cpp

@@ -66,10 +66,16 @@ void DrawAxes::drawGeometries() const
 
 			if (ySplit.measureRange.includes(
 			        origo.getCoord(orientation(Gen::AxisId::y))))
-				drawAxis(Gen::AxisId::x, tr, weight);
+				drawAxis(Gen::AxisId::x,
+				    xSplit.measureRange,
+				    tr,
+				    weight);
 			if (xSplit.measureRange.includes(
 			        origo.getCoord(orientation(Gen::AxisId::x))))
-				drawAxis(Gen::AxisId::y, tr, weight);
+				drawAxis(Gen::AxisId::y,
+				    ySplit.measureRange,
+				    tr,
+				    weight);
 
 			DrawGuides{*this}.draw(Gen::AxisId::x,
 			    xSplit.measureRange,
@@ -281,24 +287,24 @@ void DrawAxes::generateMeasure(Gen::AxisId axisIndex,
 	}
 }
 
-Geom::Line DrawAxes::getAxisLine(Gen::AxisId axisIndex) const
+Geom::Line DrawAxes::getAxisLine(Gen::AxisId axisIndex,
+    const Math::Range<> &filter) const
 {
-	auto offset = this->origo().getCoord(!orientation(axisIndex));
-
-	auto direction = Geom::Point::Ident(orientation(axisIndex));
-
-	auto p0 = direction.flip() * offset;
-	auto p1 = p0 + direction;
-
-	if (offset >= 0 && offset <= 1) return {p0, p1};
+	auto o = orientation(axisIndex);
+	if (auto offset = this->origo().getCoord(!o);
+	    Math::Range<>{0.0, 1.0}.includes(offset))
+		return {Geom::Point::Coord(o, filter.min, offset),
+		    Geom::Point::Coord(o, filter.max, offset)};
 	return {};
 }
 
 void DrawAxes::drawAxis(Gen::AxisId axisIndex,
+    const Math::Range<> &filter,
     const Geom::AffineTransform &tr,
     double w) const
 {
-	if (auto line = tr(getAxisLine(axisIndex)); !line.isPoint()) {
+	if (auto line = tr(getAxisLine(axisIndex, filter));
+	    !line.isPoint()) {
 		auto lineColor = *rootStyle.plot.getAxis(axisIndex).color
 		               * Math::FuzzyBool::And<double>(w,
 		                   plot->guides.at(axisIndex).axis);

src/chart/rendering/drawaxes.h

@@ -94,13 +94,15 @@ class DrawAxes : public DrawingContext
 	void generateMeasure(Gen::AxisId axisIndex,
 	    double stepSize,
 	    double weight);
-	[[nodiscard]] Geom::Line getAxisLine(Gen::AxisId axisIndex) const;
+	[[nodiscard]] Geom::Line getAxisLine(Gen::AxisId axisIndex,
+	    const Math::Range<> &filter) const;
 	[[nodiscard]] Geom::Point getTitleBasePos(Gen::AxisId axisIndex,
 	    ::Anim::InterpolateIndex index) const;
 	[[nodiscard]] Geom::Point getTitleOffset(Gen::AxisId axisIndex,
 	    ::Anim::InterpolateIndex index,
 	    bool fades) const;
 	void drawAxis(Gen::AxisId axisIndex,
+	    const Math::Range<> &filter,
 	    const Geom::AffineTransform &tr,
 	    double w) const;
 	void drawTitle(Gen::AxisId axisIndex,