Merge pull request #527 from vizzuhq/spec_common_base

Move bubble chart and treemap builders to common base

Author: schaumb

src/chart/generator/plot.cpp

@@ -237,7 +237,7 @@ void Plot::addSpecLayout(Buckets &buckets)
 			keepAspectRatio = true;
 		}
 		else
-			Charts::TreeMap::setupVector(buckets);
+			Charts::TreeMapBuilder::setupVector(buckets);
 	}
 }
 

src/chart/speclayout/bubblechart.cpp

@@ -7,7 +7,7 @@ namespace Vizzu::Charts
 {
 
 BubbleChart::BubbleChart(const std::vector<double> &circleAreas,
-    const Geom::Rect &rect)
+    const SpecMarker *parent)
 {
 	markers.reserve(circleAreas.size());
 
@@ -19,7 +19,8 @@ BubbleChart::BubbleChart(const std::vector<double> &circleAreas,
 	std::sort(markers.begin(), markers.end(), SpecMarker::sizeOrder);
 
 	generate();
-	normalize(rect);
+	normalize(parent ? parent->circle().boundary()
+	                 : Geom::Rect{{}, Geom::Size{1, 1}});
 
 	std::sort(markers.begin(), markers.end(), SpecMarker::indexOrder);
 }

src/chart/speclayout/bubblechart.h

@@ -19,8 +19,7 @@ class BubbleChart
 	Markers markers;
 
 	explicit BubbleChart(const std::vector<double> &circleAreas,
-	    const Geom::Rect &rect = Geom::Rect(Geom::Point{0, 0},
-	        Geom::Size{1, 1}));
+	    const SpecMarker *parent = nullptr);
 
 private:
 	void generate();

src/chart/speclayout/bubblechartbuilder.h

@@ -5,11 +5,12 @@
 #include <cmath>
 
 #include "bubblechart.h"
