make axis padding configurable (20e30f50) · Commits · github_fork / Clip

elements/plot/plot_axis.cc

+7 −6

Original line number	Diff line number	Diff line
		@@ -19,9 +19,10 @@ namespace signaltk {
		AxisDefinition::AxisDefinition() :
		mode(AxisMode::OFF),
		label_placement(AxisLabelPlacement::OFF),
		label_padding_horiz_rem(kDefaultLabelPaddingHorizREM),
		label_padding_vert_rem(kDefaultLabelPaddingVertREM),
		tick_length_rem(kDefaultTickLengthREM) {}
		padding_rem(4.0f),
		label_padding_rem(1.0f),
		label_font_size_rem(1.0f),
		tick_length_rem(0.4f) {}

		ReturnCode parseAxisMode(
		const std::string& str,
		@@ -73,7 +74,7 @@ static Status renderAxisVertical(
		}

		/* draw labels */
		auto label_padding = from_rem(*target, axis_config.label_padding_horiz_rem);
		auto label_padding = from_rem(*target, axis_config.label_padding_rem);
		for (const auto& label : axis_config.labels) {
		auto [ tick, label_text ] = label;
		auto sy = y0 + (y1 - y0) * tick;
		@@ -128,7 +129,7 @@ static Status renderAxisHorizontal(
		}

		/* draw labels */
		auto label_padding = from_rem(*target, axis_config.label_padding_vert_rem);
		auto label_padding = from_rem(*target, axis_config.label_padding_rem);
		for (const auto& label : axis_config.labels) {
		auto [ tick, label_text ] = label;
		auto sx = x0 + (x1 - x0) * tick;
		@@ -156,7 +157,7 @@ Status renderAxis(
		break;
		};

		int padding = 80;
		auto padding = from_rem(*frame, axis.padding_rem);

		Status rc;
		switch (axis_position) {

+3 −6

Original line number	Diff line number	Diff line
		@@ -17,10 +17,6 @@

		namespace signaltk {

		static const double kDefaultLabelPaddingVertREM = 0.8f;
		static const double kDefaultLabelPaddingHorizREM = 1.0f;
		static const double kDefaultTickLengthREM = 0.4f;

		enum class AxisPosition {
		TOP,
		RIGHT,
		@@ -51,8 +47,9 @@ struct AxisDefinition {
		std::vector<double> ticks;
		std::vector<std::pair<double, std::string>> labels;
		AxisLabelPlacement label_placement;
		double label_padding_horiz_rem;
		double label_padding_vert_rem;
		double padding_rem;
		double label_padding_rem;
		double label_font_size_rem;
		double tick_length_rem;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ double from_rem(const Layer& l, double v) {
		}

		double from_px(const Layer& l, double v) {
		return 1.0; // FIXME: dpi scaling
		return v;
		}

		double from_pt(const Layer& l, double v) {

+1 B (5.6 KiB)

Loading image diff...