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

clean up

parent 27e1006b

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ include_directories(${CAIRO_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${HARFBUZZ_IN 


# Build: fviz Library

# -----------------------------------------------------------------------------

file(GLOB source_files "core/graphics/*.cc" "core/utils/**.cc" "core/sexpr*.cc" "core/fviz.cc" "core/scale.cc" "core/environment.cc" "elements/text.cc" "core/element_factory.cc" "core/config_helpers.cc" "elements/chart/axis.cc" "core/format.cc" "core/layout.cc" "core/data_model.cc" "elements/chart/layout.cc" "elements/fill.cc" "elements/chart/points.cc" "elements/layout/padding.cc")

file(GLOB source_files "core/**/*.cc" "core/*.cc" "elements/*.cc"  "elements/layout/*.cc" "elements/chart/axis.cc" "elements/chart/layout.cc" "elements/chart/points.cc")

list(REMOVE_ITEM source_files "core/cli.cc")

add_library(fviz STATIC ${source_files})

set_target_properties(fviz PROPERTIES PUBLIC_HEADER "source/fviz.h;source/fviz_sdl.h")

core/dimension.cc

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ namespace fviz { 


std::vector<Color> series_to_colors(

    SeriesRef series,

    const DomainConfig& domain_config,

    const ScaleConfig& domain_config,

    const ColorScheme& palette) {

  if (!series) {

    return {};
@@ -55,7 +55,7 @@ std::vector<Color> groups_to_colors( 
/*

std::vector<Measure> series_to_sizes(

    SeriesRef series,

    const DomainConfig& domain_config,

    const ScaleConfig& domain_config,

    const Measure& low,

    const Measure& high) {

  if (!series) {

core/dimension.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ namespace fviz { 


std::vector<Color> series_to_colors(

    SeriesRef series,

    const DomainConfig& domain_config,

    const ScaleConfig& domain_config,

    const ColorScheme& palette);



std::vector<Color> groups_to_colors(
@@ -32,7 +32,7 @@ std::vector<Color> groups_to_colors( 


std::vector<Measure> series_to_sizes(

    SeriesRef series,

    const DomainConfig& domain_config,

    const ScaleConfig& domain_config,

    const Measure& low,

    const Measure& high);

core/element.cc

+0 −13
Original line number Diff line number Diff line
@@ -16,18 +16,5 @@ 


namespace fviz {



int32_t Element::z_index() const {

  auto layout = layout_settings();



  switch (layout.position) {

    case Position::RELATIVE:

      return 1;

    case Position::TOP:

      return 0;

  }



  return -1;

}



} // namespace fviz

core/plotfx_sdl.h→core/fviz_sdl.h

+0 −0

File moved.

View file

CRA Git | Maintained and supported by SUSTech CRA and CCSE