implement Plot::renderTo (bf7eaebc) · Commits · github_fork / Clip

elements/plot/axes.cc

+24 −80

Original line number	Diff line number	Diff line
		@@ -23,57 +23,7 @@ AxisDefinition::AxisDefinition() :
		label_padding_vert_rem(kDefaultLabelPaddingVertREM),
		tick_length_rem(kDefaultTickLengthREM) {}

		Status plot_axis_add(context* ctx, AxisPosition pos) {
		PlotConfig* elem;
		if (auto rc = element_config_as(ctx, &elem); rc) {
		return rc;
		}

		auto axis_config = std::make_unique<AxisDefinition>();
		axis_config->position = pos;

		switch (pos) {
		case AxisPosition::LEFT:
		axis_config->label_placement = AxisLabelPlacement::LEFT;
		break;
		case AxisPosition::RIGHT:
		axis_config->label_placement = AxisLabelPlacement::RIGHT;
		break;
		case AxisPosition::TOP:
		axis_config->label_placement = AxisLabelPlacement::TOP;
		break;
		case AxisPosition::BOTTOM:
		axis_config->label_placement = AxisLabelPlacement::BOTTOM;
		break;
		}

		elem->axes.emplace_back(std::move(axis_config));
		return OK;
		}

		Status plot_axis_addtick(context* ctx, float offset) {
		PlotConfig* elem;
		if (auto rc = element_config_as(ctx, &elem); rc) {
		return rc;
		}

		auto& axis_config = elem->axes.back();
		axis_config->ticks.emplace_back(offset);
		return OK;
		}

		Status plot_axis_addlabel(context* ctx, float offset, const char* label) {
		PlotConfig* elem;
		if (auto rc = element_config_as(ctx, &elem); rc) {
		return rc;
		}

		auto& axis_config = elem->axes.back();
		axis_config->labels.emplace_back(offset, label);
		return OK;
		}

		Status plot_render_axis_vertical(
		static Status renderAxisVertical(
		const AxisDefinition& axis_config,
		double x,
		double y0,
		@@ -128,7 +78,7 @@ Status plot_render_axis_vertical(
		return OK;
		}

		Status plot_render_axis_horizontal(
		static Status renderAxisHorizontal(
		const AxisDefinition& axis_config,
		double y,
		double x0,
		@@ -183,50 +133,44 @@ Status plot_render_axis_horizontal(
		return OK;
		}

		Status plot_render_axis(context* ctx, int i) {
		const PlotConfig* elem;
		if (auto rc = element_config_as(ctx, &elem); rc) {
		return rc;
		}

		assert(i < elem->axes.size());

		Status renderAxis(
		const AxisDefinition& axis,
		Layer* frame) {
		int padding = 80;
		const auto& axis = elem->axes[i];

		Status rc;
		switch (axis->position) {
		switch (axis.position) {
		case AxisPosition::LEFT:
		rc = plot_render_axis_vertical(
		*axis,
		rc = renderAxisVertical(
		axis,
		padding,
		padding,
		context_height(ctx) - padding,
		context_frame(ctx));
		frame->height - padding,
		frame);
		break;
		case AxisPosition::RIGHT:
		rc = plot_render_axis_vertical(
		*axis,
		context_width(ctx) - padding,
		rc = renderAxisVertical(
		axis,
		frame->width - padding,
		padding,
		context_height(ctx) - padding,
		context_frame(ctx));
		frame->height - padding,
		frame);
		break;
		case AxisPosition::TOP:
		rc = plot_render_axis_horizontal(
		*axis,
		rc = renderAxisHorizontal(
		axis,
		padding,
		padding,
		context_width(ctx) - padding,
		context_frame(ctx));
		frame->width - padding,
		frame);
		break;
		case AxisPosition::BOTTOM:
		rc = plot_render_axis_horizontal(
		*axis,
		context_height(ctx) - padding,
		rc = renderAxisHorizontal(
		axis,
		frame->height - padding,
		padding,
		context_width(ctx) - padding,
		context_frame(ctx));
		frame->width - padding,
		frame);
		break;
		}

elements/plot/axes.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,8 @@ Status plot_axis_addlabel(context* ctx, float offset, const char* label);
		Status plot_axis_setauto(context* ctx);
		Status plot_axis_setmanual(context* ctx);

		Status plot_render_axis(context* ctx, int idx);
		Status renderAxis(const AxisDefinition& axis, Layer* frame);


		} // namespace signaltk

elements/plot/plot_element.cc

+11 −13

Original line number	Diff line number	Diff line
		@@ -14,25 +14,23 @@ namespace signaltk {

		static constexpr const char* ID = "plot";

		Status plot_add(context* ctx) {
		element_add<PlotConfig>(ctx);
		return OK;
		}
		ReturnCode PlotElement::configure(
		const PropertyList& plist,
		std::unique_ptr<Element>* elem) {
		elem->reset(new PlotElement());

		Status plot_render(context* ctx) {
		PlotConfig* elem;
		if (auto rc = element_config_as(ctx, &elem); rc) {
		return rc;
		return ReturnCode::success();
		}

		// draw axes
		for (size_t i = 0; i < elem->axes.size(); ++i) {
		if (auto rc = plot_render_axis(ctx, i); rc) {
		ReturnCode PlotElement::renderTo(Layer* frame) const {
		// render axes
		for (const auto& axis : config.axes) {
		if (auto rc = renderAxis(axis, frame); rc) {
		return rc;
		}
		}

		return OK;
		return ReturnCode::success();
		}

		} // namespace signaltk

elements/plot/plot_element.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ struct PlotConfig {
		PlotDomain y_domain;
		double y_min;
		double y_max;
		std::vector<std::unique_ptr<AxisDefinition>> axes;
		std::vector<AxisDefinition> axes;
		};

		class PlotElement : public Element {
		@@ -35,6 +35,10 @@ public:
		const PropertyList& plist,
		std::unique_ptr<Element>* elem);

		ReturnCode renderTo(Layer* frame) const override;

		protected:
		PlotConfig config;
		};

		} // namespace signaltk

Admin message