rename the 'chart/gridlines' element to 'chart/grid' (bb01a685) · Commits · github_fork / Clip

core/fviz.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		#include "elements/chart/areas.h"
		#include "elements/chart/axis.h"
		#include "elements/chart/bars.h"
		#include "elements/chart/gridlines.h"
		#include "elements/chart/grid.h"
		#include "elements/chart/labels.h"
		#include "elements/chart/legend.h"
		#include "elements/chart/lines.h"
		@@ -58,7 +58,7 @@ fviz_t* fviz_init() {
		element_bind(elems, "chart/layout", bind(elements::chart::layout::build, _1, _2, _3));
		element_bind(elems, "chart/areas", bind(elements::chart::areas::build, _1, _2, _3));
		element_bind(elems, "chart/bars", bind(elements::chart::bars::build, _1, _2, _3));
		element_bind(elems, "chart/gridlines", bind(elements::chart::gridlines::build, _1, _2, _3));
		element_bind(elems, "chart/grid", bind(elements::chart::grid::build, _1, _2, _3));
		element_bind(elems, "chart/labels", bind(elements::chart::labels::build, _1, _2, _3));
		element_bind(elems, "chart/legend", bind(elements::chart::legend::build, _1, _2, _3));
		element_bind(elems, "chart/lines", bind(elements::chart::lines::build, _1, _2, _3));

+5 −5

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#include "gridlines.h"
		#include "grid.h"
		#include "environment.h"
		#include "format.h"
		#include "layout.h"
		@@ -24,7 +24,7 @@

		using namespace std::placeholders;

		namespace fviz::elements::chart::gridlines {
		namespace fviz::elements::chart::grid {

		static const double kDefaultLineWidthPT = 1;

		@@ -96,8 +96,8 @@ ReturnCode build(const Environment& env, const Expr* expr, ElementRef* elem) {
		{"limit-y", bind(&expr_to_float64_opt_pair, _1, &c->scale_y.min, &c->scale_y.max)},
		{"limit-y-min", bind(&expr_to_float64_opt, _1, &c->scale_y.min)},
		{"limit-y-max", bind(&expr_to_float64_opt, _1, &c->scale_y.max)},
		{"axis-x-ticks", bind(&scale_configure_layout, _1, &c->layout_x)},
		{"axis-y-ticks", bind(&scale_configure_layout, _1, &c->layout_y)},
		{"ticks-x", bind(&scale_configure_layout, _1, &c->layout_x)},
		{"ticks-y", bind(&scale_configure_layout, _1, &c->layout_y)},
		{"scale-x", bind(&scale_configure_kind, _1, &c->scale_x)},
		{"scale-y", bind(&scale_configure_kind, _1, &c->scale_y)},
		{"scale-x-padding", bind(&expr_to_float64, _1, &c->scale_x.padding)},
		@@ -115,5 +115,5 @@ ReturnCode build(const Environment& env, const Expr* expr, ElementRef* elem) {
		return OK;
		}

		} // namespace fviz::elements::chart::gridlines
		} // namespace fviz::elements::chart::grid

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,12 +14,12 @@
		#pragma once
		#include "element.h"

		namespace fviz::elements::chart::gridlines {
		namespace fviz::elements::chart::grid {

		ReturnCode build(
		const Environment& env,
		const Expr* expr,
		ElementRef* elem);

		} // namespace fviz::elements::chart::gridlines
		} // namespace fviz::elements::chart::grid

+0 −0

File moved.

+3 −3

Original line number	Diff line number	Diff line
		@@ -325,14 +325,14 @@ ReturnCode build(
		"axis-x-ticks",
		expr_calln_fn({
		bind(&expr_rewritev, _1, "ticks", &axis_x_opts),
		bind(&expr_rewritev, _1, "axis-x-ticks", &grid_extra_opts),
		bind(&expr_rewritev, _1, "ticks-x", &grid_extra_opts),
		})
		},
		{
		"axis-y-ticks",
		expr_calln_fn({
		bind(&expr_rewritev, _1, "ticks", &axis_y_opts),
		bind(&expr_rewritev, _1, "axis-y-ticks", &grid_extra_opts),
		bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts),
		})
		},
		{"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)},
		@@ -475,7 +475,7 @@ ReturnCode build(
		/* build the grid element */
		if (grid_opts) {
		auto elem_config = expr_build(
		"chart/gridlines",
		"chart/grid",
		"limit-x-min",
		expr_clone(xmin.get()),
		"limit-x-max",