Merge pull request #307 from vizzuhq/bugfix

Tooltip interpolation exception fix

Author: schaumb

CHANGELOG.md

@@ -13,6 +13,10 @@
   finished, the library is aborted due to an exception.
 - At times, the chosen marker would disappear from the selections during
   rapid mouse actions, leading to an exception being triggered.
+- Sometimes, during mouse actions, when the tooltip animation disappeared, the
+  marker information was null. With a new mouse action, when other tooltip 
+  appeared, the marker transformation went from null to null, which caused an
+  exception.
 
 ## [0.8.0] - 2023-07-12
 

src/chart/generator/plot.cpp

@@ -23,8 +23,10 @@ Plot::MarkersInfo interpolate(const Plot::MarkersInfo &op1,
 	     iter1++, iter2++) {
 		if (iter1->first != iter2->first)
 			throw std::logic_error("invalid map operation");
-		result.insert(std::make_pair(iter1->first,
-		    interpolate(iter1->second, iter2->second, factor)));
+		if (iter1->second.get() || iter2->second.get()) {
+			result.insert(std::make_pair(iter1->first,
+			    interpolate(iter1->second, iter2->second, factor)));
+		}
 	}
 	return result;
 }

src/chart/rendering/drawmarkerinfo.cpp

@@ -202,11 +202,10 @@ DrawMarkerInfo::DrawMarkerInfo(const Layout &layout,
     plot(plot),
     style(plot.getStyle().tooltip)
 {
-	auto coordSys = Draw::CoordinateSystem(layout.plotArea,
+	coordSystem.emplace(layout.plotArea,
 	    plot.getOptions()->angle,
 	    plot.getOptions()->coordSystem,
 	    plot.keepAspectRatio);
-	coordSystem = &coordSys;
 	for (const auto &info : plot.getMarkersInfo()) {
 		if (info.second.count == 0) continue;
 		auto weight1 = info.second.values[0].weight;
@@ -224,9 +223,6 @@ DrawMarkerInfo::DrawMarkerInfo(const Layout &layout,
 				fadeOutMarkerInfo(cnt1, weight1);
 			else if (cnt1 && cnt2)
 				moveMarkerInfo(cnt1, weight1, cnt2, weight2);
-			else
-				throw std::logic_error(
-				    "invalid marker info combination");
 		}
 	}
 }

src/chart/rendering/drawmarkerinfo.h

@@ -48,7 +48,7 @@ class DrawMarkerInfo
 	const Layout &layout;
 	Gfx::ICanvas &canvas;
 	const Gen::Plot &plot;
-	Draw::CoordinateSystem *coordSystem{};
+	std::optional<Draw::CoordinateSystem> coordSystem;
 	const Styles::Tooltip &style;
 
 	void fadeInMarkerInfo(Content &cnt, double weight);