Merge remote-tracking branch 'upstream/master' into feature/geom-ribbon-line

Author: yutannihilation

DESCRIPTION

@@ -153,11 +153,14 @@ 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'
     'guides-grid.r'
+    'guides-none.r'
     'hexbin.R'
     'labeller.r'
     'labels.r'
@@ -185,6 +188,7 @@ Collate:
     'save.r'
     'scale-.r'
     'scale-alpha.r'
+    'scale-binned.R'
     'scale-brewer.r'
     'scale-colour.r'
     'scale-continuous.r'
@@ -199,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'

NAMESPACE

@@ -67,14 +67,30 @@ S3method(grobWidth,absoluteGrob)
 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)
+S3method(guide_transform,default)
+S3method(guide_transform,guide_none)
 S3method(heightDetails,titleGrob)
 S3method(heightDetails,zeroGrob)
 S3method(interleave,default)
@@ -190,6 +206,8 @@ export(PositionJitterdodge)
 export(PositionNudge)
 export(PositionStack)
 export(Scale)
+export(ScaleBinned)
+export(ScaleBinnedPosition)
 export(ScaleContinuous)
 export(ScaleContinuousDate)
 export(ScaleContinuousDatetime)
@@ -298,6 +316,8 @@ export(facet_grid)
 export(facet_null)
 export(facet_wrap)
 export(find_panel)
+export(flip_data)
+export(flipped_names)
 export(fortify)
 export(geom_abline)
 export(geom_area)
@@ -358,14 +378,21 @@ export(ggproto)
 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)
 export(guide_merge)
+export(guide_none)
 export(guide_train)
+export(guide_transform)
 export(guides)
+export(has_flipped_aes)
 export(is.Coord)
 export(is.facet)
 export(is.ggplot)
@@ -424,12 +451,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)
@@ -438,14 +467,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)
@@ -454,17 +488,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)
@@ -473,22 +513,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)
@@ -497,6 +545,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)
@@ -505,6 +554,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)

NEWS.md

@@ -1,5 +1,16 @@
 # 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
+  arguments `check.overlap` (automatic removal of overlapping
+  labels), `angle` (easy rotation of axis labels), and
+  `n.dodge` (dodge labels into multiple rows/columns) (@paleolimbot, #3322).
+
 * `Geom` now gains a `setup_params()` method in line with the other ggproto
   classes (@thomasp85, #3509)
 

R/axis-secondary.R

@@ -20,6 +20,9 @@
 #'   - A character vector giving labels (must be same length as `breaks`)
 #'   - A function that takes the breaks as input and returns labels as output
 #'
+#' @param guide A position guide that will be used to render
+#'   the axis on the plot. Usually this is [guide_axis()].
+#'
 #' @details
 #' `sec_axis` is used to create the specifications for a secondary axis.
 #' Except for the `trans` argument any of the arguments can be set to
@@ -79,7 +82,8 @@
 #'   labels = scales::time_format("%b %d %I %p")))
 #'
 #' @export
-sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels = waiver()) {
+sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels = waiver(),
+                     guide = waiver()) {
   # sec_axis() historically accpeted two-sided formula, so be permissive.
   if (length(trans) > 2) trans <- trans[c(1,3)]
 
@@ -88,14 +92,15 @@ sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels =
     trans = trans,
     name = name,
     breaks = breaks,
-    labels = labels
+    labels = labels,
+    guide = guide
   )
 }
 #' @rdname sec_axis
 #'
 #' @export
-dup_axis <- function(trans = ~., name = derive(), breaks = derive(), labels = derive()) {
-  sec_axis(trans, name, breaks, labels)
+dup_axis <- function(trans = ~., name = derive(), breaks = derive(), labels = derive(), guide = derive()) {
+  sec_axis(trans, name, breaks, labels, guide)
 }
 
 is.sec_axis <- function(x) {
@@ -148,6 +153,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
     if (is.derived(self$breaks)) self$breaks <- scale$breaks
     if (is.waive(self$breaks)) self$breaks <- scale$trans$breaks
     if (is.derived(self$labels)) self$labels <- scale$labels
+    if (is.derived(self$guide)) self$guide <- scale$guide
   },
 
   transform_range = function(self, range) {

R/coord-.r

@@ -59,7 +59,7 @@ Coord <- ggproto("Coord",
 
   aspect = function(ranges) NULL,
 
-  labels = function(panel_params) panel_params,
+  labels = function(labels, panel_params) labels,
 
   render_fg = function(panel_params, theme) element_render(theme, "panel.border"),
 
@@ -91,6 +91,14 @@ Coord <- ggproto("Coord",
     list()
   },
 
+  setup_panel_guides = function(self, panel_params, guides, params = list()) {
+    panel_params
+  },
+
+  train_panel_guides = function(self, panel_params, layers, default_mapping, params = list()) {
+    panel_params
+  },
+
   transform = function(data, range) NULL,
 
   distance = function(x, y, panel_params) NULL,