Add center point

Author: schaumb

CHANGELOG.md

@@ -16,7 +16,7 @@
 
 ### Added
 
-- Add marker top position to draw event
+- Add marker top and center position to draw event
 
 ## [0.14.0] - 2024-10-03
 

src/apps/weblib/ts-api/events.ts

@@ -141,6 +141,7 @@ export interface Area extends Element {
 /** Marker element position structure helper for tooltip */
 export interface MarkerPosition {
 	top: Point
+	center: Point
 }
 
 /** Plot marker element of the chart representing a data point. */

src/chart/main/events.h

@@ -250,6 +250,7 @@ class Events
 			struct DataPosition
 			{
 				Geom::Point top;
+				Geom::Point center;
 			} position;
 
 			explicit Marker(const Gen::Marker &marker,

src/chart/rendering/markers/abstractmarker.cpp

@@ -133,6 +133,17 @@ AbstractMarker AbstractMarker::createInterpolated(
 	return aMarker;
 }
 
+void AbstractMarker::setDataPosition(const CoordinateSystem &coordSys)
+{
+	dataPosition = {
+	    this->getLabelPos(Styles::MarkerLabel::Position::top,
+	            coordSys)
+	        .end,
+	    this->getLabelPos(Styles::MarkerLabel::Position::center,
+	            coordSys)
+	        .begin};
+}
+
 Geom::Rect AbstractMarker::getBoundary() const
 {
 	return Geom::Rect::Boundary(points);

src/chart/rendering/markers/abstractmarker.h

@@ -52,6 +52,8 @@ class AbstractMarker
 	    const Gen::Marker &marker,
 	    const Gen::ShapeType &shapeType,
 	    ::Anim::InterpolateIndex lineIndex);
+
+	void setDataPosition(const CoordinateSystem &coordSys);
 };
 
 class SingleDrawMarker : public AbstractMarker

src/chart/rendering/markers/circlemarker.cpp

@@ -39,10 +39,7 @@ CircleMarker::CircleMarker(const Gen::Marker &marker,
 	dataRect.size = Geom::Size();
 	radius = fabs(coordSys.verConvert(r));
 
-	dataPosition = {
-	    this->getLabelPos(Styles::MarkerLabel::Position::top,
-	            coordSys)
-	        .end};
+	setDataPosition(coordSys);
 }
 
 }

src/chart/rendering/markers/connectingmarker.cpp

@@ -159,10 +159,7 @@ ConnectingMarker::ConnectingMarker(const DrawingContext &ctx,
 	dataRect.pos = isLine ? points[2] : points[1];
 	dataRect.size = Geom::Size{points[2] - dataRect.pos};
 
-	dataPosition = {
-	    this->getLabelPos(Styles::MarkerLabel::Position::top,
-	            ctx.coordSys)
-	        .end};
+	setDataPosition(ctx.coordSys);
 }
 
 const Gen::Marker *ConnectingMarker::getPrev(

src/chart/rendering/markers/rectanglemarker.cpp

@@ -85,10 +85,7 @@ RectangleMarker::RectangleMarker(const Gen::Marker &marker,
 	dataRect.size = Geom::Size{points[2] - points[0]};
 	radius = 0;
 
-	dataPosition = {
-	    this->getLabelPos(Styles::MarkerLabel::Position::top,
-	            coordSys)
-	        .end};
+	setDataPosition(coordSys);
 }
 
 }

test/e2e/tests/features.json

@@ -14,7 +14,7 @@
 			"refs": ["ba17dad"]
 		},
 		"events/drawing_events": {
-			"refs": ["6873391"]
+			"refs": ["c3169b0"]
 		},
 		"subtitle_caption": {
 			"refs": ["f6dabf0"]

test/e2e/tests/features/events/drawing_events.mjs

@@ -34,6 +34,13 @@ function overlay(e, chart) {
 		ctx.arc(top.x, top.y, 2, 0, 2 * Math.PI)
 		ctx.fill()
 		ctx.restore()
+		const center = e.target.position.center
+		ctx.save()
+		ctx.fillStyle = '#000000F0'
+		ctx.moveTo(center.x, center.y)
+		ctx.arc(center.x, center.y, 2, 0, 2 * Math.PI)
+		ctx.fill()
+		ctx.restore()
 	}
 	ctx.save()
 	ctx.fillStyle = '#FF00000F'
@@ -117,7 +124,7 @@ function setupEvents(chart) {
 		})
 	})
 	chart.on('draw-complete', (e) => {
-		const references = [1393906603, 585199799]
+		const references = [329751708, -2021415194]
 		receivedEvents.push(e)
 		const result = JSON.stringify(receivedEvents, null, 2)
 		const hash = (str) =>