data labels for pointcharts (2befd758) · Commits · github_fork / Clip

linechart.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ namespace ui {
		*/
		class LineChart : public Drawable {
		public:
		static const constexpr int kLabelPadding = 10;
		static const constexpr int kLabelPadding = 8;
		static char kDefaultLineStyle[];
		static char kDefaultLineWidth[];
		static char kDefaultPointStyle[];
		@@ -222,7 +222,7 @@ void LineChart2D<TX, TY>::render(
		target->drawText(
		label,
		ss_x,
		ss_y - point_size * 0.5f - kLabelPadding,
		ss_y - point_size - kLabelPadding,
		"middle",
		"text-after-edge",
		"label");

+13 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ class PointChart : public Drawable {
		public:
		static char kDefaultPointStyle[];
		static char kDefaultPointSize[];
		static const constexpr int kLabelPadding = 8;

		PointChart(ui::Canvas* canvas);

		@@ -224,6 +225,17 @@ void PointChart3D<TX, TY, TZ>::render(
		auto y = y_domain_.getAs<Domain<TY>>()->scale(point.y());
		auto ss_x = viewport->paddingLeft() + x * viewport->innerWidth();
		auto ss_y = viewport->paddingTop() + (1.0 - y) * viewport->innerHeight();
		auto label = series->labelFor(&point);

		if (show_labels_) {
		target->drawText(
		label,
		ss_x,
		ss_y - point.z() - kLabelPadding,
		"middle",
		"text-after-edge",
		"label");
		}

		target->drawPoint(
		ss_x,
		@@ -232,7 +244,7 @@ void PointChart3D<TX, TY, TZ>::render(
		point.z(),
		color,
		"point",
		series->labelFor(&point),
		label,
		series->name());
		}
		}