review_1

Author: schaumb

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

@@ -78,6 +78,7 @@ definitions:
                     - { type: string, enum: [auto] }
 
     AxisChannel:
+        $extends: Channel
         description: |
             AxisChannels are special channel settings for the positional channels.
         type: object
@@ -135,18 +136,14 @@ definitions:
         type: object
         properties:
             x:
-                allOf:
-                    - $ref: Channel
-                    - $ref: AxisChannel
+                $ref: AxisChannel
                 description: |
                     Parameters for the X-axis, determining the position of the markers on the 
                     x-axis - or their angle when using polar coordinates. 
                     Note: leaving x and y channels empty will result in a 
                     chart "without coordinates" like a Treemap or a Bubble Chart.
             y:
-                allOf:
-                    - $ref: Channel
-                    - $ref: AxisChannel
+                $ref: AxisChannel
                 description: |
                     Parameters for the Y-axis, determining the position of the markers on the 
                     y-axis - or their radius when using polar coordinates) .

src/chart/options/channels.cpp

@@ -17,7 +17,7 @@ bool Channels::anyAxisSet() const
 
 bool Channels::isEmpty() const
 {
-	return std::ranges::all_of(*this,
+	return std::ranges::all_of(genProps,
 	    [](const auto &channel)
 	    {
 		    return channel.isEmpty();
@@ -28,7 +28,7 @@ Channels::IndexSet Channels::getDimensions() const
 {
 	IndexSet dimensions;
 
-	for (const auto &channel : *this)
+	for (const auto &channel : genProps)
 		channel.collectDimensions(dimensions);
 
 	return dimensions;
@@ -38,7 +38,7 @@ Channels::IndexSet Channels::getMeasures() const
 {
 	IndexSet series;
 
-	for (const auto &channel : *this)
+	for (const auto &channel : genProps)
 		if (auto &&mid = channel.measure()) series.insert(*mid);
 
 	return series;
@@ -57,12 +57,12 @@ Channels::IndexSet Channels::getDimensions(
 
 void Channels::removeSeries(const Data::SeriesIndex &index)
 {
-	for (auto &channel : *this) channel.removeSeries(index);
+	for (auto &channel : genProps) channel.removeSeries(index);
 }
 
 bool Channels::isSeriesUsed(const Data::SeriesIndex &index) const
 {
-	return std::ranges::any_of(*this,
+	return std::ranges::any_of(genProps,
 	    [&](const auto &channel)
 	    {
 		    return channel.isSeriesUsed(index);
@@ -71,23 +71,23 @@ bool Channels::isSeriesUsed(const Data::SeriesIndex &index) const
 
 void Channels::reset()
 {
-	for (auto &channel : *this) channel.reset();
+	for (auto &channel : genProps) channel.reset();
 }
 
 Channels Channels::shadow() const
 {
-	Channels shadow = *this;
+	Channels shadow{*this};
 
-	shadow[ChannelId::color].reset();
-	shadow[ChannelId::lightness].reset();
-	shadow[ChannelId::label].reset();
-	shadow[ChannelId::noop].reset();
+	shadow.genProps[ChannelId::color].reset();
+	shadow.genProps[ChannelId::lightness].reset();
+	shadow.genProps[ChannelId::label].reset();
+	shadow.genProps[ChannelId::noop].reset();
 
 	for (auto &&attr : getDimensions({{ChannelId::color,
 	         ChannelId::lightness,
 	         ChannelId::label,
 	         ChannelId::noop}}))
-		shadow[ChannelId::noop].addSeries(attr);
+		shadow.genProps[ChannelId::noop].addSeries(attr);
 
 	return shadow;
 }

src/chart/options/channels.h

@@ -12,10 +12,11 @@
 namespace Vizzu::Gen
 {
 
-struct Channels : Refl::EnumArray<ChannelId, Channel>
+struct Channels
 {
 	using IndexSet = std::set<Data::SeriesIndex>;
-	EnumArray<AxisId, AxisChannelProperties> axisProps;
+	Refl::EnumArray<ChannelId, Channel> genProps;
+	Refl::EnumArray<AxisId, AxisChannelProperties> axisProps;
 
 	[[nodiscard]] bool anyAxisSet() const;
 	[[nodiscard]] bool isEmpty() const;
@@ -25,7 +26,15 @@ struct Channels : Refl::EnumArray<ChannelId, Channel>
 	[[nodiscard]] IndexSet getDimensions(
 	    const std::span<const ChannelId> &channelTypes) const;
 
-	using EnumArray::at;
+	[[nodiscard]] constexpr Channel &at(ChannelId value)
+	{
+		return genProps.at(value);
+	}
+
+	[[nodiscard]] constexpr const Channel &at(ChannelId value) const
+	{
+		return genProps.at(value);
+	}
 
 	template <ChannelIdLike T>
 	[[nodiscard]] const Channel &at(const T &id) const

src/chart/options/options.h

@@ -185,8 +185,8 @@ class Options : public OptionProperties
 		        {{Channel::makeChannel(
 		            static_cast<ChannelId>(Ix))...}},
 		        {}};
-	    }(std::make_index_sequence<
-	        std::tuple_size_v<decltype(channels)::base_array>>{})};
+	    }(std::make_index_sequence<std::size(
+	            Refl::enum_values<ChannelId>())>())};
 
 	[[nodiscard]] Geom::Orientation getAutoOrientation() const;
 	[[nodiscard]] std::optional<LegendId> getAutoLegend() const;