Commit cd240eb2 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

improved element organization

parent e05f4ef4

README.md

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ to the documentation. 
        data-y (csv tests/testdata/gauss2d.csv y)

        limit-x (0 400)

        limit-y (0 200)

        ticks-y (subdivide 5)

        axes (bottom left)

        grid (color #fff)

        background #eee

core/fviz.cc

+19 −19
Original line number Diff line number Diff line
@@ -21,16 +21,16 @@ 
#include "utils/fileutil.h"

#include "core/environment.h"

#include "elements/text.h"

#include "elements/chart/layout.h"

#include "elements/chart/areas.h"

#include "elements/chart/axis.h"

#include "elements/chart/bars.h"

#include "elements/chart/grid.h"

#include "elements/chart/labels.h"

#include "elements/plot.h"

#include "elements/plot/areas.h"

#include "elements/plot/axis.h"

#include "elements/plot/bars.h"

#include "elements/plot/grid.h"

#include "elements/plot/labels.h"

#include "elements/chart/legend.h"

#include "elements/chart/lines.h"

#include "elements/plot/lines.h"

#include "elements/chart/linechart.h"

#include "elements/chart/points.h"

#include "elements/plot/points.h"

#include "elements/chart/scatterplot.h"

#include "elements/layout/box.h"
@@ -51,19 +51,19 @@ fviz_t* fviz_init() { 
  auto ctx = std::make_unique<fviz_t>();

  auto elems = &ctx->env.element_map;

  element_bind(elems, "text", bind(elements::text::build, _1, _2, _3));

  element_bind(elems, "chart/axis-top", bind(elements::chart::axis::build, _1, _2, _3));

  element_bind(elems, "chart/axis-right", bind(elements::chart::axis::build, _1, _2, _3));

  element_bind(elems, "chart/axis-bottom", bind(elements::chart::axis::build, _1, _2, _3));

  element_bind(elems, "chart/axis-left", bind(elements::chart::axis::build, _1, _2, _3));

  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/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, "plot/axis-top", bind(elements::plot::axis::build, _1, _2, _3));

  element_bind(elems, "plot/axis-right", bind(elements::plot::axis::build, _1, _2, _3));

  element_bind(elems, "plot/axis-bottom", bind(elements::plot::axis::build, _1, _2, _3));

  element_bind(elems, "plot/axis-left", bind(elements::plot::axis::build, _1, _2, _3));

  element_bind(elems, "plot", bind(elements::plot::build, _1, _2, _3));

  element_bind(elems, "plot/areas", bind(elements::plot::areas::build, _1, _2, _3));

  element_bind(elems, "plot/bars", bind(elements::plot::bars::build, _1, _2, _3));

  element_bind(elems, "plot/grid", bind(elements::plot::grid::build, _1, _2, _3));

  element_bind(elems, "plot/labels", bind(elements::plot::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));

  element_bind(elems, "plot/lines", bind(elements::plot::lines::build, _1, _2, _3));

  element_bind(elems, "chart/linechart", bind(elements::chart::linechart::build, _1, _2, _3));

  element_bind(elems, "chart/points", bind(elements::chart::points::build, _1, _2, _3));

  element_bind(elems, "plot/points", bind(elements::plot::points::build, _1, _2, _3));

  element_bind(elems, "chart/scatterplot", bind(elements::chart::scatterplot::build, _1, _2, _3));

  element_bind(elems, "layout/box", bind(elements::layout::box::build, _1, _2, _3));

  return ctx.release();

elements/chart/legend.cc

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "legend.h"



#include "data.h"

#include "environment.h"

#include "layout.h"

#include "scale.h"

#include "sexpr.h"

elements/chart/linechart.cc

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ ReturnCode build( 
  }



  auto chart = expr_build(

      "chart/layout",

      "plot",

      std::move(layout_opts),

      "lines",

      expr_build(std::move(geom_opts)));

elements/chart/linechart_ref.yaml

+4 −4
Original line number Diff line number Diff line
@@ -12,19 +12,19 @@ properties: 


  - title: "Line Options"

    anchor: line-options

    inherit: ["elements/chart/lines", "line-options"]

    inherit: ["elements/plot/lines", "line-options"]



  - title: "Label Options"

    anchor: label-options

    inherit: ["elements/chart/lines", "label-options"]

    inherit: ["elements/plot/lines", "label-options"]



  - title: "Scale Options"

    anchor: scale-options

    inherit: ["elements/chart/layout", "scale-options"]

    inherit: ["elements/plot", "scale-options"]



  - title: "Axis Options"

    anchor: axis-options

    inherit: ["elements/chart/layout", "axis-options"]

    inherit: ["elements/plot", "axis-options"]



  - title: "Layout Options"

    anchor: layout-options

CRA Git | Maintained and supported by SUSTech CRA and CCSE