Code

Convert guides to ggproto#4879

Code

Merged

teunbrand merged 131 commits intotidyverse:maintidyverse/ggplot2:mainfrom

teunbrand:ggproto_guidesteunbrand/ggplot2:ggproto_guidesCopy head branch name to clipboard

Apr 24, 2023

Commits

Commits on Jan 13, 2021

• Merge pull request #1 from tidyverse/master

  Show description for 59850ac
  teunbrand

  authored
  59850ac

  Copy full SHA for 59850ac

Commits on Sep 15, 2021

• Merge branch 'tidyverse:master' into master

  teunbrand

  authored
  86787de

  Copy full SHA for 86787de

Commits on Mar 24, 2022

• Merge branch 'tidyverse:main' into master

  teunbrand

  authored
  1d1a2b0

  Copy full SHA for 1d1a2b0

Commits on May 11, 2022

• Merge branch 'tidyverse:main' into master

  teunbrand

  authored
  28eff54

  Copy full SHA for 28eff54

Commits on Jun 18, 2022

• Allow Guide ggproto as valid guide

  teunbrand

  committed
  98a5c33

  Copy full SHA for 98a5c33

• The parent Guide ggproto

  teunbrand

  committed
  30d7382

  Copy full SHA for 30d7382

• Add guide constructor

  teunbrand

  committed
  2d871e8

  Copy full SHA for 2d871e8

• Small tweaks

  teunbrand

  committed
  afbf086

  Copy full SHA for afbf086

• Convert guide_none to ggproto

  teunbrand

  committed
  3a286f3

  Copy full SHA for 3a286f3

• Accommodate Guide in cartesian coords

  teunbrand

  committed
  870221c

  Copy full SHA for 870221c

• Bifurcate guides_train (for now)

  teunbrand

  committed
  12fc416

  Copy full SHA for 12fc416

• Convert guide_axis to ggproto

  teunbrand

  committed
  23d2f76

  Copy full SHA for 23d2f76

Commits on Jun 19, 2022

• Resolve merge conflicts

  Show description for ad3aa6c
  teunbrand

  committed
  ad3aa6c

  Copy full SHA for ad3aa6c

• Merge branch 'tidyverse-main2' into ggproto_guides

  teunbrand

  committed
  0e67b73

  Copy full SHA for 0e67b73

Commits on Aug 7, 2022

• merge upstream

  Show description for 26eebaf
  teunbrand

  committed
  26eebaf

  Copy full SHA for 26eebaf

• Merge branch 'tidyverse-main' into ggproto_guides

  teunbrand

  committed
  952b153

  Copy full SHA for 952b153

Commits on Aug 8, 2022

• revert scale$map() logic

  teunbrand

  committed
  7c12fda

  Copy full SHA for 7c12fda

• Adress some minor comments

  teunbrand

  committed
  570aba0

  Copy full SHA for 570aba0

Commits on Aug 11, 2022

• Better warning when guide function not found

  teunbrand

  committed
  9c27d3e

  Copy full SHA for 9c27d3e

• move guide position specification from setup to training

  teunbrand

  committed
  058f0cf

  Copy full SHA for 058f0cf

Commits on Aug 13, 2022

• Stop if guide has no valid function

  teunbrand

  committed
  fb32308

  Copy full SHA for fb32308

• Make a GuidesList class

  teunbrand

  committed
  9b95e22

  Copy full SHA for 9b95e22

• Coord uses GuidesList

  teunbrand

  committed
  a0f6a2d

  Copy full SHA for a0f6a2d

• Invalid guide throws warning instead of error

  teunbrand

  committed
  ed1f392

  Copy full SHA for ed1f392

• Update axis merge method

  teunbrand

  committed
  aabc112

  Copy full SHA for aabc112

• Trim guide methods, return params

  teunbrand

  committed
  1ca3f06

  Copy full SHA for 1ca3f06

• CoordPolar doesn't use guides

  teunbrand

  committed
  4f7492d

  Copy full SHA for 4f7492d

• Consider guide titles earlier

  teunbrand

  committed
  9ab5ffb

  Copy full SHA for 9ab5ffb

• expand tests on label hierarchy

  teunbrand

  committed
  bbb4f00

  Copy full SHA for bbb4f00

• roxygenate

  teunbrand

  committed
  d0fbdc2

  Copy full SHA for d0fbdc2

Commits on Sep 3, 2022

