Commit 6b0b4e69 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

improved public 'plot' API

parent 62184d4d

common/document.cc

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ ReturnCode document_render_to( 
  Rectangle clip(0, 0, layer->width, layer->height);



  for (const auto& e : tree.roots) {

    if (auto rc = e->draw(tree, clip, layer); !rc.isSuccess()) {

    if (auto rc = e->draw(clip, layer); !rc.isSuccess()) {

      return rc;

    }

  }

common/element.h

+3 −1
Original line number Diff line number Diff line
@@ -42,8 +42,10 @@ struct Document; 


using plist::PropertyList;



using ElementDrawFn = std::function<ReturnCode (const Rectangle&, Layer*)>;



struct Element {

  std::function<ReturnCode (const Document&, const Rectangle&, Layer*)> draw;

  ElementDrawFn draw;

};



using ElementRef = std::shared_ptr<Element>;

common/element_factory.cc

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ namespace plotfx { 
using ElementConfigureFn = std::function<ReturnCode (const Document&, const PropertyList&, ElementRef*)>;



static std::unordered_map<std::string, ElementConfigureFn> elems = {

  {"plot", &plot::configure}

  {"plot", &plot::plot_configure}

};



ReturnCode buildElement(

elements/plot.cc

+48 −42
Original line number Diff line number Diff line
@@ -43,23 +43,8 @@ 
namespace plotfx {

namespace plot {



PlotConfig::PlotConfig() {

  {

    DomainConfig d;

    scales.emplace("x", d);

  }



  {

    DomainConfig d;

    d.padding = 0.1f;

    d.min_auto_snap_zero = true;

    scales.emplace("y", d);

  }

}



ReturnCode draw(

ReturnCode plot_draw(

    const PlotConfig& config,

    const Document& doc,

    const Rectangle& clip,

    Layer* layer) {

  // setup layout
@@ -95,7 +80,7 @@ ReturnCode draw( 


  // render layer

  for (const auto& e : config.layers) {

    if (auto rc = e->draw(doc, bbox, layer); !rc) {

    if (auto rc = e->draw(bbox, layer); !rc) {

      return rc;

    }

  }
@@ -108,7 +93,11 @@ ReturnCode draw( 
  return ReturnCode::success();

}



ReturnCode configure_layer(const plist::Property& prop, const Document& doc, PlotConfig* config) {

ReturnCode configure_layer(

    const plist::Property& prop,

    const Document& doc,

    const DomainMap& scales,

    PlotConfig* config) {

  std::string type = "points";

  static const ParserDefinitions pdefs = {

    {"type", std::bind(&configure_string, std::placeholders::_1, &type)},
@@ -122,9 +111,9 @@ ReturnCode configure_layer(const plist::Property& prop, const Document& doc, Plo 
  auto rc = ReturnCode::errorf("EARG", "invalid layer type: '$0'", type);



  // FIXME proper lookup

  if (type == "labels") rc = labels::configure(doc, *prop.next, config->scales, &layer);

  if (type == "lines") rc = lines::configure(doc, *prop.next, config->scales, &layer);

  if (type == "points") rc = points::configure(doc, *prop.next, config->scales, &layer);

  if (type == "labels") rc = plot_labels_configure(doc, *prop.next, scales, &layer);

  if (type == "lines") rc = plot_lines_configure(doc, *prop.next, scales, &layer);

  if (type == "points") rc = plot_points_configure(doc, *prop.next, scales, &layer);



  if (!rc) {

    return rc;
@@ -179,7 +168,21 @@ ReturnCode configure_scales_auto( 
  return OK;

}



ReturnCode configure(

ReturnCode plot_bind(

    const PlotConfig& config,

    ElementRef* elem) {

  auto e = std::make_unique<Element>();

  e->draw = std::bind(

      &plot_draw,

      config,

      std::placeholders::_1,

      std::placeholders::_2);



  *elem = std::move(e);

  return OK;

}



ReturnCode plot_configure(

    const Document& doc,

    const plist::PropertyList& plist,

    ElementRef* elem) {
@@ -208,14 +211,27 @@ ReturnCode configure( 
  config.margins[2] = from_em(1.0, doc.font_size);

  config.margins[3] = from_em(1.0, doc.font_size);



  auto domain_x = domain_find(&config.scales, "x");

  auto domain_y = domain_find(&config.scales, "y");

  DomainMap scales;



  {

    DomainConfig d;

    scales.emplace("x", d);

  }



  {

    DomainConfig d;

    d.padding = 0.1f;

    d.min_auto_snap_zero = true;

    scales.emplace("y", d);

  }



  auto domain_x = domain_find(&scales, SCALE_DEFAULT_X);

  auto domain_y = domain_find(&scales, SCALE_DEFAULT_Y);



  static const ParserDefinitions pdefs = {

    {"data", std::bind(&configure_data_frame, std::placeholders::_1, &config.data)},

    {"group", configure_key(&config.default_group_key)},

    {"x", configure_key(&config.default_x_key)},

    {"y", configure_key(&config.default_y_key)},

    //{"group", configure_key(&config.default_group_key)},

    //{"x", configure_key(&config.default_x_key)},

    //{"y", configure_key(&config.default_y_key)},

    {"axis-x-type", std::bind(&domain_configure, std::placeholders::_1, domain_x)},

    {"axis-x-min", std::bind(&configure_float_opt, std::placeholders::_1, &domain_x->min)},

    {"axis-x-max", std::bind(&configure_float_opt, std::placeholders::_1, &domain_x->max)},
@@ -311,13 +327,13 @@ ReturnCode configure( 
  }



  /* fit scales */

  if (auto rc = configure_scales_auto(plist, &config.scales); !rc) {

  if (auto rc = configure_scales_auto(plist, &scales); !rc) {

    return rc;

  }



  /* configure layers */

  static const ParserDefinitions pdefs_layer = {

    {"layer", std::bind(&configure_layer, std::placeholders::_1, doc, &config)}

    {"layer", std::bind(&configure_layer, std::placeholders::_1, doc, scales, &config)}

  };



  if (auto rc = parseAll(plist, pdefs_layer); !rc.isSuccess()) {
@@ -326,7 +342,7 @@ ReturnCode configure( 


  /* resolve axes */

  if (auto rc = axis_resolve(

        config.scales,

        scales,

        &config.axis_top,

        &config.axis_right,

        &config.axis_bottom,
@@ -335,17 +351,7 @@ ReturnCode configure( 
    return rc;

  }



  auto e = std::make_unique<Element>();

  e->draw = std::bind(

      &draw,

      config,

      std::placeholders::_1,

      std::placeholders::_2,

      std::placeholders::_3);



  *elem = std::move(e);



  return ReturnCode::success();

  return plot_bind(config, elem);

}



} // namespace plot

elements/plot.h

+5 −34
Original line number Diff line number Diff line
@@ -45,50 +45,21 @@ namespace plotfx { 
namespace plot {

struct PlotConfig;



using PlotLayerDrawFn = std::function<

    ReturnCode (

        const PlotConfig& plot,

        const Document& doc,

        const Rectangle& clip,

        Layer* frame)>;



using PlotLayerFitFn = std::function<ReturnCode (DomainMap*)>;



using PlotDimensionMap = std::unordered_map<std::string, SeriesRef>;



struct PlotDimension {

  SeriesRef data;

  std::string scale;

};



struct PlotLayer {

  PlotLayerDrawFn draw;

  std::vector<PlotDimension> dimensions;

};



struct PlotConfig {

  PlotConfig();

  DataFrame data;

  std::vector<ElementRef> layers;

  DomainMap scales;

  LegendMap legends;

  AxisDefinition axis_top;

  AxisDefinition axis_right;

  AxisDefinition axis_bottom;

  AxisDefinition axis_left;

  Measure margins[4];

  std::string default_x_key;

  std::string default_y_key;

  std::string default_group_key;

  std::vector<ElementRef> layers;

  LegendMap legends;

};



ReturnCode draw(

ReturnCode plot_bind(

    const PlotConfig& config,

    const Document& doc,

    const Rectangle& clip,

    Layer* frame);

    ElementRef* elem);



ReturnCode configure(

ReturnCode plot_configure(

    const Document& doc,

    const plist::PropertyList& plist,

    ElementRef* elem);

CRA Git | Maintained and supported by SUSTech CRA and CCSE