Loading elements/chart/gridlines.cc +2 −2 Original line number Diff line number Diff line Loading @@ -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)}, {"ticks-x", bind(&scale_configure_layout, _1, &c->layout_x)}, {"ticks-y", bind(&scale_configure_layout, _1, &c->layout_y)}, {"axis-x-ticks", bind(&scale_configure_layout, _1, &c->layout_x)}, {"axis-y-ticks", 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)}, Loading elements/chart/layout.cc +4 −4 Original line number Diff line number Diff line Loading @@ -292,17 +292,17 @@ ReturnCode build( {"scale-x-padding", bind(&expr_to_float64, _1, &scale_x.padding)}, {"scale-y-padding", bind(&expr_to_float64, _1, &scale_y.padding)}, { "ticks-x", "axis-x-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_x_opts), bind(&expr_rewritev, _1, "ticks-x", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-x-ticks", &grid_extra_opts), }) }, { "ticks-y", "axis-y-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_y_opts), bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-y-ticks", &grid_extra_opts), }) }, {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)}, Loading elements/chart/linechart.cc +4 −4 Original line number Diff line number Diff line Loading @@ -88,17 +88,17 @@ ReturnCode build( {"scale-x-padding", bind(&expr_to_float64, _1, &scale_x.padding)}, {"scale-y-padding", bind(&expr_to_float64, _1, &scale_y.padding)}, { "ticks-x", "axis-x-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_x_opts), bind(&expr_rewritev, _1, "ticks-x", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-x-ticks", &grid_extra_opts), }) }, { "ticks-y", "axis-y-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_y_opts), bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-y-ticks", &grid_extra_opts), }) }, {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)}, Loading elements/chart/scatterplot.cc +4 −4 Original line number Diff line number Diff line Loading @@ -88,17 +88,17 @@ ReturnCode build( {"scale-x-padding", bind(&expr_to_float64, _1, &scale_x.padding)}, {"scale-y-padding", bind(&expr_to_float64, _1, &scale_y.padding)}, { "ticks-x", "axis-x-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_x_opts), bind(&expr_rewritev, _1, "ticks-x", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-x-ticks", &grid_extra_opts), }) }, { "ticks-y", "axis-y-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_y_opts), bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-y-ticks", &grid_extra_opts), }) }, {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)}, Loading examples/charts-basic/barchart_horizontal.fvz +1 −1 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ axes (left) limit-x (0 24) limit-y (0 10) ticks-y (discrete) axis-y-ticks (discrete) axis-y-labels (custom (csv "tests/testdata/gdp_per_capita_2010.csv" country)) bars ( data-x (csv "tests/testdata/gdp_per_capita_2010.csv" gdp) Loading Loading
elements/chart/gridlines.cc +2 −2 Original line number Diff line number Diff line Loading @@ -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)}, {"ticks-x", bind(&scale_configure_layout, _1, &c->layout_x)}, {"ticks-y", bind(&scale_configure_layout, _1, &c->layout_y)}, {"axis-x-ticks", bind(&scale_configure_layout, _1, &c->layout_x)}, {"axis-y-ticks", 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)}, Loading
elements/chart/layout.cc +4 −4 Original line number Diff line number Diff line Loading @@ -292,17 +292,17 @@ ReturnCode build( {"scale-x-padding", bind(&expr_to_float64, _1, &scale_x.padding)}, {"scale-y-padding", bind(&expr_to_float64, _1, &scale_y.padding)}, { "ticks-x", "axis-x-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_x_opts), bind(&expr_rewritev, _1, "ticks-x", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-x-ticks", &grid_extra_opts), }) }, { "ticks-y", "axis-y-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_y_opts), bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-y-ticks", &grid_extra_opts), }) }, {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)}, Loading
elements/chart/linechart.cc +4 −4 Original line number Diff line number Diff line Loading @@ -88,17 +88,17 @@ ReturnCode build( {"scale-x-padding", bind(&expr_to_float64, _1, &scale_x.padding)}, {"scale-y-padding", bind(&expr_to_float64, _1, &scale_y.padding)}, { "ticks-x", "axis-x-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_x_opts), bind(&expr_rewritev, _1, "ticks-x", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-x-ticks", &grid_extra_opts), }) }, { "ticks-y", "axis-y-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_y_opts), bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-y-ticks", &grid_extra_opts), }) }, {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)}, Loading
elements/chart/scatterplot.cc +4 −4 Original line number Diff line number Diff line Loading @@ -88,17 +88,17 @@ ReturnCode build( {"scale-x-padding", bind(&expr_to_float64, _1, &scale_x.padding)}, {"scale-y-padding", bind(&expr_to_float64, _1, &scale_y.padding)}, { "ticks-x", "axis-x-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_x_opts), bind(&expr_rewritev, _1, "ticks-x", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-x-ticks", &grid_extra_opts), }) }, { "ticks-y", "axis-y-ticks", expr_calln_fn({ bind(&expr_rewritev, _1, "ticks", &axis_y_opts), bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts), bind(&expr_rewritev, _1, "axis-y-ticks", &grid_extra_opts), }) }, {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)}, Loading
examples/charts-basic/barchart_horizontal.fvz +1 −1 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ axes (left) limit-x (0 24) limit-y (0 10) ticks-y (discrete) axis-y-ticks (discrete) axis-y-labels (custom (csv "tests/testdata/gdp_per_capita_2010.csv" country)) bars ( data-x (csv "tests/testdata/gdp_per_capita_2010.csv" gdp) Loading