• Fix #4958

  teunbrand

  committed
  bfa93a4

  Copy full SHA for bfa93a4

Commits on Sep 4, 2022

• Default guide$transform() throws error

  teunbrand

  committed
  c652cd3

  Copy full SHA for c652cd3

• guide$train() gets ellipses to pass to guide$extract_params()

  teunbrand

  committed
  855cca3

  Copy full SHA for 855cca3

• Decoration 'name' is an axis thing

  teunbrand

  committed
  aaba298

  Copy full SHA for aaba298

• guide$assemble_drawing() knows about elements

  teunbrand

  committed
  7e6752c

  Copy full SHA for 7e6752c

• re-doc `guide_axis()`'s order argument

  teunbrand

  committed
  43b24a1

  Copy full SHA for 43b24a1

• Use .trbl helper vector

  teunbrand

  committed
  b933ff4

  Copy full SHA for b933ff4

• Fix few mistakes

  teunbrand

  committed
  71d7ee0

  Copy full SHA for 71d7ee0

• rename GuidesList class to Guides

  teunbrand

  committed
  3bbaf26

  Copy full SHA for 3bbaf26

• Move guide training to from guides_train() to Guides$train()

  teunbrand

  committed
  1c6d103

  Copy full SHA for 1c6d103

• Move guide merging from guides_merge() to Guides$merge()

  teunbrand

  committed
  cabc462

  Copy full SHA for cabc462

• Move guides_geom() to Guides$process_layers()

  teunbrand

  committed
  b9d2a62

  Copy full SHA for b9d2a62

• Move guides_gengrob() to Guides$draw()

  teunbrand

  committed
  c72ffa6

  Copy full SHA for c72ffa6

• Move guides_build() to Guides$assemble()

  teunbrand

  committed
  ee5a5a4

  Copy full SHA for ee5a5a4

• Update test to use Guides

  teunbrand

  committed
  f77a3c4

  Copy full SHA for f77a3c4

• Clean up the guides_*() function family

  teunbrand

  committed
  1b63262

  Copy full SHA for 1b63262

• Convert guide_legend() to ggproto

  teunbrand

  committed
  271b285

  Copy full SHA for 271b285

• Re-oxygenate

  teunbrand

  committed
  8b1ba23

  Copy full SHA for 8b1ba23

• Forgot about `reverse` argument

  teunbrand

  committed
  7a5d734

  Copy full SHA for 7a5d734

Commits on Sep 7, 2022

• Move label justification to GuideLegend$build_labels

  teunbrand

  committed
  6617558

  Copy full SHA for 6617558

Commits on Sep 9, 2022

• Accommodate NULL labels

  teunbrand

  committed
  82cbc15

  Copy full SHA for 82cbc15

• `Guide$build_ticks()` can take key as vector.

  teunbrand

  committed
  6ef1267

  Copy full SHA for 6ef1267

• Properly pass ticks to `Guide$build_decor()`

  teunbrand

  committed
  00ca023

  Copy full SHA for 00ca023

• GuideLegend children can opt-out of label re-justification

  teunbrand

  committed
  21dbd8a

  Copy full SHA for 21dbd8a

Commits on Sep 13, 2022

• Simplify key measuring logic

  teunbrand

  committed
  0e0962a

  Copy full SHA for 0e0962a

• Add sensible defaults for some parameters

  teunbrand

  committed
  94d7c07

  Copy full SHA for 94d7c07

• Convert guide_colourbar

  teunbrand

  committed
  2cfc27c

  Copy full SHA for 2cfc27c

• More use theme elements more consistently

  teunbrand

  committed
  f299963

  Copy full SHA for f299963

• Document alternate use for `frame` and `ticks` in GuideColourbar

  teunbrand

  committed
  184774b

  Copy full SHA for 184774b

• Convert `guide_bins()` to ggproto

  teunbrand

  committed
  e9c24ec

  Copy full SHA for e9c24ec

• Convert `guide_coloursteps()` to ggproto

  teunbrand

  committed
  e0112c4

  Copy full SHA for e0112c4

• Update guide tests

  teunbrand

  committed
  f88db51

  Copy full SHA for f88db51

• Remove branches for old guides from Guides methods

  teunbrand

  committed
  96e811b

  Copy full SHA for 96e811b

• Go back to `matched_aes()` instead of manual calculation

  teunbrand

  committed
  ff7695e

  Copy full SHA for ff7695e

• Remove old S3 generics

  teunbrand

  committed
  0fdd7a0

  Copy full SHA for 0fdd7a0

