Skip to content

Commit

Permalink
scale_binned (tidyverse#3096)
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasp85 committed Oct 1, 2019
1 parent 0ee259c commit 9a45cc8
Show file tree
Hide file tree
Showing 51 changed files with 2,940 additions and 72 deletions.
4 changes: 4 additions & 0 deletions DESCRIPTION
Expand Up @@ -153,7 +153,9 @@ Collate:
'grob-dotstack.r'
'grob-null.r'
'grouping.r'
'guide-bins.R'
'guide-colorbar.r'
'guide-colorsteps.R'
'guide-legend.r'
'guides-.r'
'guides-axis.r'
Expand Down Expand Up @@ -186,6 +188,7 @@ Collate:
'save.r'
'scale-.r'
'scale-alpha.r'
'scale-binned.R'
'scale-brewer.r'
'scale-colour.r'
'scale-continuous.r'
Expand All @@ -200,6 +203,7 @@ Collate:
'scale-manual.r'
'scale-shape.r'
'scale-size.r'
'scale-steps.R'
'scale-type.R'
'scale-view.r'
'scale-viridis.r'
Expand Down
33 changes: 33 additions & 0 deletions NAMESPACE
Expand Up @@ -68,19 +68,24 @@ S3method(grobWidth,zeroGrob)
S3method(grobX,absoluteGrob)
S3method(grobY,absoluteGrob)
S3method(guide_gengrob,axis)
S3method(guide_gengrob,bins)
S3method(guide_gengrob,colorbar)
S3method(guide_gengrob,guide_none)
S3method(guide_gengrob,legend)
S3method(guide_geom,axis)
S3method(guide_geom,bins)
S3method(guide_geom,colorbar)
S3method(guide_geom,guide_none)
S3method(guide_geom,legend)
S3method(guide_merge,axis)
S3method(guide_merge,bins)
S3method(guide_merge,colorbar)
S3method(guide_merge,guide_none)
S3method(guide_merge,legend)
S3method(guide_train,axis)
S3method(guide_train,bins)
S3method(guide_train,colorbar)
S3method(guide_train,colorsteps)
S3method(guide_train,guide_none)
S3method(guide_train,legend)
S3method(guide_transform,axis)
Expand Down Expand Up @@ -201,6 +206,8 @@ export(PositionJitterdodge)
export(PositionNudge)
export(PositionStack)
export(Scale)
export(ScaleBinned)
export(ScaleBinnedPosition)
export(ScaleContinuous)
export(ScaleContinuousDate)
export(ScaleContinuousDatetime)
Expand Down Expand Up @@ -370,8 +377,11 @@ export(ggproto_parent)
export(ggsave)
export(ggtitle)
export(guide_axis)
export(guide_bins)
export(guide_colorbar)
export(guide_colorsteps)
export(guide_colourbar)
export(guide_coloursteps)
export(guide_gengrob)
export(guide_geom)
export(guide_legend)
Expand Down Expand Up @@ -438,12 +448,14 @@ export(scale_alpha_discrete)
export(scale_alpha_identity)
export(scale_alpha_manual)
export(scale_alpha_ordinal)
export(scale_color_binned)
export(scale_color_brewer)
export(scale_color_continuous)
export(scale_color_date)
export(scale_color_datetime)
export(scale_color_discrete)
export(scale_color_distiller)
export(scale_color_fermenter)
export(scale_color_gradient)
export(scale_color_gradient2)
export(scale_color_gradientn)
Expand All @@ -452,14 +464,19 @@ export(scale_color_hue)
export(scale_color_identity)
export(scale_color_manual)
export(scale_color_ordinal)
export(scale_color_steps)
export(scale_color_steps2)
export(scale_color_stepsn)
export(scale_color_viridis_c)
export(scale_color_viridis_d)
export(scale_colour_binned)
export(scale_colour_brewer)
export(scale_colour_continuous)
export(scale_colour_date)
export(scale_colour_datetime)
export(scale_colour_discrete)
export(scale_colour_distiller)
export(scale_colour_fermenter)
export(scale_colour_gradient)
export(scale_colour_gradient2)
export(scale_colour_gradientn)
Expand All @@ -468,17 +485,23 @@ export(scale_colour_hue)
export(scale_colour_identity)
export(scale_colour_manual)
export(scale_colour_ordinal)
export(scale_colour_steps)
export(scale_colour_steps2)
export(scale_colour_stepsn)
export(scale_colour_viridis_b)
export(scale_colour_viridis_c)
export(scale_colour_viridis_d)
export(scale_continuous_identity)
export(scale_discrete_identity)
export(scale_discrete_manual)
export(scale_fill_binned)
export(scale_fill_brewer)
export(scale_fill_continuous)
export(scale_fill_date)
export(scale_fill_datetime)
export(scale_fill_discrete)
export(scale_fill_distiller)
export(scale_fill_fermenter)
export(scale_fill_gradient)
export(scale_fill_gradient2)
export(scale_fill_gradientn)
Expand All @@ -487,22 +510,30 @@ export(scale_fill_hue)
export(scale_fill_identity)
export(scale_fill_manual)
export(scale_fill_ordinal)
export(scale_fill_steps)
export(scale_fill_steps2)
export(scale_fill_stepsn)
export(scale_fill_viridis_b)
export(scale_fill_viridis_c)
export(scale_fill_viridis_d)
export(scale_linetype)
export(scale_linetype_binned)
export(scale_linetype_continuous)
export(scale_linetype_discrete)
export(scale_linetype_identity)
export(scale_linetype_manual)
export(scale_radius)
export(scale_shape)
export(scale_shape_binned)
export(scale_shape_continuous)
export(scale_shape_discrete)
export(scale_shape_identity)
export(scale_shape_manual)
export(scale_shape_ordinal)
export(scale_size)
export(scale_size_area)
export(scale_size_binned)
export(scale_size_binned_area)
export(scale_size_continuous)
export(scale_size_date)
export(scale_size_datetime)
Expand All @@ -511,6 +542,7 @@ export(scale_size_identity)
export(scale_size_manual)
export(scale_size_ordinal)
export(scale_type)
export(scale_x_binned)
export(scale_x_continuous)
export(scale_x_date)
export(scale_x_datetime)
Expand All @@ -519,6 +551,7 @@ export(scale_x_log10)
export(scale_x_reverse)
export(scale_x_sqrt)
export(scale_x_time)
export(scale_y_binned)
export(scale_y_continuous)
export(scale_y_date)
export(scale_y_datetime)
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
@@ -1,5 +1,9 @@
# ggplot2 (development version)

* A new scale type has been added, that allows binning of aesthetics at the
scale level. It has versions for both position and non-position aesthetics and
comes with two new guides (`guide_bins` and `guide_coloursteps`) (@thomasp85, #3096)

* Position guides can now be customized using the new `guide_axis()`,
which can be passed to position `scale_*()` functions or via
`guides()`. The new axis guide (`guide_axis()`) comes with
Expand Down

0 comments on commit 9a45cc8

Please sign in to comment.