Fix all polar connectivity interpolation (without enabled)

Author: schaumb

src/chart/rendering/markers/abstractmarker.cpp

@@ -83,12 +83,25 @@ AbstractMarker AbstractMarker::createInterpolated(
 	aMarker.labelEnabled =
 	    fromMarker.labelEnabled + toMarker.labelEnabled;
 
-	auto sum = static_cast<double>(aMarker.enabled);
+	auto enableFactorBase = static_cast<double>(toMarker.enabled);
+	auto labelEnableFactorBase =
+	    static_cast<double>(toMarker.labelEnabled);
+	auto enableSum = static_cast<double>(aMarker.enabled);
+	auto labelEnableSum = static_cast<double>(aMarker.labelEnabled);
+
+	if (marker.polarConnection.interpolates()) {
+		auto firstWeight = options.geometry.values[0].weight;
+		auto secondWeight = options.geometry.values[1].weight;
+		enableSum = firstWeight + secondWeight;
+		enableFactorBase = secondWeight;
+		labelEnableSum = firstWeight + secondWeight;
+		labelEnableFactorBase = secondWeight;
+	}
 
 	using Math::interpolate;
 	using Vizzu::Draw::interpolate;
-	if (sum > 0.0) {
-		auto factor = static_cast<double>(toMarker.enabled) / sum;
+	if (!Math::Floating::is_zero(enableSum)) {
+		auto factor = enableFactorBase / enableSum;
 		aMarker.morphToCircle = interpolate(fromMarker.morphToCircle,
 		    toMarker.morphToCircle,
 		    factor);
@@ -107,11 +120,8 @@ AbstractMarker AbstractMarker::createInterpolated(
 		aMarker.center =
 		    interpolate(fromMarker.center, toMarker.center, factor);
 	}
-	sum = static_cast<double>(
-	    fromMarker.labelEnabled + toMarker.labelEnabled);
-	if (sum > 0.0) {
-		auto factor =
-		    static_cast<double>(toMarker.labelEnabled) / sum;
+	if (!Math::Floating::is_zero(labelEnableSum)) {
+		auto factor = labelEnableFactorBase / labelEnableSum;
 		aMarker.dataRect = interpolate(fromMarker.dataRect,
 		    toMarker.dataRect,
 		    factor);

src/chart/rendering/markers/connectingmarker.cpp

@@ -53,10 +53,6 @@ ConnectingMarker::ConnectingMarker(const DrawingContext &ctx,
 	    ctx.getOptions().orientation.get_or_first(lineIndex).value
 	    == Gen::Orientation::horizontal;
 
-	auto &&isPolar =
-	    ctx.getOptions().coordSystem.get_or_first(lineIndex).value
-	    == Gen::CoordSystem::polar;
-
 	lineWidth[0] = lineWidth[1] = 0;
 
 	const auto *prev =
@@ -117,15 +113,12 @@ ConnectingMarker::ConnectingMarker(const DrawingContext &ctx,
 			auto prevPos = prev->position;
 
 			if (polar != false && isHorizontal && prev != &marker) {
-				if (prevPos.x >= 1)
-					prevPos.x -= 1;
-				else if (needConnection && !otherNeedConnection
-				         && isPolar
-				         && marker.polarConnection
-				                .get_or_first(lineIndex)
-				                .value) {
+				if (!otherNeedConnection
+				    && marker.polarConnection.get_or_first(lineIndex)
+				           .value)
+					prevPos.x = 0;
+				else if (prevPos.x >= 1)
 					prevPos.x -= 1;
-				}
 			}
 
 			points[3] = prevPos - prevSpacing;

src/chart/rendering/markers/rectanglemarker.cpp

@@ -20,12 +20,15 @@ RectangleMarker::RectangleMarker(const Gen::Marker &marker,
     const Styles::Chart &style) :
     SingleDrawMarker(marker, options, Gen::ShapeType::rectangle)
 {
-	if (marker.polarConnection.contains(true)) {
-		enabled = enabled.more();
-		labelEnabled = labelEnabled.more();
+	linear = options.coordSystem.factor(Gen::CoordSystem::polar) == 0;
+
+	if (marker.polarConnection.interpolates()
+	    && options.geometry.contains(Gen::ShapeType::line)) {
+		linear = linear
+		      || !marker.polarConnection.factor<Math::FuzzyBool>(true)
+		              .less();
 	}
 
-	linear = options.coordSystem.factor(Gen::CoordSystem::polar) == 0;
 	border = Math::FuzzyBool(true);
 
 	auto spacing = Geom::Size{