Merge branch 'axis_refactor_v12' into axis_refactor_v12b

vizzuhq · Nov 27, 2024 · 0263d8b · 0263d8b
2 parents ed974b8 + d3ce44d
commit 0263d8b
Show file tree

Hide file tree

Showing 25 changed files with 148 additions and 121 deletions.
diff --git a/CHANGELOG.md b/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
 

diff --git a/src/apps/weblib/typeschema-api/styles.yaml b/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:

diff --git a/src/base/refl/auto_enum.h b/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;
 }

diff --git a/src/base/type/uniquelist.h b/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

diff --git a/src/chart/generator/axis.cpp b/src/chart/generator/axis.cpp
@@ -7,7 +7,6 @@
 #include <iterator>
 #include <limits>
 #include <optional>
-#include <set>
 #include <string>
 #include <string_view>
 #include <tuple>

diff --git a/src/chart/generator/buckets.h b/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++();

diff --git a/src/chart/generator/marker.cpp b/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);

diff --git a/src/chart/generator/plotbuilder.cpp b/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)

diff --git a/src/chart/main/style.cpp b/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)

diff --git a/src/chart/main/style.h b/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

diff --git a/src/chart/options/channel.cpp b/src/chart/options/channel.cpp
@@ -1,9 +1,6 @@
 #include "channel.h"
 
 #include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <iterator>
 #include <optional>
 #include <stdexcept>
 #include <string>

diff --git a/src/chart/options/channel.h b/src/chart/options/channel.h
@@ -65,7 +65,7 @@ static_assert(std::ranges::all_of(Refl::enum_names<LegendId>,
 	            Refl::get_enum<ChannelId>(name));
     }));
 
-[[nodiscard]] constexpr Geom::Orientation operator++(
+[[nodiscard]] constexpr Geom::Orientation orientation(
     const AxisId &axis)
 {
 	return axis == AxisId::x ? Geom::Orientation::horizontal

diff --git a/src/chart/options/channelrange.cpp b/src/chart/options/channelrange.cpp
@@ -1,11 +1,6 @@
 #include "channelrange.h"
 
-#include <string>
-
-#include "base/conv/parse.h"
-#include "base/conv/tostring.h"
 #include "base/math/range.h"
-#include "base/text/valueunit.h"
 
 namespace Vizzu::Gen
 {

diff --git a/src/chart/rendering/drawaxes.cpp b/src/chart/rendering/drawaxes.cpp
@@ -1,6 +1,9 @@
 #include "drawaxes.h"
 
+#include <algorithm>
+#include <cmath>
 #include <numbers>
+#include <ranges>
 #include <string>
 #include <utility>
 
@@ -12,8 +15,12 @@
 #include "base/geom/transformedrect.h"
 #include "base/gfx/colortransform.h"
 #include "base/gfx/font.h"
+#include "base/math/floating.h"
 #include "base/math/fuzzybool.h"
+#include "base/math/interpolation.h"
+#include "base/math/range.h"
 #include "base/math/renard.h"
+#include "base/refl/auto_enum.h"
 #include "base/type/booliter.h"
 #include "chart/generator/plot.h" // NOLINT(misc-include-cleaner)
 #include "chart/main/events.h"
@@ -145,7 +152,7 @@ void DrawAxes::generateMeasure(Gen::AxisId axisIndex,
     double stepSize,
     double weight)
 {
-	auto orientation = !++axisIndex;
+	auto orientation = !Gen::orientation(axisIndex);
 	const auto &meas = getAxis(axisIndex).measure;
 	auto rangeSize = meas.range.size();
 	auto singleLabelRange = Math::Floating::is_zero(rangeSize);
@@ -213,9 +220,9 @@ void DrawAxes::generateMeasure(Gen::AxisId axisIndex,
 
 Geom::Line DrawAxes::getAxisLine(Gen::AxisId axisIndex) const
 {
-	auto offset = this->origo().getCoord(!++axisIndex);
+	auto offset = this->origo().getCoord(!orientation(axisIndex));
 
-	auto direction = Geom::Point::Ident(++axisIndex);
+	auto direction = Geom::Point::Ident(orientation(axisIndex));
 
 	auto p0 = direction.flip() * offset;
 	auto p1 = p0 + direction;
@@ -267,7 +274,7 @@ Geom::Point DrawAxes::getTitleBasePos(Gen::AxisId axisIndex,
 	case Pos::min_edge: break;
 	case Pos::max_edge: orthogonal = 1.0; break;
 	case Pos::axis:
-		orthogonal = origo().getCoord(!++axisIndex);
+		orthogonal = origo().getCoord(!orientation(axisIndex));
 		break;
 	}
 
@@ -442,7 +449,7 @@ void DrawAxes::drawDimensionLabel(Gen::AxisId axisIndex,
     double weight) const
 {
 	if (weight == 0) return;
-	auto orientation = ++axisIndex;
+	auto orientation = Gen::orientation(axisIndex);
 
 	const auto &labelStyle = rootStyle.plot.getAxis(axisIndex).label;
 

diff --git a/src/chart/rendering/drawguides.cpp b/src/chart/rendering/drawguides.cpp
@@ -1,6 +1,5 @@
 #include "drawguides.h"
 
-#include <iterator>
 #include <utility>
 
 #include "base/geom/line.h"
@@ -42,8 +41,8 @@ void DrawGuides::drawGuide(Gen::AxisId axisId,
 {
 	auto eventTarget = Events::Targets::axisGuide(axisId);
 
-	auto ident = Geom::Point::Ident(++axisId);
-	auto normal = Geom::Point::Ident(!++axisId);
+	auto ident = Geom::Point::Ident(orientation(axisId));
+	auto normal = Geom::Point::Ident(!orientation(axisId));
 	auto relMax = ident * val;
 
 	parent.canvas.setLineColor(color);