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

import std::placeholders namespace

parent 9d6f565f

common/config_helpers.cc

+5 −3
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include "utils/csv.h"

#include <iostream>



using namespace std::placeholders;



namespace plotfx {



ReturnCode configure_measure_rel(
@@ -81,11 +83,11 @@ ReturnCode configure_color( 
}



ParserAtFn<Color> configure_color_fn() {

  return std::bind(&configure_color, std::placeholders::_1, std::placeholders::_2);

  return bind(&configure_color, _1, _2);

}



ParserFn configure_color_fn(Color* var) {

  return std::bind(&configure_color, std::placeholders::_1, var);

  return bind(&configure_color, _1, var);

}



ReturnCode configure_float(
@@ -291,7 +293,7 @@ ReturnCode configure_series( 
}



ParserFn configure_series_fn(SeriesRef* series) {

  return std::bind(&configure_series, std::placeholders::_1, series);

  return bind(&configure_series, _1, series);

}



} // namespace plotfx

common/document.cc

+10 −8
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
#include "common/config_helpers.h"

#include "utils/fileutil.h"



using namespace std::placeholders;



namespace plotfx {



Document::Document() :
@@ -69,19 +71,19 @@ ReturnCode document_load( 
  // IMPORTANT: parse dpi + font size first



  static const ParserDefinitions pdefs = {

    {"font-size", std::bind(&configure_measure_rel, std::placeholders::_1, doc->dpi, doc->font_size, &doc->font_size)},

    {"width", std::bind(&configure_measure_rel, std::placeholders::_1, doc->dpi, doc->font_size, &doc->width)},

    {"height", std::bind(&configure_measure_rel, std::placeholders::_1, doc->dpi, doc->font_size, &doc->height)},

    {"background-color", std::bind(&configure_color, std::placeholders::_1, &doc->background_color)},

    {"font-size", bind(&configure_measure_rel, _1, doc->dpi, doc->font_size, &doc->font_size)},

    {"width", bind(&configure_measure_rel, _1, doc->dpi, doc->font_size, &doc->width)},

    {"height", bind(&configure_measure_rel, _1, doc->dpi, doc->font_size, &doc->height)},

    {"background-color", bind(&configure_color, _1, &doc->background_color)},

    {

      "foreground-color",

      configure_multiprop({

          std::bind(&configure_color, std::placeholders::_1, &doc->text_color),

          std::bind(&configure_color, std::placeholders::_1, &doc->border_color),

          bind(&configure_color, _1, &doc->text_color),

          bind(&configure_color, _1, &doc->border_color),

      })

    },

    {"text-color", std::bind(&configure_color, std::placeholders::_1, &doc->text_color)},

    {"border-color", std::bind(&configure_color, std::placeholders::_1, &doc->border_color)},

    {"text-color", bind(&configure_color, _1, &doc->text_color)},

    {"border-color", bind(&configure_color, _1, &doc->border_color)},

  };



  if (auto rc = parseAll(plist, pdefs); !rc.isSuccess()) {

elements/legend.cc

+28 −26
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include "common/config_helpers.h"

#include "legend.h"



using namespace std::placeholders;



namespace plotfx {



static const double kDefaultLabelFontSizeEM = 1;
@@ -366,58 +368,58 @@ ReturnCode legend_configure( 
  static const ParserDefinitions pdefs = {

    {

      "position",

      std::bind(

      bind(

          &legend_configure_position,

          std::placeholders::_1,

          _1,

          &config.placement,

          &config.position_horiz,

          &config.position_vert)

    },

    {

      "title",

      std::bind(

      bind(

          &configure_string,

          std::placeholders::_1,

          _1,

          &config.title)

      },

    {

      "text-color",

      std::bind(

      bind(

          &configure_color,

          std::placeholders::_1,

          _1,

          &config.text_color)

    },

    {

      "border-color",

      std::bind(

      bind(

          &configure_color,

          std::placeholders::_1,

          _1,

          &config.border_color)

    },

    {

      "item-margin",

      configure_multiprop({

          std::bind(

          bind(

              &configure_measure_rel,

              std::placeholders::_1,

              _1,

              doc.dpi,

              doc.font_size,

              &config.item_margins[0]),

          std::bind(

          bind(

              &configure_measure_rel,

              std::placeholders::_1,

              _1,

              doc.dpi,

              doc.font_size,

              &config.item_margins[1]),

          std::bind(

          bind(

              &configure_measure_rel,

              std::placeholders::_1,

              _1,

              doc.dpi,

              doc.font_size,

              &config.item_margins[2]),

          std::bind(

          bind(

              &configure_measure_rel,

              std::placeholders::_1,

              _1,

              doc.dpi,

              doc.font_size,

              &config.item_margins[3])
@@ -425,36 +427,36 @@ ReturnCode legend_configure( 
    },

    {

      "item-margin-top",

      std::bind(

      bind(

          &configure_measure_rel,

          std::placeholders::_1,

          _1,

          doc.dpi,

          doc.font_size,

          &config.item_margins[0])

    },

    {

      "item-margin-right",

      std::bind(

      bind(

          &configure_measure_rel,

          std::placeholders::_1,

          _1,

          doc.dpi,

          doc.font_size,

          &config.item_margins[1])

    },

    {

      "item-margin-bottom",

      std::bind(

      bind(

          &configure_measure_rel,

          std::placeholders::_1,

          _1,

          doc.dpi,

          doc.font_size,

          &config.item_margins[2])

    },

    {

      "item-margin-left",

      std::bind(

      bind(

          &configure_measure_rel,

          std::placeholders::_1,

          _1,

          doc.dpi,

          doc.font_size,

          &config.item_margins[3])
@@ -476,10 +478,10 @@ ReturnCode legend_configure_all( 
  static const ParserDefinitions pdefs = {

    {

      "legend",

      std::bind(

      bind(

          &legend_configure,

          doc,

          std::placeholders::_1,

          _1,

          config),

    },

  };

elements/plot_axis.cc

+8 −6
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include <graphics/layout.h>

#include <graphics/brush.h>



using namespace std::placeholders;



namespace plotfx {



static const double kDefaultLabelPaddingEM = 0.8;
@@ -531,20 +533,20 @@ ReturnCode axis_configure_label_placement( 


  if (plist::is_value(prop, "geometric") ||

      plist::is_enum(prop, "geometric")) {

    *label_placement = std::bind(

    *label_placement = bind(

        &axis_place_labels_geom,

        std::placeholders::_1,

        std::placeholders::_2);

        _1,

        _2);



    return OK;

  }



  if (plist::is_value(prop, "categorical") ||

      plist::is_enum(prop, "categorical")) {

    *label_placement = std::bind(

    *label_placement = bind(

        &axis_place_labels_geom,

        std::placeholders::_1,

        std::placeholders::_2);

        _1,

        _2);



    return OK;

  }

elements/plot_labels.cc

+7 −5
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include <graphics/layout.h>

#include "common/config_helpers.h"



using namespace std::placeholders;



namespace plotfx {

namespace plot {

namespace labels {
@@ -75,11 +77,11 @@ ReturnCode bind( 
    const PlotLabelsConfig& config,

    ElementRef* elem) {

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

  e->draw = std::bind(

  e->draw = bind(

      &draw,

      config,

      std::placeholders::_1,

      std::placeholders::_2);

      _1,

      _2);



  *elem = std::move(e);

  return OK;
@@ -102,9 +104,9 @@ ReturnCode configure( 


  static const ParserDefinitions pdefs = {

    {"x", configure_series_fn(&data_x)},

    {"x-scale", std::bind(&configure_string, std::placeholders::_1, &scale_x)},

    {"x-scale", bind(&configure_string, _1, &scale_x)},

    {"y", configure_series_fn(&data_y)},

    {"y-scale", std::bind(&configure_string, std::placeholders::_1, &scale_y)},

    {"y-scale", bind(&configure_string, _1, &scale_y)},

    {"label", configure_series_fn(&data_labels)},

  };

CRA Git | Maintained and supported by SUSTech CRA and CCSE