Commit 4f226cda authored by Paul Asmuth's avatar Paul Asmuth
Browse files

rename range-{x,y} -> limit-{x,y}

parent 5dc738f9

elements/chart/areas.cc

+6 −6
Original line number Diff line number Diff line
@@ -224,12 +224,12 @@ ReturnCode build( 
    {"data-y", bind(&data_load, _1, &c->y)},

    {"data-x-offset", bind(&data_load, _1, &c->xoffset)},

    {"data-y-offset", bind(&data_load, _1, &c->yoffset)},

    {"range-x", bind(&expr_to_float64_opt_pair, _1, &c->scale_x.min, &c->scale_x.max)},

    {"range-x-min", bind(&expr_to_float64_opt, _1, &c->scale_x.min)},

    {"range-x-max", bind(&expr_to_float64_opt, _1, &c->scale_x.max)},

    {"range-y", bind(&expr_to_float64_opt_pair, _1, &c->scale_y.min, &c->scale_y.max)},

    {"range-y-min", bind(&expr_to_float64_opt, _1, &c->scale_y.min)},

    {"range-y-max", bind(&expr_to_float64_opt, _1, &c->scale_y.max)},

    {"limit-x", bind(&expr_to_float64_opt_pair, _1, &c->scale_x.min, &c->scale_x.max)},

    {"limit-x-min", bind(&expr_to_float64_opt, _1, &c->scale_x.min)},

    {"limit-x-max", bind(&expr_to_float64_opt, _1, &c->scale_x.max)},

    {"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)},

    {"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)},

elements/chart/axis.cc

+3 −3
Original line number Diff line number Diff line
@@ -524,9 +524,9 @@ 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)},

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

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

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

      {"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)},

      {"scale", bind(&scale_configure_kind, _1, &config->scale)},

      {"scale-padding", bind(&expr_to_float64, _1, &config->scale.padding)},

      {"labels", bind(&data_load_strings, _1, &config->label_override)},

elements/chart/bars.cc

+6 −6
Original line number Diff line number Diff line
@@ -326,12 +326,12 @@ ReturnCode build( 
    {"data-y", bind(&data_load, _1, &c->y)},

    {"data-x-offset", bind(&data_load, _1, &c->xoffset)},

    {"data-y-offset", bind(&data_load, _1, &c->yoffset)},

    {"range-x", bind(&expr_to_float64_opt_pair, _1, &c->scale_x.min, &c->scale_x.max)},

    {"range-x-min", bind(&expr_to_float64_opt, _1, &c->scale_x.min)},

    {"range-x-max", bind(&expr_to_float64_opt, _1, &c->scale_x.max)},

    {"range-y", bind(&expr_to_float64_opt_pair, _1, &c->scale_y.min, &c->scale_y.max)},

    {"range-y-min", bind(&expr_to_float64_opt, _1, &c->scale_y.min)},

    {"range-y-max", bind(&expr_to_float64_opt, _1, &c->scale_y.max)},

    {"limit-x", bind(&expr_to_float64_opt_pair, _1, &c->scale_x.min, &c->scale_x.max)},

    {"limit-x-min", bind(&expr_to_float64_opt, _1, &c->scale_x.min)},

    {"limit-x-max", bind(&expr_to_float64_opt, _1, &c->scale_x.max)},

    {"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)},

    {"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)},

elements/chart/gridlines.cc

+6 −6
Original line number Diff line number Diff line
@@ -90,12 +90,12 @@ ReturnCode build(const Environment& env, const Expr* expr, ElementRef* elem) { 


  /* parse properties */

  auto config_rc = expr_walk_map(expr_next(expr), {

    {"range-x", bind(&expr_to_float64_opt_pair, _1, &c->scale_x.min, &c->scale_x.max)},

    {"range-x-min", bind(&expr_to_float64_opt, _1, &c->scale_x.min)},

    {"range-x-max", bind(&expr_to_float64_opt, _1, &c->scale_x.max)},

    {"range-y", bind(&expr_to_float64_opt_pair, _1, &c->scale_y.min, &c->scale_y.max)},

    {"range-y-min", bind(&expr_to_float64_opt, _1, &c->scale_y.min)},

    {"range-y-max", bind(&expr_to_float64_opt, _1, &c->scale_y.max)},

    {"limit-x", bind(&expr_to_float64_opt_pair, _1, &c->scale_x.min, &c->scale_x.max)},

    {"limit-x-min", bind(&expr_to_float64_opt, _1, &c->scale_x.min)},

    {"limit-x-max", bind(&expr_to_float64_opt, _1, &c->scale_x.max)},

    {"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)},

    {"scale-x", bind(&scale_configure_kind, _1, &c->scale_x)},

elements/chart/labels.cc

+6 −6
Original line number Diff line number Diff line
@@ -106,12 +106,12 @@ ReturnCode build( 
  auto config_rc = expr_walk_map(expr_next(expr), {

    {"data-x", bind(&data_load, _1, &c->x)},

    {"data-y", bind(&data_load, _1, &c->y)},

    {"range-x", bind(&expr_to_float64_opt_pair, _1, &c->scale_x.min, &c->scale_x.max)},

    {"range-x-min", bind(&expr_to_float64_opt, _1, &c->scale_x.min)},

    {"range-x-max", bind(&expr_to_float64_opt, _1, &c->scale_x.max)},

    {"range-y", bind(&expr_to_float64_opt_pair, _1, &c->scale_y.min, &c->scale_y.max)},

    {"range-y-min", bind(&expr_to_float64_opt, _1, &c->scale_y.min)},

    {"range-y-max", bind(&expr_to_float64_opt, _1, &c->scale_y.max)},

    {"limit-x", bind(&expr_to_float64_opt_pair, _1, &c->scale_x.min, &c->scale_x.max)},

    {"limit-x-min", bind(&expr_to_float64_opt, _1, &c->scale_x.min)},

    {"limit-x-max", bind(&expr_to_float64_opt, _1, &c->scale_x.max)},

    {"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)},

    {"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)},

CRA Git | Maintained and supported by SUSTech CRA and CCSE