add the 'none' scale layout (eb4b6bd6) · Commits · github_fork / Clip

core/scale.cc

+14 −1

Original line number	Diff line number	Diff line
		@@ -482,6 +482,13 @@ ReturnCode scale_layout_categorical_bounds(
		return OK;
		}

		ReturnCode scale_layout_none(
		const ScaleConfig& domain,
		const Formatter& label_format,
		ScaleLayout* layout) {
		return OK;
		}

		ReturnCode scale_configure_layout_linear_interval(
		const Expr* expr,
		ScaleLayoutFn* layout) {
		@@ -749,6 +756,11 @@ ReturnCode scale_configure_layout(
		return OK;
		}

		if (expr_is_value(expr, "none")) {
		*layout = bind(&scale_layout_none, _1, _2, _3);
		return OK;
		}

		return error(
		ERROR,
		"invalid argument; expected one of: \n"
		@@ -760,7 +772,8 @@ ReturnCode scale_configure_layout(
		" - exponential-steps\n"
		" - subdivide\n"
		" - categorical\n"
		" - categorical-bounds\n");
		" - categorical-bounds\n"
		" - none\n");
		}

		void scale_configure_layout_defaults(

+5 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,11 @@ ReturnCode scale_layout_categorical_bounds(
		const Formatter& label_format,
		ScaleLayout* layout);

		ReturnCode scale_layout_none(
		const ScaleConfig& domain,
		const Formatter& label_format,
		ScaleLayout* layout);

		ReturnCode scale_configure_layout(
		const Expr* expr,
		ScaleLayoutFn* layout);

+2 −2

Original line number	Diff line number	Diff line
		@@ -506,8 +506,8 @@ ReturnCode build(
		expr_clone(ymin.get()),
		"limit-y-max",
		expr_clone(ymax.get()),
		expr_unwrap(std::move(grid_opts)),
		expr_clonev(grid_extra_opts));
		expr_clonev(grid_extra_opts),
		expr_unwrap(std::move(grid_opts)));

		ElementRef elem;
		if (auto rc = element_build_macro(env, elem_config.get(), &elem); !rc) {