some clang-tidy + first try to purge horizontalAxis/verticalAxis

Author: schaumb

src/base/alg/union_foreach.h

@@ -1,11 +1,10 @@
 #ifndef ALG_UNION_FOREACH_H
 #define ALG_UNION_FOREACH_H
 
+#include <cstdint>
 #include <functional>
 #include <ranges>
 
-#include "union_foreach.h"
-
 namespace Alg
 {
 
@@ -192,8 +191,8 @@ template <std::ranges::forward_range R,
         std::ranges::less,
     Impl::address_binary_invocable<std::ranges::iterator_t<R>> Fun,
     Impl::Property Prop = Impl::default_property_t<R>>
-constexpr void union_foreach(R &&r1,
-    R &&r2,
+constexpr void union_foreach(const R &r1,
+    const R &r2,
     Fun f,
     Comp comp = {},
     Proj proj = {},

src/base/geom/point.h

@@ -236,8 +236,9 @@ struct Point
 
 struct Size : Point
 {
-	[[nodiscard]] static Size
-	Coord(Orientation orientation, double value, double other = 0.0)
+	[[nodiscard]] static Size Oriented(Orientation orientation,
+	    double value,
+	    double other = 0.0)
 	{
 		return {Point::Coord(orientation, value, other)};
 	}

src/base/geom/rect.cpp

@@ -3,7 +3,6 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
-#include <compare>
 
 #include "base/math/floating.h"
 

src/chart/generator/axis.cpp

@@ -4,7 +4,6 @@
 #include <cmath>
 #include <cstdint>
 #include <functional>
-#include <iterator>
 #include <limits>
 #include <optional>
 #include <string>

src/chart/generator/marker.cpp

@@ -6,9 +6,7 @@
 #include <utility>
 
 #include "base/conv/auto_json.h"
-#include "base/geom/orientation.h"
 #include "base/geom/point.h"
-#include "base/geom/rect.h"
 #include "base/math/range.h"
 #include "base/refl/auto_enum.h"
 #include "chart/options/align.h"

src/chart/generator/plot.cpp

@@ -9,7 +9,9 @@
 #include <vector>
 
 #include "base/anim/interpolated.h"
+#include "base/math/range.h"
 #include "chart/main/style.h"
+#include "chart/options/channel.h"
 #include "chart/options/options.h"
 
 #include "marker.h"

src/chart/generator/plotbuilder.cpp

@@ -4,11 +4,12 @@
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
+#include <functional>
 #include <limits>
-#include <map>
 #include <memory>
 #include <optional>
 #include <ranges>
+#include <set>
 #include <stdexcept>
 #include <tuple>
 #include <utility>

src/chart/main/style.h

@@ -368,6 +368,11 @@ struct Plot : Padding, Box, PlotParams
 	{
 		return id == Gen::AxisId::x ? xAxis : yAxis;
 	}
+
+	[[nodiscard]] Axis &getAxis(Gen::AxisId id)
+	{
+		return id == Gen::AxisId::x ? xAxis : yAxis;
+	}
 };
 
 struct LogoParams

src/chart/main/stylesheet.cpp

@@ -92,7 +92,7 @@ void Sheet::setPlot()
 		defaultParams.plot.paddingLeft =
 		    Gfx::Length::Emphemeral(45.0 / 12.0);
 	}
-	else if (!options->isMeasure(+options->getVerticalChannel())) {
+	else if (!options->isMeasure(+!options->getHorizontalChannel())) {
 		defaultParams.plot.paddingLeft =
 		    Gfx::Length::Emphemeral(80.0 / 12.0);
 	}
@@ -115,11 +115,10 @@ void Sheet::setAxisLabels()
 		def.position = AxisLabel::Position::max_edge;
 		def.side = AxisLabel::Side::positive;
 	}
-	else if (!options->isMeasure(Gen::ChannelId::x)
+	else if (!options->isMeasure(+options->getHorizontalChannel())
 	         && options->getChannels()
-	                .at(Gen::AxisId::x)
-	                .hasDimension()
-	         && options->angle == 0)
+	                .at(+options->getHorizontalChannel())
+	                .hasDimension())
 		def.angle.reset();
 }
 
@@ -154,13 +153,14 @@ void Sheet::setMarkers()
 			defaultParams.plot.marker.fillOpacity = 0.8;
 		}
 		else if (options->geometry == Gen::ShapeType::rectangle) {
-			auto vIsMeasure =
-			    options->isMeasure(+options->getVerticalChannel());
-			auto hIsMeasure =
-			    options->isMeasure(+options->getHorizontalChannel());
+			auto vIsMeasure = options->isMeasure(Gen::ChannelId::y);
+			auto hIsMeasure = options->isMeasure(Gen::ChannelId::x);
 			if (auto polar = options->coordSystem.get()
 			              == Gen::CoordSystem::polar;
-			    polar && options->getVerticalAxis().isEmpty())
+			    polar
+			    && options->getChannels()
+			           .at(Gen::ChannelId::y)
+			           .isEmpty())
 				defaultParams.plot.marker.rectangleSpacing = 0;
 			else if (auto needRectangleSpacing =
 			             vIsMeasure != hIsMeasure
@@ -221,7 +221,11 @@ void Sheet::setAfterStyles(Gen::Plot &plot, const Geom::Size &size)
 	auto &style = plot.getStyle();
 	style.setup();
 
-	if (auto &xLabel = style.plot.xAxis.label; !xLabel.angle) {
+	if (auto &xLabel =
+	        style.plot
+	            .getAxis(plot.getOptions()->getHorizontalChannel())
+	            .label;
+	    !xLabel.angle) {
 		auto plotX = size.x;
 
 		auto em = style.calculatedSize();

src/chart/options/options.cpp

@@ -8,6 +8,7 @@
 
 #include "base/geom/orientation.h"
 #include "base/math/trig.h"
+#include "base/refl/auto_enum.h"
 #include "dataframe/old/types.h"
 
 #include "channel.h"
@@ -218,11 +219,6 @@ AxisId Options::getHorizontalChannel() const
 	return Math::rad2quadrant(angle) % 2 == 0 ? AxisId::x : AxisId::y;
 }
 
-AxisId Options::getVerticalChannel() const
-{
-	return !getHorizontalChannel();
-}
-
 bool Options::isShapeValid(const ShapeType &shapeType) const
 {
 	if (mainAxis().hasDimension()) return true;
@@ -299,10 +295,10 @@ std::optional<LegendId> Options::getAutoLegend() const
 
 void Options::setAutoRange(bool hPositive, bool vPositive)
 {
-	auto &v = getVerticalAxis();
-	auto &h = getHorizontalAxis();
-	auto vHasMeasure = getVerticalAxis().hasMeasure();
-	auto hHasMeasure = getHorizontalAxis().hasMeasure();
+	auto &v = getChannels().at(AxisId::y);
+	auto &h = getChannels().at(AxisId::x);
+	auto vHasMeasure = v.hasMeasure();
+	auto hHasMeasure = h.hasMeasure();
 	auto &&cart = coordSystem.get() == CoordSystem::cartesian;
 	auto &&nrect = geometry != ShapeType::rectangle;