Merge pull request #543 from vizzuhq/fix-bubblechart

Change Bubblechart behaviour on failure + fix negative base markers

Author: schaumb

CHANGELOG.md

@@ -4,8 +4,12 @@
 
 ### Fixed
 
+
+- Change bubblechart behavior on failure.
+- Fix reference markers on bubblechart with negative values. 
 - From now lightness channel goes from light (low value) to dark (high value) colors. 
 
+
 ## [0.11.2] - 2024-06-18
 
 ### Fixed

src/base/io/log.h

@@ -1,10 +1,7 @@
 #ifndef IO_LOG
 #define IO_LOG
 
-#include <functional>
-#include <memory>
 #include <string>
-#include <type_traits>
 
 #include "base/conv/tostring.h"
 
@@ -29,7 +26,7 @@ class Log
 
 	bool enabled = true;
 	bool timestamp = true;
-	Log::LogFunc logFunc = [](std::string const &s)
+	LogFunc logFunc = [](const std::string &s)
 	{
 		puts(s.c_str());
 	};

src/chart/speclayout/bubblechart.cpp

@@ -38,11 +38,13 @@ void BubbleChart::generate()
 	auto firstMarkerSize = baseMarker->size();
 	baseMarker->emplaceCircle(Geom::Point{0, 0}, firstMarkerSize);
 
-	auto currMarker = baseMarker + 1;
-	while (currMarker != markers.end() && currMarker->negative)
-		currMarker++->emplaceCircle(Geom::Point{0, 0}, 0);
-	if (currMarker == markers.end()) return;
+	auto nextBaseMarker = baseMarker + 1;
+	while (
+	    nextBaseMarker != markers.end() && nextBaseMarker->negative)
+		nextBaseMarker++->emplaceCircle(Geom::Point{0, 0}, 0);
+	if (nextBaseMarker == markers.end()) return;
 
+	auto currMarker = nextBaseMarker;
 	auto markerSize = currMarker->size();
 	currMarker->emplaceCircle(
 	    Geom::Point{firstMarkerSize + markerSize, 0},
@@ -59,22 +61,25 @@ void BubbleChart::generate()
 		if (markerSize == 0.0) break;
 
 		if (auto &&candidate1 = getTouchingCircle(markerSize,
-		        baseMarker[1],
+		        *nextBaseMarker,
 		        *preMarker);
 		    candidate1
 		    && !candidate1->overlaps(baseMarker->circle(), 0.00001)) {
 			currMarker->emplaceCircle(*candidate1);
-			++baseMarker;
+			baseMarker = nextBaseMarker++;
+			while (nextBaseMarker->negative) ++nextBaseMarker;
 		}
 		else if (auto &&candidate0 = getTouchingCircle(markerSize,
 		             *baseMarker,
 		             *preMarker);
 		         candidate0
-		         && !candidate0->overlaps(baseMarker[1].circle(),
+		         && !candidate0->overlaps(nextBaseMarker->circle(),
 		             0.00001))
 			currMarker->emplaceCircle(*candidate0);
-		else
-			throw std::logic_error("Cannot generate bubble chart");
+		else {
+			// TODO bubblechart generation failed. It need a fix.
+			break;
+		}
 		preMarker = currMarker;
 	}