chart/linechart: add the 'marker-size' and 'labels' options (8beb0d26) · Commits · github_fork / Clip

elements/chart/linechart.cc

+4 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,10 @@ ReturnCode build(
		{"color", bind(&expr_rewritev, _1, "color", &line_opts)},
		{"colors", bind(&expr_rewritev, _1, "colors", &line_opts)},
		{"stroke", bind(&expr_rewritev, _1, "stroke", &line_opts)},
		{"marker-size", bind(&expr_rewritev, _1, "marker-size", &line_opts)},
		{"marker-sizes", bind(&expr_rewritev, _1, "marker-sizes", &line_opts)},
		{"labels", bind(&expr_rewritev, _1, "labels", &line_opts)},
		{"label-font-size", bind(&expr_rewritev, _1, "label-font-size", &line_opts)},
		{"axes", bind(&expr_to_stringset, _1, &axes)},
		{"grid", bind(&expr_to_copy, _1, &grid_opts)},
		{"legend", bind(&expr_to_copy, _1, &legend_opts)},

elements/chart/lines.cc

+70 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ using namespace std::placeholders;
		namespace fviz::elements::chart::lines {

		static const double kDefaultLineWidthPT = 2;
		static const double kDefaultLabelPaddingEM = 0.4;

		struct PlotLinesConfig {
		std::vector<Measure> x;
		@@ -37,7 +38,13 @@ struct PlotLinesConfig {
		ScaleConfig scale_y;
		std::vector<DataGroup> groups;
		std::vector<Color> colors;
		std::vector<Measure> marker_sizes;
		Measure line_width;
		std::vector<std::string> labels;
		FontInfo label_font;
		Color label_color;
		Measure label_padding;
		Measure label_font_size;
		};

		ReturnCode draw(
		@@ -65,6 +72,13 @@ ReturnCode draw(
		&*config->y.begin(),
		&*config->y.end());

		convert_units(
		{
		bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1),
		},
		&*config->marker_sizes.begin(),
		&*config->marker_sizes.end());

		/* draw lines */
		for (const auto& group : config->groups) {
		if (group.index.empty()) {
		@@ -92,6 +106,57 @@ ReturnCode draw(
		strokePath(layer, clip, path, style);
		}

		/* draw points */
		if (!config->marker_sizes.empty()) {
		for (size_t i = 0; i < config->x.size(); ++i) {
		auto sx = clip.x + config->x[i];
		auto sy = clip.y + clip.h - config->y[i];

		const auto& color = config->colors.empty()
		? Color{}
		: config->colors[i % config->colors.size()];

		auto size = config->marker_sizes[i % config->marker_sizes.size()];

		FillStyle style;
		style.color = color;

		// TODO point style
		Path path;
		path.moveTo(sx + size, sy);
		path.arcTo(sx, sy, size, 0, M_PI * 2);
		fillPath(layer, clip, path, style);
		}
		}

		/* draw labels */
		for (size_t i = 0; i < config->labels.size(); ++i) {
		const auto& label_text = config->labels[i];

		auto label_offset = config->marker_sizes.empty()
		? 0
		: config->marker_sizes[i % config->marker_sizes.size()];

		auto label_padding = label_offset + measure_or(
		config->label_padding,
		from_em(kDefaultLabelPaddingEM, config->label_font_size));

		Point p(
		clip.x + config->x[i],
		clip.y + clip.h - config->y[i] - label_padding);

		TextStyle style;
		style.font = config->label_font;
		style.color = config->label_color;
		style.font_size = config->label_font_size;

		auto ax = HAlign::CENTER;
		auto ay = VAlign::BOTTOM;
		if (auto rc = drawTextLabel(label_text, p, ax, ay, style, layer); rc != OK) {
		return rc;
		}
		}

		return OK;
		}

		@@ -101,6 +166,8 @@ ReturnCode build(
		ElementRef* elem) {
		/* set defaults from environment */
		auto c = std::make_shared<PlotLinesConfig>();
		c->label_font = env.font;
		c->label_font_size = env.font_size;
		c->line_width = from_pt(kDefaultLineWidthPT);

		/* parse properties */
		@@ -120,6 +187,9 @@ ReturnCode build(
		{"color", expr_tov_fn<Color>(bind(&expr_to_color, _1, _2), &c->colors)},
		{"colors", expr_tov_fn<Color>(bind(&expr_to_color, _1, _2), &c->colors)},
		{"stroke", bind(&expr_to_measure, _1, &c->line_width)},
		{"marker-size", bind(&data_load, _1, &c->marker_sizes)},
		{"labels", bind(&data_load_strings, _1, &c->labels)},
		{"label-font-size", bind(&expr_to_measure, _1, &c->label_font_size)},
		});

		if (!config_rc) {

elements/chart/points.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -159,8 +159,8 @@ ReturnCode build(
		{"scale-y", bind(&scale_configure_kind, _1, &c->scale_y)},
		{"scale-x-padding", bind(&expr_to_float64, _1, &c->scale_x.padding)},
		{"scale-y-padding", bind(&expr_to_float64, _1, &c->scale_y.padding)},
		{"size", bind(&data_load, _1, &c->sizes)},
		{"sizes", bind(&data_load, _1, &c->sizes)},
		{"marker-size", bind(&data_load, _1, &c->sizes)},
		{"marker-sizes", bind(&data_load, _1, &c->sizes)},
		{"color", expr_tov_fn<Color>(bind(&expr_to_color, _1, _2), &c->colors)},
		{"colors", expr_tov_fn<Color>(bind(&expr_to_color, _1, _2), &c->colors)},
		{"labels", bind(&data_load_strings, _1, &c->labels)},

elements/chart/scatterplot.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,8 @@ ReturnCode build(
		{"sizes", bind(&expr_rewritev, _1, "sizes", &point_opts)},
		{"color", bind(&expr_rewritev, _1, "color", &point_opts)},
		{"colors", bind(&expr_rewritev, _1, "colors", &point_opts)},
		{"marker-size", bind(&expr_rewritev, _1, "marker-size", &point_opts)},
		{"marker-sizes", bind(&expr_rewritev, _1, "marker-sizes", &point_opts)},
		{"labels", bind(&expr_rewritev, _1, "labels", &point_opts)},
		{"label-font-size", bind(&expr_rewritev, _1, "label-font-size", &point_opts)},
		{"axes", bind(&expr_to_stringset, _1, &axes)},

examples/charts/linechart_with_labels.fvz

+4 −1

Original line number	Diff line number	Diff line
		@@ -4,10 +4,13 @@
		(chart/linechart
		data-x (csv "tests/testdata/city_temperatures_london.csv" month)
		data-y (csv "tests/testdata/city_temperatures_london.csv" temperature)
		labels (csv "tests/testdata/city_temperatures_london.csv" temperature_str)
		scale-x-padding 0.6
		ticks-x (linear 1 1)
		axis-x-format (custom "Jan" "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" "Sep" "Oct" "Nov" "Dec")
		limit-y (-10 32)
		ticks-y (linear 5 -10)
		color (#06c)
		axes (bottom left))
		marker-size (3pt)
		axes (bottom left)
		legend (items ("London") colors (#06c) position (bottom left)))

Admin message