Commit 31166e4c authored by Paul Asmuth's avatar Paul Asmuth
Browse files

rename axis-{x,y}-format -> axis-{x,y}-labels

parent 1c5439cf

elements/chart/axis.cc

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ ReturnCode build(const Environment& env, const Expr* expr, ElementRef* elem) { 
  {

    auto rc = expr_walk_map(expr_next(expr), {

      {"ticks", bind(&scale_configure_layout, _1, &config->scale_layout)},

      {"format", bind(&format_configure, _1, &config->label_formatter)},

      {"labels", bind(&format_configure, _1, &config->label_formatter)},

      {"limit", bind(&expr_to_float64_opt_pair, _1, &config->scale.min, &config->scale.max)},

      {"limit-min", bind(&expr_to_float64_opt, _1, &config->scale.min)},

      {"limit-max", bind(&expr_to_float64_opt, _1, &config->scale.max)},

elements/chart/layout.cc

+2 −2
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ ReturnCode build( 
        bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts),

      })

    },

    {"axis-x-format", bind(&expr_rewritev, _1, "format", &axis_x_opts)},

    {"axis-y-format", bind(&expr_rewritev, _1, "format", &axis_y_opts)},

    {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)},

    {"axis-y-labels", bind(&expr_rewritev, _1, "labels", &axis_y_opts)},

    {"axes", bind(&expr_to_stringset, _1, &axes)},

    {"areas", bind(&build_geom, "chart/areas", _1, &geoms, &x, &y)},

    {"bars", bind(&build_geom, "chart/bars", _1, &geoms, &x, &y)},

elements/chart/linechart.cc

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ ReturnCode build( 
        bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts),

      })

    },

    {"axis-x-format", bind(&expr_rewritev, _1, "format", &axis_x_opts)},

    {"axis-y-format", bind(&expr_rewritev, _1, "format", &axis_y_opts)},

    {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)},

    {"axis-y-labels", bind(&expr_rewritev, _1, "labels", &axis_y_opts)},

    {"color", bind(&expr_rewritev, _1, "color", &line_opts)},

    {"colors", bind(&expr_rewritev, _1, "colors", &line_opts)},

    {"stroke", bind(&expr_rewritev, _1, "stroke", &line_opts)},

elements/chart/scatterplot.cc

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ ReturnCode build( 
        bind(&expr_rewritev, _1, "ticks-y", &grid_extra_opts),

      })

    },

    {"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)},

    {"axis-y-labels", bind(&expr_rewritev, _1, "labels", &axis_y_opts)},

    {"size", bind(&expr_rewritev, _1, "size", &point_opts)},

    {"sizes", bind(&expr_rewritev, _1, "sizes", &point_opts)},

    {"color", bind(&expr_rewritev, _1, "color", &point_opts)},

examples/charts-basic/areachart.fvz

+2 −2
Original line number Diff line number Diff line 
(chart/layout

    axes (bottom left)

    axis-y-format (scientific)

    axis-x-format (datetime "%H:%M:%S")

    axis-y-labels (scientific)

    axis-x-labels (datetime "%H:%M:%S")

    areas (

      data-x (csv "tests/testdata/measurement.csv" time)

      data-y (csv "tests/testdata/measurement.csv" value1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE