Fix lint

Author: schaumb

CHANGELOG.md

@@ -14,6 +14,7 @@
     - axis labels multiplication.
     - axis range interpretation differently for all split part.
     - align center / stretch fix.
+- Less restrictive 'plot.marker.label.unit'
 
 ### Added
 

src/chart/generator/plotbuilder.cpp

@@ -473,15 +473,21 @@ void PlotBuilder::calcLegendAndLabel(const Data::DataTable &dataTable)
 		                    .axisPropsAt(mainAxisType)
 		                    .align
 		                == Base::Align::Type::stretch
-		            && plot->getOptions()->labelSeries(mainAxisType)
+		            && plot->getOptions()
+		                       ->getChannels()
+		                       .at(mainAxisType)
+		                       .measure()
 		                   == *meas
 		            && !plot->getOptions()->isSplit(mainAxisType))
 		        || (plot->getOptions()
 		                    ->getChannels()
 		                    .axisPropsAt(subAxisType)
 		                    .align
 		                == Base::Align::Type::stretch
-		            && plot->getOptions()->labelSeries(subAxisType)
+		            && plot->getOptions()
+		                       ->getChannels()
+		                       .at(subAxisType)
+		                       .measure()
 		                   == *meas
 		            && !plot->getOptions()->isSplit(subAxisType)));
 
@@ -578,13 +584,14 @@ void PlotBuilder::addAlignment(const Buckets &buckets,
 		    axisRange.max - halfSize};
 	}
 
-	auto &&axisLabel = plot->getOptions()->labelSeries(axisIndex);
+	auto &&axisMeasure =
+	    plot->getOptions()->getChannels().at(axisIndex).measure();
 	auto markerLabelsUnitPercent =
 	    plot->getStyle().plot.marker.label.unit
 	        == Styles::MarkerLabel::Unit::percent
 	    && axisProps.align == Base::Align::Type::stretch
-	    && axisLabel.has_value()
-	    && axisLabel
+	    && axisMeasure.has_value()
+	    && axisMeasure
 	           == plot->getOptions()
 	                  ->getChannels()
 	                  .at(ChannelId::label)

test/e2e/tests/style_tests/plot/markerLabelUnit.mjs

@@ -86,17 +86,20 @@ const testSteps = [
 		return chart.animate({ data })
 	},
 	(chart) =>
-		chart.animate({
-			config: {
-				x: ['Foo2'],
-				y: {
-					set: ['Bar2', 'Foo3'],
-					align: 'stretch'
-				},
-				color: ['Foo3'],
-				label: ['Bar2']
-			}
-		}, 0),
+		chart.animate(
+			{
+				config: {
+					x: ['Foo2'],
+					y: {
+						set: ['Bar2', 'Foo3'],
+						align: 'stretch'
+					},
+					color: ['Foo3'],
+					label: ['Bar2']
+				}
+			},
+			0
+		),
 	(chart) =>
 		chart.animate({
 			style: {
@@ -106,7 +109,7 @@ const testSteps = [
 	(chart) =>
 		chart.animate({
 			config: {
-			  y: { labelLevel: 0 },
+				y: { labelLevel: 0 },
 				orientation: 'vertical'
 			}
 		})