Merge SpecMarker size to the variant shape

Author: schaumb

src/chart/speclayout/bubblechart.cpp

@@ -27,22 +27,24 @@ void BubbleChart::generate()
 {
 	auto baseIndex = 0U;
 
+	auto firstMarkerSize = markers.empty() ? 0.0 : markers[0].size();
 	for (auto i = 0U; i < markers.size(); ++i) {
 		auto &marker = markers[i];
+		auto markerSize = marker.size();
 
 		switch (i) {
 		case 0:
-			marker.emplaceCircle(Geom::Point{0, 0}, marker.size);
+			marker.emplaceCircle(Geom::Point{0, 0}, markerSize);
 			break;
 
 		case 1:
 			marker.emplaceCircle(
-			    Geom::Point{markers[0].size + marker.size, 0},
-			    marker.size);
+			    Geom::Point{firstMarkerSize + markerSize, 0},
+			    markerSize);
 			break;
 
 		default:
-			if (marker.size == 0.0) {
+			if (markerSize == 0.0) {
 				marker.emplaceCircle(Geom::Point{0, 0}, 0);
 				continue;
 			}
@@ -109,14 +111,15 @@ std::optional<Geom::Circle> BubbleChart::getTouchingCircle(
 	auto first = markers[firstIdx].circle();
 	auto last = markers[lastIdx].circle();
 
-	first.radius += act.size;
-	last.radius += act.size;
+	auto &&size = act.size();
+	first.radius += size;
+	last.radius += size;
 
 	auto newCenter = last.intersection(first)[0];
 
 	if (!newCenter) return std::nullopt;
 
-	return Geom::Circle(*newCenter, act.size);
+	return Geom::Circle(*newCenter, size);
 }
 
 }

src/chart/speclayout/specmarker.h

@@ -13,31 +13,35 @@ namespace Vizzu::Charts
 struct SpecMarker
 {
 	size_t index;
-	double size;
-	std::variant<Geom::Rect, Geom::Circle> shape;
+	std::variant<double, Geom::Rect, Geom::Circle> sizeOrShape;
 
-	SpecMarker(size_t index, double radiusOrAreaFactor) :
+	SpecMarker(size_t index, double radiusOrAreaFactorSize) :
 	    index(index),
-	    size(radiusOrAreaFactor)
+	    sizeOrShape(radiusOrAreaFactorSize)
 	{}
 
 	template <typename... T> void emplaceCircle(T &&...params)
 	{
-		shape.emplace<Geom::Circle>(std::forward<T>(params)...);
+		sizeOrShape.emplace<Geom::Circle>(std::forward<T>(params)...);
 	}
 
 	void emplaceRect(const Geom::Point &p0, const Geom::Point &p1)
 	{
-		shape.emplace<Geom::Rect>(p0, Geom::Size{p1 - p0});
+		sizeOrShape.emplace<Geom::Rect>(p0, Geom::Size{p1 - p0});
+	}
+
+	[[nodiscard]] const double &size() const
+	{
+		return *std::get_if<double>(&sizeOrShape);
 	}
 
 	[[nodiscard]] const Geom::Rect &rect() const
 	{
-		return *std::get_if<Geom::Rect>(&shape);
+		return *std::get_if<Geom::Rect>(&sizeOrShape);
 	}
 	[[nodiscard]] const Geom::Circle &circle() const
 	{
-		return *std::get_if<Geom::Circle>(&shape);
+		return *std::get_if<Geom::Circle>(&sizeOrShape);
 	}
 
 	static bool indexOrder(const SpecMarker &a, const SpecMarker &b)
@@ -47,7 +51,7 @@ struct SpecMarker
 
 	static bool sizeOrder(const SpecMarker &a, const SpecMarker &b)
 	{
-		return b.size < a.size;
+		return b.size() < a.size();
 	}
 };
 

src/chart/speclayout/treemap.cpp

@@ -41,7 +41,7 @@ void TreeMap::divide(It begin,
 	}
 
 	auto sum = 0.0;
-	for (auto it = begin; it != end; ++it) sum += it->size;
+	for (auto it = begin; it != end; ++it) sum += it->size();
 
 	if (sum == 0) {
 		for (auto it = begin; it != end; ++it)
@@ -52,7 +52,7 @@ void TreeMap::divide(It begin,
 	double factor{};
 	auto it = begin;
 	while (it != end)
-		if (factor += it++->size / sum; factor > 0.4) break;
+		if (factor += it++->size() / sum; factor > 0.4) break;
 
 	auto &&[px, py] = Math::interpolate(p0, p1, factor);
 

src/chart/speclayout/treemap.h

@@ -27,7 +27,7 @@ class TreeMap
 
 	std::vector<SpecMarker> markers;
 
-	void divide(It begin,
+	static void divide(It begin,
 	    It end,
 	    const Geom::Point &p0,
 	    const Geom::Point &p1,