Merge pull request #85 from vizzuhq/simon-0.4.7

Simon 0.4.7

Author: simzer

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Runtime problem fixed for stacked charts.
+
 ## [0.4.6] - 2022-03-12
 
 ### Fixed

src/chart/generator/diagram.cpp

@@ -123,6 +123,8 @@ void Diagram::generateMarkers(const Data::DataCube &dataCube,
 		mainBuckets[marker.mainId.seriesId][marker.mainId.itemId] = itemIndex;
 		subBuckets[marker.subId.seriesId][marker.subId.itemId] = itemIndex;
 	}
+	clearEmptyBuckets(mainBuckets, true);
+	clearEmptyBuckets(subBuckets, false);
 	linkMarkers(mainBuckets, true);
 	linkMarkers(subBuckets, false);
 }
@@ -140,7 +142,8 @@ void Diagram::generateMarkersInfo()
 	}
 }
 
-void Diagram::linkMarkers(const Buckets &buckets, bool main)
+std::vector<std::pair<uint64_t, double>> 
+Diagram::sortedBuckets(const Buckets &buckets, bool main)
 {
 	size_t maxBucketSize = 0;
 	for (const auto &pair : buckets)
@@ -174,9 +177,38 @@ void Diagram::linkMarkers(const Buckets &buckets, bool main)
 	}
 	if (main && options->reverse.get())
 	{
-			std::reverse(sorted.begin(), sorted.end());
+		std::reverse(sorted.begin(), sorted.end());
 	}
 
+	return sorted;
+}
+
+void Diagram::clearEmptyBuckets(const Buckets &buckets, bool main)
+{
+	for (const auto &pair : buckets)
+	{
+		const auto &bucket = pair.second;
+
+		bool enabled = false;
+
+		for (const auto &id : bucket)
+		{
+			auto &marker = markers[id.second];
+			enabled |= (bool)marker.enabled;
+		}
+
+		if (!enabled) for (const auto &id : bucket)
+		{
+			auto &marker = markers[id.second];
+			marker.resetSize((bool)options->horizontal.get() == !main);
+		}
+	}
+}
+
+void Diagram::linkMarkers(const Buckets &buckets, bool main)
+{
+	auto sorted = sortedBuckets(buckets, main);
+
 	for (const auto &pair : buckets)
 	{
 		const auto &bucket = pair.second;

src/chart/generator/diagram.h

@@ -103,6 +103,9 @@ class Diagram
 	void normalizeSizes();
 	void normalizeColors();
 	void recalcStackedLineChart();
+	std::vector<std::pair<uint64_t, double>> 
+	sortedBuckets(const Buckets &buckets, bool main);
+	void clearEmptyBuckets(const Buckets &buckets, bool main);
 };
 
 typedef std::shared_ptr<Diagram> DiagramPtr;

src/chart/generator/marker.cpp

@@ -127,6 +127,13 @@ void Marker::setNextMarker(uint64_t itemId,
 	}
 }
 
+void Marker::resetSize(bool horizontal)
+{
+	double Point::*coord = horizontal ? &Point::x : &Point::y;
+	size.*coord = 0;
+	position.*coord = 0;
+}
+
 void Marker::setIdOffset(size_t offset)
 {
 	if ((bool)prevMainMarkerIdx) (*prevMainMarkerIdx).value += offset;
@@ -193,21 +200,21 @@ double Marker::getValueForScale(const Scales &scales,
 
 	auto &stat = stats.scales[type];
 
-	if (continuous)
+	if (scale.isPseudoDiscrete())
 	{
-		singlevalue = (double)data.valueAt(index, *continuous);
-
 		if (scale.stackable())
-			value = (double)data.aggregateAt(index, sumBy, *continuous);
+			value = 1.0;
 		else
-			value = singlevalue;
+			value = (double)id.itemId;
 	}
 	else
 	{
+		singlevalue = (double)data.valueAt(index, *continuous);
+
 		if (scale.stackable())
-			value = 1.0;
+			value = (double)data.aggregateAt(index, sumBy, *continuous);
 		else
-			value = (double)id.itemId;
+			value = singlevalue;
 	}
 
 	if (enabled) {

src/chart/generator/marker.h

@@ -88,6 +88,7 @@ class Marker
 
 	void setNextMarker(uint64_t itemId, Marker *marker,
 					 bool horizontal, bool main);
+	void resetSize(bool horizontal);
 
 	Geom::Rect toRectangle() const;
 	void fromRectangle(const Geom::Rect &rect);

src/chart/main/version.cpp

@@ -1,5 +1,5 @@
 #include "version.h"
 
-const App::Version Vizzu::Main::version(0, 4, 6);
+const App::Version Vizzu::Main::version(0, 4, 7);
 
 const char *Vizzu::Main::siteUrl = "https://lib.vizzuhq.com/";