Parameter added for every draw event.

Author: simzer

src/chart/main/events.h

@@ -2,6 +2,8 @@
 #define EVENTS_H
 
 #include "base/io/log.h"
+#include "base/geom/line.h"
+#include "base/geom/rect.h"
 #include "base/util/eventdispatcher.h"
 
 namespace Vizzu
@@ -11,6 +13,24 @@ class Events {
 public:
 	Events(class Chart &chart);
 
+	struct OnRectDrawParam : public Util::EventDispatcher::Params
+	{
+		Geom::Rect rect;
+		OnRectDrawParam(Geom::Rect rect) : rect(rect) {}
+		std::string dataToJson() const override {
+			return "{\"rect\":" + std::string(rect) + "}";
+		}
+	};
+
+	struct OnLineDrawParam : public Util::EventDispatcher::Params
+	{
+		Geom::Line line;
+		OnLineDrawParam(Geom::Line line) : line(line) {}
+		std::string dataToJson() const override {
+			return "{\"line\":" + std::string(line) + "}";
+		}
+	};
+
 	Util::EventDispatcher::event_ptr update;
 	struct Draw {
 		Util::EventDispatcher::event_ptr background;

src/chart/rendering/drawaxes.cpp

@@ -76,8 +76,11 @@ void drawAxes::drawAxis(Diag::Scale::Type axisIndex,
 		canvas.setLineColor(lineColor);
 		canvas.setLineWidth(1.0);
 
-		if (events.plot.axis.base->invoke())
+		if (events.plot.axis.base
+			->invoke(Events::OnLineDrawParam(line)))
+		{
 			painter.drawLine(line);
+		}
 	}
 }
 

src/chart/rendering/drawbackground.cpp

@@ -1,5 +1,7 @@
 #include "drawbackground.h"
 
+#include "chart/main/events.h"
+
 using namespace Vizzu;
 using namespace Vizzu::Draw;
 
@@ -14,7 +16,7 @@ drawBackground::drawBackground(const Geom::Rect &rect,
 		canvas.setBrushColor(*style.backgroundColor);
 		canvas.setLineColor(*style.borderColor);
 		canvas.setLineWidth(*style.borderWidth);
-		if (!onDraw || onDraw->invoke(OnDrawParam(rect)))
+		if (!onDraw || onDraw->invoke(Events::OnRectDrawParam(rect)))
 		{
 			canvas.rectangle(rect);
 		}

src/chart/rendering/drawbackground.h

@@ -14,15 +14,6 @@ namespace Draw
 class drawBackground
 {
 public:
-	struct OnDrawParam : public Util::EventDispatcher::Params
-	{
-		Geom::Rect rect;
-		OnDrawParam(Geom::Rect rect) : rect(rect) {}
-		std::string dataToJson() const override {
-			return "{\"rect\":" + std::string(rect) + "}";
-		}
-	};
-
 	drawBackground(const Geom::Rect &rect,
 	    Gfx::ICanvas &canvas,
 	    const Styles::Box &style,

src/chart/rendering/drawguides.cpp

@@ -64,7 +64,8 @@ void drawGuides::drawGuide(bool horizontal,
 	auto relMax = ident * val;
 
 	canvas.setLineColor(color);
-	if (events.plot.axis.guide->invoke())
-		painter.drawLine(Geom::Line(relMax, relMax + normal));
+	Geom::Line line(relMax, relMax + normal);
+	if (events.plot.axis.guide->invoke(Events::OnLineDrawParam(line)))
+		painter.drawLine(line);
 }
 

src/chart/rendering/drawinterlacing.cpp

@@ -136,8 +136,12 @@ void drawInterlacing::draw(bool horizontal,
 				{
 					painter.setPolygonToCircleFactor(0);
 					painter.setPolygonStraightFactor(0);
-					if(events.plot.axis.interlacing->invoke())
+					auto rect = Geom::Rect::Boundary(points);
+					if(events.plot.axis.interlacing
+						->invoke(Events::OnRectDrawParam(rect)))
+					{
 						painter.drawPolygon(points);
+					}
 				}
 			}
 		}
@@ -224,7 +228,10 @@ void drawInterlacing::drawSticks(double stickIntensity,
 			}
 		});
 
-	if(events.plot.axis.tick->invoke())
+	if(events.plot.axis.tick
+		->invoke(Events::OnLineDrawParam(tickLine)))
+	{
 		canvas.line(tickLine);
+	}
 	if (*tickStyle.lineWidth > 1) canvas.setLineWidth(0);
 }

