Fix tests + Empty legend interpolation

Author: schaumb

src/chart/generator/axis.cpp

@@ -45,7 +45,10 @@ MeasureAxis::MeasureAxis(Math::Range<double> interval,
     origMeasureName(std::string{measName}),
     step(step ? *step : Math::Renard::R5().ceil(range.size() / 5.0))
 {
-	if (std::signbit(this->step->value) != std::signbit(range.size()))
+	if (Math::Floating::is_zero(range.size()))
+		this->step->value = 0;
+	else if (std::signbit(this->step->value)
+	         != std::signbit(range.size()))
 		this->step->value *= -1;
 }
 
@@ -79,46 +82,59 @@ MeasureAxis interpolate(const MeasureAxis &op0,
 		const auto s0 = op0.range.size();
 		const auto s1 = op1.range.size();
 
-		const auto s0Inv = is_zero(s0) ? MAX : 1 / s0;
-		const auto s1Inv = is_zero(s1) ? MAX : 1 / s1;
-
-		const auto interp = Math::interpolate(s0Inv, s1Inv, factor);
-
-		const auto s = is_zero(interp) ? MAX : 1 / interp;
-
-		res.range = Math::Range<double>::Raw(
-		    Math::interpolate(op0.range.getMin() * s0Inv,
-		        op1.range.getMin() * s1Inv,
-		        factor)
-		        * s,
-		    Math::interpolate(op0.range.getMax() * s0Inv,
-		        op1.range.getMax() * s1Inv,
-		        factor)
-		        * s);
-
-		auto step = Math::interpolate(op0.step.get() * s0Inv,
-		                op1.step.get() * s1Inv,
-		                factor)
-		          * s;
-
-		if (auto op0sign = std::signbit(op0.step.get());
-		    op0sign == std::signbit(op1.step.get()))
-			res.step = interpolate(op0.step,
-			    op1.step,
-			    Math::Range<double>::Raw(op0.step.get(),
-			        op1.step.get())
-			        .rescale(step));
-		else if (auto max = std::copysign(MAX, step);
-		         op0sign == std::signbit(step))
-			res.step = interpolate(op0.step,
-			    Anim::Interpolated{max},
-			    Math::Range<double>::Raw(op0.step.get(), max)
-			        .rescale(step));
-		else
-			res.step = interpolate(op1.step,
-			    Anim::Interpolated{max},
-			    Math::Range<double>::Raw(op1.step.get(), max)
-			        .rescale(step));
+		if (auto s0Zero = is_zero(s0); s0Zero || is_zero(s1)) {
+			res.range = Math::Range<double>::Raw(
+			    Math::interpolate(op0.range.getMin(),
+			        op1.range.getMin(),
+			        factor),
+			    Math::interpolate(op0.range.getMax(),
+			        op1.range.getMax(),
+			        factor));
+			res.step = s0Zero ? op1.step : op0.step;
+		}
+		else {
+			auto s0Inv = 1 / s0;
+			auto s1Inv = 1 / s1;
+
+			const auto interp =
+			    Math::interpolate(s0Inv, s1Inv, factor);
+
+			const auto s = is_zero(interp) ? MAX : 1 / interp;
+
+			res.range = Math::Range<double>::Raw(
+			    Math::interpolate(op0.range.getMin() * s0Inv,
+			        op1.range.getMin() * s1Inv,
+			        factor)
+			        * s,
+			    Math::interpolate(op0.range.getMax() * s0Inv,
+			        op1.range.getMax() * s1Inv,
+			        factor)
+			        * s);
+
+			auto step = Math::interpolate(op0.step.get() * s0Inv,
+			                op1.step.get() * s1Inv,
+			                factor)
+			          * s;
+
+			if (auto op0sign = std::signbit(op0.step.get());
+			    op0sign == std::signbit(op1.step.get()))
+				res.step = interpolate(op0.step,
+				    op1.step,
+				    Math::Range<double>::Raw(op0.step.get(),
+				        op1.step.get())
+				        .rescale(step));
+			else if (auto max = std::copysign(MAX, step);
+			         op0sign == std::signbit(step))
+				res.step = interpolate(op0.step,
+				    Anim::Interpolated{max},
+				    Math::Range<double>::Raw(op0.step.get(), max)
+				        .rescale(step));
+			else
+				res.step = interpolate(op1.step,
+				    Anim::Interpolated{max},
+				    Math::Range<double>::Raw(op1.step.get(), max)
+				        .rescale(step));
+		}
 
 		res.unit = interpolate(op0.unit, op1.unit, factor);
 	}

test/e2e/test_cases/test_cases.json

@@ -185,13 +185,13 @@
 			"refs": ["dae308e"]
 		},
 		"data_fault_and_formats/column_rectangle_less_disc": {
-			"refs": ["e84920a"]
+			"refs": ["f2cce92"]
 		},
 		"data_fault_and_formats/column_rectangle_more_conti": {
 			"refs": ["7ebabe4"]
 		},
 		"data_fault_and_formats/column_rectangle_more_disc": {
-			"refs": ["2c2e36e"]
+			"refs": ["87e3a08"]
 		},
 		"data_fault_and_formats/rectangle_data_cube": {
 			"refs": ["e504add"]

test/e2e/tests/fixes.json

@@ -50,7 +50,7 @@
 			"refs": ["034ee91"]
 		},
 		"47977099": {
-			"refs": ["1310b69"]
+			"refs": ["2845349"]
 		},
 		"53913538": {
 			"refs": ["90f6d38"]