+#include "sizedependentlayout.h"
 
 namespace Vizzu::Charts
 {
 
-class BubbleChartBuilder
+class BubbleChartBuilder : SizeDependentLayout<BubbleChart>
 {
 public:
 	template <typename Hierarchy>
@@ -21,36 +22,18 @@ template <typename Hierarchy>
 void BubbleChartBuilder::setupVector(double maxRadius,
     const Hierarchy &hierarchy)
 {
-	if (hierarchy.empty()) return;
-
-	std::vector<double> sizes(hierarchy.size());
-	for (std::size_t ix{}; const auto &level : hierarchy)
-		for (auto &sum = sizes[ix++]; const auto &item : level)
-			if (auto &&size = item->sizeFactor;
-			    std::isfinite(size) && size > 0)
-				sum += size;
-
-	const BubbleChart chart(sizes);
-
-	std::vector<double> ssizes(hierarchy.inner_size());
-	for (std::size_t cnt{}; const auto &level : hierarchy) {
-		for (std::size_t ix{}; const auto &item : level)
-			ssizes[ix++] = item->sizeFactor;
-
-		const BubbleChart subChart(ssizes,
-		    chart.markers[cnt++].circle().boundary());
-
-		for (std::size_t subCnt{}; const auto &item : level)
-			if (const auto &[center, r] =
-			        subChart.markers[subCnt++].circle();
-			    std::isnan(r))
-				item->enabled = false;
-			else {
-				item->position = center;
-				item->size = Geom::Size{r, r};
-				item->sizeFactor = r * r / (maxRadius * maxRadius);
-			}
-	}
+	SizeDependentLayout::setupVector(hierarchy,
+	    [&maxRadius](auto *item, const SpecMarker &marker)
+	    {
+		    if (const auto &[center, r] = marker.circle();
+		        std::isnan(r))
+			    item->enabled = false;
+		    else {
+			    item->position = center;
+			    item->size = Geom::Size{r, r};
+			    item->sizeFactor = r * r / (maxRadius * maxRadius);
+		    }
+	    });
 }
 
 }

src/chart/speclayout/sizedependentlayout.h

@@ -0,0 +1,43 @@
+//
+// Created by bela on 2024.05.17..
+//
+
+#ifndef SIZEDEPENDENTLAYOUT_H
+#define SIZEDEPENDENTLAYOUT_H
+
+namespace Vizzu::Charts
+{
+template <class ChartType> struct SizeDependentLayout
+{
+	template <class Hierarchy, class AfterMarkerSetter>
+	static void setupVector(const Hierarchy &hierarchy,
+	    AfterMarkerSetter &&afterMarkerSetter)
+	{
+		if (hierarchy.empty()) return;
+
+		std::vector<double> sizes(hierarchy.size());
+		for (std::size_t ix{}; const auto &level : hierarchy)
+			for (auto &sum = sizes[ix++]; const auto &item : level)
+				if (auto &&size = item->sizeFactor;
+				    std::isfinite(size) && size > 0)
+					sum += size;
+
+		const ChartType chart(sizes);
+
+		std::vector<double> ssizes(hierarchy.inner_size());
+
+		for (auto it = chart.markers.data();
+		     const auto &level : hierarchy) {
+			for (std::size_t ix{}; const auto &item : level)
+				ssizes[ix++] = item->sizeFactor;
+
+			const ChartType subChart(ssizes, it++);
+
+			for (std::size_t subCnt{}; const auto &item : level)
+				afterMarkerSetter(item, subChart.markers[subCnt++]);
+		}
+	}
+};
+}
+
+#endif // SIZEDEPENDENTLAYOUT_H

src/chart/speclayout/treemap.cpp

@@ -8,8 +8,7 @@ namespace Vizzu::Charts
 {
 
 TreeMap::TreeMap(const std::vector<double> &sizes,
-    const Geom::Point &p0,
-    const Geom::Point &p1)
+    const SpecMarker *parent)
 {
 	markers.reserve(sizes.size());
 
@@ -24,7 +23,11 @@ TreeMap::TreeMap(const std::vector<double> &sizes,
 	while (start != markers.end() && !std::isfinite(start->size()))
 		start++->emplaceRect({0, 0}, {0, 0});
 
-	divide(start, markers.end(), p0, p1);
+	divide(start,
+	    markers.end(),
+	    parent ? parent->rect().pos : Geom::Point{0, 1},
+	    parent ? parent->rect().topRight() : Geom::Point{1, 0});
+
 	std::ranges::sort(markers, SpecMarker::indexOrder);
 }
 

src/chart/speclayout/treemap.h

@@ -7,6 +7,7 @@
 
 #include "base/geom/rect.h"
 
+#include "sizedependentlayout.h"
 #include "specmarker.h"
 
 namespace Vizzu::Charts
@@ -16,54 +17,36 @@ class TreeMap
 {
 public:
 	explicit TreeMap(const std::vector<double> &sizes,
-	    const Geom::Point &p0 = Geom::Point{0, 1},
-	    const Geom::Point &p1 = Geom::Point{1, 0});
+	    const SpecMarker *parent = nullptr);
 
-	template <typename Hierarchy>
-	static void setupVector(const Hierarchy &hierarchy);
+	std::vector<SpecMarker> markers;
 
 private:
 	using It = std::vector<SpecMarker>::iterator;
 
-	std::vector<SpecMarker> markers;
-
 	static void divide(It begin,
 	    It end,
 	    const Geom::Point &p0,
 	    const Geom::Point &p1,
 	    bool horizontal = true);
 };
 
-template <typename Hierarchy>
-void TreeMap::setupVector(const Hierarchy &hierarchy)
+struct TreeMapBuilder : SizeDependentLayout<TreeMap>
 {
-	if (hierarchy.empty()) return;
-
-	std::vector<double> sizes(hierarchy.size());
-	for (std::size_t ix{}; const auto &level : hierarchy)
-		for (auto &sum = sizes[ix++]; const auto &item : level)
-			if (auto &&size = item->sizeFactor;
-			    std::isfinite(size) && size > 0)
-				sum += size;
-
-	TreeMap chart(sizes);
-
-	std::vector<double> in_sizes(hierarchy.inner_size());
-	for (std::size_t cnt{}; const auto &level : hierarchy) {
-		auto &&[pos, size] = chart.markers[cnt++].rect();
-
-		for (std::size_t ix{}; const auto &item : level)
-			in_sizes[ix++] = item->sizeFactor;
-
-		TreeMap subChart(in_sizes, pos, pos + size);
+	template <typename Hierarchy>
+	static void setupVector(const Hierarchy &hierarchy);
+};
 
-		for (size_t subCnt{}; const auto &item : level) {
-			auto &&[spos, ssize] =
-			    subChart.markers[subCnt++].rect().positive();
-			item->position = spos + ssize;
-			item->size = ssize;
-		}
-	}
+template <typename Hierarchy>
+void TreeMapBuilder::setupVector(const Hierarchy &hierarchy)
+{
+	SizeDependentLayout::setupVector(hierarchy,
+	    [](auto *item, const SpecMarker &marker)
+	    {
+		    auto &&[spos, ssize] = marker.rect().positive();
+		    item->position = spos + ssize;
+		    item->size = ssize;
+	    });
 }
 
 }