Merge branch 'axis_refactor_v12' into axis_refactor_v12b

Author: schaumb

CHANGELOG.md

@@ -33,7 +33,7 @@
 
 ### Added
 
-- Add split property for plot axis style structure. Only supported the percentage value.
+- Add spacing property for plot axis style structure.
 
 ### Changed
 

src/apps/weblib/typeschema-api/styles.yaml

@@ -452,8 +452,9 @@ definitions:
             interlacing:
                 $ref: Interlacing
                 nullable: true
-            split:
-                $ref: Length
+            spacing:
+                type: string
+                mask: /:number:%/
                 nullable: true
 
     Plot:

src/base/refl/auto_enum.h

@@ -202,6 +202,7 @@ template <class E> consteval auto enum_values()
 	constexpr auto n = std::size(enum_names<E>);
 	std::array<E, n> res{};
 	for (std::size_t i = 0; i < n; ++i)
+		// NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange)
 		res[i] = static_cast<E>(i + first);
 	return res;
 }

src/base/type/uniquelist.h

@@ -237,7 +237,7 @@ template <class T> class UniqueList
 	struct CommonIterateVal
 	{
 		const T &value;
-		const std::size_t *othIx;
+		const std::size_t *otherIx;
 	};
 
 	struct common_iterator

src/chart/generator/axis.cpp

@@ -7,7 +7,6 @@
 #include <iterator>
 #include <limits>
 #include <optional>
-#include <set>
 #include <string>
 #include <string_view>
 #include <tuple>

src/chart/generator/buckets.h

@@ -44,9 +44,10 @@ struct Buckets
 			    });
 		}
 
-		[[nodiscard]] bool operator!=(const const_iterator &oth) const
+		[[nodiscard]] bool operator!=(
+		    const const_iterator &other) const
 		{
-			return data.data() != oth.data.data();
+			return data.data() != other.data.data();
 		}
 
 		const_iterator &operator++();

src/chart/generator/marker.cpp

@@ -1,5 +1,6 @@
 #include "marker.h"
 
+#include <cmath>
 #include <cstdint>
 #include <optional>
 #include <utility>
@@ -225,14 +226,14 @@ void Marker::fromRectangle(const Geom::Rect &rect)
 
 Math::Range<> Marker::getSizeBy(AxisId axisId) const
 {
-	return isHorizontal(++axisId) ? toRectangle().hSize()
-	                              : toRectangle().vSize();
+	return isHorizontal(orientation(axisId)) ? toRectangle().hSize()
+	                                         : toRectangle().vSize();
 }
 
 void Marker::setSizeBy(AxisId axisId, const Math::Range<> range)
 {
 	auto rect = toRectangle();
-	if (isHorizontal(++axisId))
+	if (isHorizontal(orientation(axisId)))
 		rect.setHSize(range);
 	else
 		rect.setVSize(range);

src/chart/generator/plotbuilder.cpp

@@ -17,6 +17,7 @@
 #include "base/anim/interpolated.h"
 #include "base/math/floating.h"
 #include "base/math/range.h"
+#include "base/refl/auto_enum.h"
 #include "chart/main/style.h"
 #include "chart/options/align.h"
 #include "chart/options/channel.h"
@@ -233,7 +234,7 @@ bool PlotBuilder::linkMarkers(const Buckets &buckets,
 				auto &marker = **it.base().base().base();
 				if (!marker.enabled) continue;
 				o = std::max(o,
-				    marker.size.getCoord(++axisIndex),
+				    marker.size.getCoord(orientation(axisIndex)),
 				    Math::Floating::less);
 			}
 			if (o == std::numeric_limits<double>::lowest()) o = 0.0;
@@ -279,7 +280,8 @@ bool PlotBuilder::linkMarkers(const Buckets &buckets,
 			                 : *it.base().base().base();
 
 			if (act)
-				prevPos = act->position.getCoord(++axisIndex) +=
+				prevPos =
+				    act->position.getCoord(orientation(axisIndex)) +=
 				    isAggregatable ? dimOffset[i] : prevPos;
 
 			hasConnection |=
@@ -542,7 +544,7 @@ void PlotBuilder::addSeparation(const Buckets &subBuckets,
 	auto splitSpace =
 	    plot->getStyle()
 	        .plot.getAxis(plot->getOptions()->subAxisType())
-	        .split->get(max.getMax(),
+	        .spacing->get(max.getMax(),
 	            plot->getStyle().calculatedSize());
 
 	for (auto i = 1U; i < ranges.size(); ++i)

src/chart/main/style.cpp

@@ -280,7 +280,7 @@ Chart Chart::def()
 						.interlacing = {
 							.color = Gfx::Color::Gray(0.97)
 						},
-						.split = Gfx::Length::Relative(1 / 15.)
+						.spacing = Gfx::Length::Relative(1 / 15.)
 					},
 					.yAxis = {
 						.color = Gfx::Color::Gray(0.8),
@@ -372,7 +372,7 @@ Chart Chart::def()
 						.interlacing = {
 							.color = Gfx::Color::Gray(0.97)
 						},
-						.split = Gfx::Length::Relative(1 / 15.)
+						.spacing = Gfx::Length::Relative(1 / 15.)
 					},
 					.areaColor = Gfx::Color::Transparent(),
 					.overflow = ::Anim::Interpolated<Overflow>(Overflow::hidden)

src/chart/main/style.h

@@ -245,7 +245,7 @@ struct Axis
 	Tick ticks;
 	Guide guides;
 	Interlacing interlacing;
-	Param<Gfx::Length> split;
+	Param<Gfx::Length> spacing;
 };
 
 struct MarkerLabelParams