rename to multiLevelAxis + clang-format

Author: schaumb

src/chart/generator/plotbuilder.cpp

@@ -161,9 +161,9 @@ std::vector<PlotBuilder::BucketSortInfo> PlotBuilder::sortedBuckets(
 				    0.0,
 				    !(marker.*buckets.marker_id_get).label.empty()
 				        ? std::make_optional(
-				            DimensionAxis::mergedLabels(
-				                (marker.*buckets.marker_id_get)
-				                    .label))
+				              DimensionAxis::mergedLabels(
+				                  (marker.*buckets.marker_id_get)
+				                      .label))
 				        : std::nullopt);
 
 			it->size += marker.size.getCoord(
@@ -511,7 +511,7 @@ void PlotBuilder::calcLegendAndLabel(const Data::DataTable &dataTable)
 		        markerLabelsUnitPercent
 		            ? "%"
 		            : dataTable.get_series_info(meas->getColIndex(),
-		                "unit")}},
+		                  "unit")}},
 		    ::Anim::String{meas->getColIndex()}};
 	}
 }

src/chart/main/style.cpp

@@ -266,7 +266,7 @@ Chart Chart::def()
 							{
 								.position = Anim::Interpolated<AxisLabel::Position>(AxisLabel::Position::min_edge),
 								.side = Anim::Interpolated<AxisLabel::Side>(AxisLabel::Side::negative),
-								.multiAxis = Anim::Interpolated<AxisLabel::MultiAxis>(AxisLabel::MultiAxis::split)
+								.multiLevelAxis = Anim::Interpolated<AxisLabel::MultiLevelAxis>(AxisLabel::MultiLevelAxis::flattened)
 							}
 						},
 						.ticks = {
@@ -359,7 +359,7 @@ Chart Chart::def()
 							{
 								.position = Anim::Interpolated<AxisLabel::Position>(AxisLabel::Position::min_edge),
 								.side = Anim::Interpolated<AxisLabel::Side>(AxisLabel::Side::negative),
-								.multiAxis = Anim::Interpolated<AxisLabel::MultiAxis>(AxisLabel::MultiAxis::split)
+								.multiLevelAxis = Anim::Interpolated<AxisLabel::MultiLevelAxis>(AxisLabel::MultiLevelAxis::flattened)
 							}
 						},
 						.ticks = {

src/chart/main/style.h

@@ -201,11 +201,11 @@ struct AxisLabelParams
 
 	enum class Side : std::uint8_t { positive, negative };
 
-	enum class MultiAxis : std::uint8_t { split, separate };
+	enum class MultiLevelAxis : std::uint8_t { flattened, nested };
 
 	Param<::Anim::Interpolated<Position>> position;
 	Param<::Anim::Interpolated<Side>> side;
-	Param<::Anim::Interpolated<MultiAxis>> multiAxis;
+	Param<::Anim::Interpolated<MultiLevelAxis>> multiLevelAxis;
 };
 
 struct AxisLabel : OrientedLabel, AxisLabelParams

src/chart/options/channel.h

@@ -264,9 +264,7 @@ struct Channel
 
 template <class T>
 concept ChannelIdLike = requires(const T &v) {
-	{
-		+v
-	} -> std::same_as<ChannelId>;
+	{ +v } -> std::same_as<ChannelId>;
 };
 
 template <ChannelIdLike T>

src/chart/rendering/drawaxes.cpp

@@ -466,15 +466,16 @@ void DrawAxes::drawTitle(Gen::AxisId axisIndex,
 		    -std::numbers::pi / 2.0
 		    * (fades == ::Anim::second
 		            ? !isHorizontal(
-		                titleStyle.orientation->get_or_first(index)
-		                    .value)
+		                  titleStyle.orientation->get_or_first(index)
+		                      .value)
 		            : titleStyle.orientation->factor(
-		                Styles::AxisTitle::Orientation::vertical));
+		                  Styles::AxisTitle::Orientation::vertical));
 
 		auto orientedSize =
 		    fades == ::Anim::second
 		        ? calcOrientation(
-		            titleStyle.orientation->get_or_first(index).value)
+		              titleStyle.orientation->get_or_first(index)
+		                  .value)
 		        : titleStyle.orientation->combine(calcOrientation);
 
 		auto center = offset * (orientedSize / 2.0);
@@ -577,7 +578,7 @@ void DrawAxes::drawDimensionLabel(Gen::AxisId axisIndex,
 		            ? labelStyle.side->get_or_first(index).value
 		                  == Styles::AxisLabel::Side::negative
 		            : labelStyle.side->factor(
-		                Styles::AxisLabel::Side::negative);
+		                  Styles::AxisLabel::Side::negative);
 
 		    auto draw = [&,
 		                    posDir = coordSys

src/chart/rendering/drawaxes.h

@@ -69,6 +69,8 @@ class DrawAxes : public DrawingContext
 	        Gen::SplitAxis::Parts::const_iterator,
 	        std::ranges::subrange_kind::sized>>
 	    splits;
+	// Refl::EnumArray<Gen::AxisId, std::vector<Interval>>
+	// multiLabelAxis;
 
 	[[nodiscard]] auto getIntervals(Gen::AxisId axisIndex,
 	    const Math::Range<> &filter = {0.0, 1.0}) const