• Re-oxygenate

  teunbrand

  committed
  f9dcb5d

  Copy full SHA for f9dcb5d

• Rename guides-{axis/none}.r to guide-{axis/none}.r for consistency

  teunbrand

  committed
  f946c57

  Copy full SHA for f946c57

• Commit man pages

  teunbrand

  committed
  b23146a

  Copy full SHA for b23146a

• Merge branch 'tidyverse:main' into ggproto_guides

  teunbrand

  authored
  9dcbed8

  Copy full SHA for 9dcbed8

• Avoid spurious order mixing

  teunbrand

  committed
  1a53626

  Copy full SHA for 1a53626

• Avoid some spurious axis rearrangements

  teunbrand

  committed
  7178e30

  Copy full SHA for 7178e30

• size --> linewidth

  teunbrand

  committed
  62b300b

  Copy full SHA for 62b300b

• Don't clip `guide_bins()`

  teunbrand

  committed
  0f88e75

  Copy full SHA for 0f88e75

• Convert hash items quos to exprs

  teunbrand

  committed
  981103b

  Copy full SHA for 981103b

• Approve visual change in horizontal guide_bins

  teunbrand

  committed
  de7330d

  Copy full SHA for de7330d

• Approve invisible visible changes

  teunbrand

  committed
  65a7195

  Copy full SHA for 65a7195

Commits on Nov 13, 2022

• Don't map continuous scales

  teunbrand

  committed
  d238d57

  Copy full SHA for d238d57

• Pre-populate GuideNone where possible

  teunbrand

  committed
  772093f

  Copy full SHA for 772093f

• Speedup axis guide training

  teunbrand

  committed
  2cce9df

  Copy full SHA for 2cce9df

• Merge branch 'main' into ggproto_guides

  teunbrand

  authored
  258a913

  Copy full SHA for 258a913

• Merge branch 'ggproto_guides' of https://github.com/teunbrand/ggplot2 into ggproto_guides

  teunbrand

  committed
  0deae41

  Copy full SHA for 0deae41

• Don't glue theme elements

  teunbrand

  committed
  575dd94

  Copy full SHA for 575dd94

Commits on Nov 14, 2022

• Add NEWS bullet

  teunbrand

  committed
  b7adfbe

  Copy full SHA for b7adfbe

Commits on Dec 11, 2022

• Merge branch 'main' into ggproto_guides

  teunbrand

  authored
  2a1d41f

  Copy full SHA for 2a1d41f

• Update test

  teunbrand

  committed
  9fd9f31

  Copy full SHA for 9fd9f31

Commits on Dec 31, 2022

• Prevent bug in guide axis

  teunbrand

  committed
  5792ea9

  Copy full SHA for 5792ea9

Commits on Jan 2, 2023

• Pluralise error message

  teunbrand

  committed
  e500551

  Copy full SHA for e500551

• Legend assembly conditional on grob being present

  teunbrand

  committed
  29af9b9

  Copy full SHA for 29af9b9

• `guides()` returns <Guides>

  teunbrand

  committed
  5157221

  Copy full SHA for 5157221

• guides() rejects unnamed guides

  teunbrand

  committed
  8272173

  Copy full SHA for 8272173

• Fix `calc_element()` not recognising 'character' as special keyword

  teunbrand

  committed
  a1c8dab

  Copy full SHA for a1c8dab

• GuideLegend can skip computing missing stuff

  teunbrand

  committed
  49559f9

  Copy full SHA for 49559f9

• Give <Guides> nicer print method

  teunbrand

  committed
  ac3a59f

  Copy full SHA for ac3a59f

Commits on Jan 3, 2023

• Merge branch 'main' into ggproto_guides

  teunbrand

  authored
  c010599

  Copy full SHA for c010599

Commits on Jan 18, 2023

• Fix #5152

  teunbrand

  committed
  80da767

  Copy full SHA for 80da767

• Merge branch 'ggproto_guides' of https://github.com/teunbrand/ggplot2 into ggproto_guides

  teunbrand

  committed
  6239017

  Copy full SHA for 6239017

Commits on Feb 13, 2023

• Reduce `guides()` logic depth

  teunbrand

  committed
  9024e12

  Copy full SHA for 9024e12

• Make Guides$build method

  teunbrand

  committed
  bb9cf55

  Copy full SHA for bb9cf55

