Skip to content

Commit 9a45cc8

Browse files
authored
scale_binned (#3096)
1 parent 0ee259c commit 9a45cc8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2940
-72
lines changed

DESCRIPTION

+4
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ Collate:
153153
'grob-dotstack.r'
154154
'grob-null.r'
155155
'grouping.r'
156+
'guide-bins.R'
156157
'guide-colorbar.r'
158+
'guide-colorsteps.R'
157159
'guide-legend.r'
158160
'guides-.r'
159161
'guides-axis.r'
@@ -186,6 +188,7 @@ Collate:
186188
'save.r'
187189
'scale-.r'
188190
'scale-alpha.r'
191+
'scale-binned.R'
189192
'scale-brewer.r'
190193
'scale-colour.r'
191194
'scale-continuous.r'
@@ -200,6 +203,7 @@ Collate:
200203
'scale-manual.r'
201204
'scale-shape.r'
202205
'scale-size.r'
206+
'scale-steps.R'
203207
'scale-type.R'
204208
'scale-view.r'
205209
'scale-viridis.r'

NAMESPACE

+33
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,24 @@ S3method(grobWidth,zeroGrob)
6868
S3method(grobX,absoluteGrob)
6969
S3method(grobY,absoluteGrob)
7070
S3method(guide_gengrob,axis)
71+
S3method(guide_gengrob,bins)
7172
S3method(guide_gengrob,colorbar)
7273
S3method(guide_gengrob,guide_none)
7374
S3method(guide_gengrob,legend)
7475
S3method(guide_geom,axis)
76+
S3method(guide_geom,bins)
7577
S3method(guide_geom,colorbar)
7678
S3method(guide_geom,guide_none)
7779
S3method(guide_geom,legend)
7880
S3method(guide_merge,axis)
81+
S3method(guide_merge,bins)
7982
S3method(guide_merge,colorbar)
8083
S3method(guide_merge,guide_none)
8184
S3method(guide_merge,legend)
8285
S3method(guide_train,axis)
86+
S3method(guide_train,bins)
8387
S3method(guide_train,colorbar)
88+
S3method(guide_train,colorsteps)
8489
S3method(guide_train,guide_none)
8590
S3method(guide_train,legend)
8691
S3method(guide_transform,axis)
@@ -201,6 +206,8 @@ export(PositionJitterdodge)
201206
export(PositionNudge)
202207
export(PositionStack)
203208
export(Scale)
209+
export(ScaleBinned)
210+
export(ScaleBinnedPosition)
204211
export(ScaleContinuous)
205212
export(ScaleContinuousDate)
206213
export(ScaleContinuousDatetime)
@@ -370,8 +377,11 @@ export(ggproto_parent)
370377
export(ggsave)
371378
export(ggtitle)
372379
export(guide_axis)
380+
export(guide_bins)
373381
export(guide_colorbar)
382+
export(guide_colorsteps)
374383
export(guide_colourbar)
384+
export(guide_coloursteps)
375385
export(guide_gengrob)
376386
export(guide_geom)
377387
export(guide_legend)
@@ -438,12 +448,14 @@ export(scale_alpha_discrete)
438448
export(scale_alpha_identity)
439449
export(scale_alpha_manual)
440450
export(scale_alpha_ordinal)
451+
export(scale_color_binned)
441452
export(scale_color_brewer)
442453
export(scale_color_continuous)
443454
export(scale_color_date)
444455
export(scale_color_datetime)
445456
export(scale_color_discrete)
446457
export(scale_color_distiller)
458+
export(scale_color_fermenter)
447459
export(scale_color_gradient)
448460
export(scale_color_gradient2)
449461
export(scale_color_gradientn)
@@ -452,14 +464,19 @@ export(scale_color_hue)
452464
export(scale_color_identity)
453465
export(scale_color_manual)
454466
export(scale_color_ordinal)
467+
export(scale_color_steps)
468+
export(scale_color_steps2)
469+
export(scale_color_stepsn)
455470
export(scale_color_viridis_c)
456471
export(scale_color_viridis_d)
472+
export(scale_colour_binned)
457473
export(scale_colour_brewer)
458474
export(scale_colour_continuous)
459475
export(scale_colour_date)
460476
export(scale_colour_datetime)
461477
export(scale_colour_discrete)
462478
export(scale_colour_distiller)
479+
export(scale_colour_fermenter)
463480
export(scale_colour_gradient)
464481
export(scale_colour_gradient2)
465482
export(scale_colour_gradientn)
@@ -468,17 +485,23 @@ export(scale_colour_hue)
468485
export(scale_colour_identity)
469486
export(scale_colour_manual)
470487
export(scale_colour_ordinal)
488+
export(scale_colour_steps)
489+
export(scale_colour_steps2)
490+
export(scale_colour_stepsn)
491+
export(scale_colour_viridis_b)
471492
export(scale_colour_viridis_c)
472493
export(scale_colour_viridis_d)
473494
export(scale_continuous_identity)
474495
export(scale_discrete_identity)
475496
export(scale_discrete_manual)
497+
export(scale_fill_binned)
476498
export(scale_fill_brewer)
477499
export(scale_fill_continuous)
478500
export(scale_fill_date)
479501
export(scale_fill_datetime)
480502
export(scale_fill_discrete)
481503
export(scale_fill_distiller)
504+
export(scale_fill_fermenter)
482505
export(scale_fill_gradient)
483506
export(scale_fill_gradient2)
484507
export(scale_fill_gradientn)
@@ -487,22 +510,30 @@ export(scale_fill_hue)
487510
export(scale_fill_identity)
488511
export(scale_fill_manual)
489512
export(scale_fill_ordinal)
513+
export(scale_fill_steps)
514+
export(scale_fill_steps2)
515+
export(scale_fill_stepsn)
516+
export(scale_fill_viridis_b)
490517
export(scale_fill_viridis_c)
491518
export(scale_fill_viridis_d)
492519
export(scale_linetype)
520+
export(scale_linetype_binned)
493521
export(scale_linetype_continuous)
494522
export(scale_linetype_discrete)
495523
export(scale_linetype_identity)
496524
export(scale_linetype_manual)
497525
export(scale_radius)
498526
export(scale_shape)
527+
export(scale_shape_binned)
499528
export(scale_shape_continuous)
500529
export(scale_shape_discrete)
501530
export(scale_shape_identity)
502531
export(scale_shape_manual)
503532
export(scale_shape_ordinal)
504533
export(scale_size)
505534
export(scale_size_area)
535+
export(scale_size_binned)
536+
export(scale_size_binned_area)
506537
export(scale_size_continuous)
507538
export(scale_size_date)
508539
export(scale_size_datetime)
@@ -511,6 +542,7 @@ export(scale_size_identity)
511542
export(scale_size_manual)
512543
export(scale_size_ordinal)
513544
export(scale_type)
545+
export(scale_x_binned)
514546
export(scale_x_continuous)
515547
export(scale_x_date)
516548
export(scale_x_datetime)
@@ -519,6 +551,7 @@ export(scale_x_log10)
519551
export(scale_x_reverse)
520552
export(scale_x_sqrt)
521553
export(scale_x_time)
554+
export(scale_y_binned)
522555
export(scale_y_continuous)
523556
export(scale_y_date)
524557
export(scale_y_datetime)

NEWS.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ggplot2 (development version)
22

3+
* A new scale type has been added, that allows binning of aesthetics at the
4+
scale level. It has versions for both position and non-position aesthetics and
5+
comes with two new guides (`guide_bins` and `guide_coloursteps`) (@thomasp85, #3096)
6+
37
* Position guides can now be customized using the new `guide_axis()`,
48
which can be passed to position `scale_*()` functions or via
59
`guides()`. The new axis guide (`guide_axis()`) comes with

0 commit comments

Comments
 (0)