src/chart/rendering/drawitem.cpp

@@ -47,8 +47,12 @@ void drawItem::drawLines(const Guides &guides,
 			auto lineColor = baseColor * (double)guides.y.guidelines;
 			canvas.setLineColor(lineColor);
 			auto axisPoint = blended.center.xComp() + origo.yComp();
-			if (events.plot.marker.guide->invoke())
-				painter.drawLine(Geom::Line(axisPoint, blended.center));
+			Geom::Line line(axisPoint, blended.center);
+			if (events.plot.marker.guide
+				->invoke(Events::OnLineDrawParam(line)))
+			{
+				painter.drawLine(line);
+			}
 		}
 		if ((double)guides.x.guidelines > 0)
 		{
@@ -58,8 +62,12 @@ void drawItem::drawLines(const Guides &guides,
 			auto lineColor = baseColor * (double)guides.x.guidelines;
 			canvas.setLineColor(lineColor);
 			auto axisPoint = blended.center.yComp() + origo.xComp();
-			if (events.plot.marker.guide->invoke())
-				painter.drawLine(Geom::Line(blended.center, axisPoint));
+			Geom::Line line(blended.center, axisPoint);
+			if (events.plot.marker.guide
+				->invoke(Events::OnLineDrawParam(line)))
+			{
+				painter.drawLine(line);
+			}
 		}
 	}
 }
@@ -152,7 +160,8 @@ void drawItem::draw(
 
 		if (line) 
 		{
-			if (events.plot.marker.base->invoke())
+			if (events.plot.marker.base
+				->invoke(Events::OnRectDrawParam(drawItem.getBoundary())))
 			{
 				painter.drawStraightLine(
 					drawItem.getLine(), drawItem.lineWidth,
@@ -165,7 +174,8 @@ void drawItem::draw(
 			canvas.setLineWidth(
 			    *style.plot.marker.borderWidth);
 			canvas.setBrushColor(colors.second);
-			if (events.plot.marker.base->invoke())
+			if (events.plot.marker.base
+				->invoke(Events::OnRectDrawParam(drawItem.getBoundary())))
 			{
 				painter.drawPolygon(drawItem.points);
 			}

src/chart/rendering/drawlegend.cpp

@@ -99,7 +99,7 @@ void drawLegend::drawMarker(Gfx::Color color, const Geom::Rect &rect)
 		->factor(Styles::Legend::Marker::Type::circle)
 	    * rect.size.minSize() / 2.0;
 
-	if (events.marker->invoke())
+	if (events.marker->invoke(Events::OnRectDrawParam(rect)))
 		Gfx::Draw::RoundedRect(canvas, rect, radius);
 }
 
@@ -139,7 +139,7 @@ void drawLegend::colorBar(const Geom::Rect &rect)
 	    *diagram.getStyle().data.colorGradient * (weight * enabled));
 	canvas.setLineColor(Gfx::Color::Transparent());
 	canvas.setLineWidth(0);
-	if (events.bar->invoke())
+	if (events.bar->invoke(Events::OnRectDrawParam(rect)))
 		canvas.rectangle(rect);
 }
 
@@ -160,14 +160,14 @@ void drawLegend::lightnessBar(const Geom::Rect &rect)
 	canvas.setBrushGradient(rect.leftSide(), gradient * (weight * enabled));
 	canvas.setLineColor(Gfx::Color::Transparent());
 	canvas.setLineWidth(0);
-	if (events.bar->invoke())
+	if (events.bar->invoke(Events::OnRectDrawParam(rect)))
 		canvas.rectangle(rect);
 }
 
 void drawLegend::sizeBar(const Geom::Rect &rect)
 {
 	canvas.setBrushColor(Gfx::Color::Gray(0.8) * (weight * enabled));
-	if (events.bar->invoke())
+	if (events.bar->invoke(Events::OnRectDrawParam(rect)))
 	{
 		canvas.beginPolygon();
 		canvas.addPoint(rect.bottomLeft());