• Guarantee `guides` is `Guides`-class

  teunbrand

  committed
  d3371ba

  Copy full SHA for d3371ba

• Integrate Guides$build

  teunbrand

  committed
  7a77dd4

  Copy full SHA for 7a77dd4

• Remove superfluous check

  teunbrand

  committed
  daa8a6f

  Copy full SHA for daa8a6f

• Restructure constructor -> class -> helpers

  teunbrand

  committed
  2a11d51

  Copy full SHA for 2a11d51

• Omit NEWS bullet for now

  teunbrand

  committed
  26d037c

  Copy full SHA for 26d037c

• Merge pull request #10 from teunbrand/main

  Show description for af8e1f5
  teunbrand

  authored
  af8e1f5

  Copy full SHA for af8e1f5

Commits on Feb 14, 2023

• Fix failing test

  teunbrand

  committed
  16937c0

  Copy full SHA for 16937c0

• `Guide$build_decor()` recieves all grobs

  teunbrand

  committed
  99f1724

  Copy full SHA for 99f1724

• Merge branch 'ggproto_guides' of https://github.com/teunbrand/ggplot2 into ggproto_guides

  teunbrand

  committed
  76d08f6

  Copy full SHA for 76d08f6

Commits on Feb 27, 2023

• Revert "Fix `calc_element()` not recognising 'character' as special keyword"

  Show description for 4bb5dd8
  teunbrand

  committed
  4bb5dd8

  Copy full SHA for 4bb5dd8

• Resolve conflict

  Show description for b7ba4d6
  teunbrand

  committed
  b7ba4d6

  Copy full SHA for b7ba4d6

• Merge pull request #13 from teunbrand/temp_main

  Show description for 166af6f
  teunbrand

  authored
  166af6f

  Copy full SHA for 166af6f

Commits on Mar 26, 2023

• Resolve merge conflicts

  Show description for 04cda8d
  teunbrand

  committed
  04cda8d

  Copy full SHA for 04cda8d

• Don't `Map()` setters

  teunbrand

  committed
  676a4db

  Copy full SHA for 676a4db

• Better variable names

  teunbrand

  committed
  63337ba

  Copy full SHA for 63337ba

• Rename `$geom()` method to `$get_layer_key()`

  teunbrand

  committed
  f8eee08

  Copy full SHA for f8eee08

• Use dual type checks

  teunbrand

  committed
  f0f223c

  Copy full SHA for f0f223c

• Initialise <Guides>

  teunbrand

  committed
  8eecb1c

  Copy full SHA for 8eecb1c

• Fix last code review issues

  teunbrand

  committed
  5640d69

  Copy full SHA for 5640d69

• Rename guide-.r to guide-.R

  teunbrand

  authored
  57687a1

  Copy full SHA for 57687a1

• Rename guide-axis.r to guide-axis.R

  teunbrand

  authored
  18f275f

  Copy full SHA for 18f275f

• Rename guide-none.r to guide-none.R

  teunbrand

  authored
  4db47c8

  Copy full SHA for 4db47c8

Commits on Apr 11, 2023

• Add statelessness test

  teunbrand

  committed
  6065f96

  Copy full SHA for 6065f96

Commits on Apr 12, 2023

• Swap test hashing for serialisation

  teunbrand

  committed
  f1e48d1

  Copy full SHA for f1e48d1

Commits on Apr 16, 2023

• Purge `default_mapping` arguments, see #4475

  teunbrand

  committed
  365b3f5

  Copy full SHA for 365b3f5

• Test `Guides` instead of plain list

  teunbrand

  committed
  a230443

  Copy full SHA for a230443

• validator also validates output of function name input

  teunbrand

  committed
  5bd9e59

  Copy full SHA for 5bd9e59

• remove unnecessary `scale_index` field

  teunbrand

  committed
  54b3a6a

  Copy full SHA for 54b3a6a

• Deal with `guide_none()` once

  teunbrand

  committed
  a1bbe23

  Copy full SHA for a1bbe23

• Reorganise and clarify

  teunbrand

  committed
  91059d7

  Copy full SHA for 91059d7

Commits on Apr 22, 2023

• Merge branch 'main' into ggproto_guides

  teunbrand

  committed
  da5e75d

  Copy full SHA for da5e75d

Commits on Apr 23, 2023

• Fix plot state bug

  teunbrand

  committed
  57b82f7

  Copy full SHA for 57b82f7

• Add news bullet

  teunbrand

  committed
  700d717

  Copy full SHA for 700d717