Skip to content

Commit 456e742

Browse files
author
Rasmus
committed
styler changes to adhere to tidyverse style guide
1 parent 4ee8b13 commit 456e742

File tree

4 files changed

+77
-65
lines changed

4 files changed

+77
-65
lines changed

‎R/guides-axis.r

Lines changed: 57 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,30 @@ guide_axis <- function(at, labels, position = "right", theme) {
1414
zero <- unit(0, "npc")
1515
one <- unit(1, "npc")
1616

17-
theme$axis.ticks.length.x.bottom <- with(theme,
18-
axis.ticks.length.x.bottom %||%
19-
axis.ticks.length.x %||%
20-
axis.ticks.length)
21-
theme$axis.ticks.length.x.top <- with(theme,
22-
axis.ticks.length.x.top %||%
23-
axis.ticks.length.x %||%
24-
axis.ticks.length)
25-
theme$axis.ticks.length.y.left <- with(theme,
26-
axis.ticks.length.y.left %||%
27-
axis.ticks.length.y %||%
28-
axis.ticks.length)
29-
theme$axis.ticks.length.y.right <- with(theme,
30-
axis.ticks.length.y.right %||%
31-
axis.ticks.length.y %||%
32-
axis.ticks.length)
17+
theme$axis.ticks.length.x.bottom <- with(
18+
theme,
19+
axis.ticks.length.x.bottom %||%
20+
axis.ticks.length.x %||%
21+
axis.ticks.length
22+
)
23+
theme$axis.ticks.length.x.top <- with(
24+
theme,
25+
axis.ticks.length.x.top %||%
26+
axis.ticks.length.x %||%
27+
axis.ticks.length
28+
)
29+
theme$axis.ticks.length.y.left <- with(
30+
theme,
31+
axis.ticks.length.y.left %||%
32+
axis.ticks.length.y %||%
33+
axis.ticks.length
34+
)
35+
theme$axis.ticks.length.y.right <- with(
36+
theme,
37+
axis.ticks.length.y.right %||%
38+
axis.ticks.length.y %||%
39+
axis.ticks.length
40+
)
3341

3442
label_render <- switch(position,
3543
top = "axis.text.x.top", bottom = "axis.text.x.bottom",
@@ -74,53 +82,57 @@ guide_axis <- function(at, labels, position = "right", theme) {
7482

7583
ticks <- switch(position,
7684
top = element_render(theme, "axis.ticks.x.top",
77-
x = rep(at, each = 2),
78-
y = rep(unit.c(zero, theme$axis.ticks.length.x.top), nticks),
79-
id.lengths = rep(2, nticks)),
85+
x = rep(at, each = 2),
86+
y = rep(unit.c(zero, theme$axis.ticks.length.x.top), nticks),
87+
id.lengths = rep(2, nticks)
88+
),
8089
bottom = element_render(theme, "axis.ticks.x.bottom",
81-
x = rep(at, each = 2),
82-
y = rep(unit.c(one - theme$axis.ticks.length.x.bottom, one), nticks),
83-
id.lengths = rep(2, nticks)),
90+
x = rep(at, each = 2),
91+
y = rep(unit.c(one - theme$axis.ticks.length.x.bottom, one), nticks),
92+
id.lengths = rep(2, nticks)
93+
),
8494
right = element_render(theme, "axis.ticks.y.right",
85-
x = rep(unit.c(zero, theme$axis.ticks.length.y.right), nticks),
86-
y = rep(at, each = 2),
87-
id.lengths = rep(2, nticks)),
95+
x = rep(unit.c(zero, theme$axis.ticks.length.y.right), nticks),
96+
y = rep(at, each = 2),
97+
id.lengths = rep(2, nticks)
98+
),
8899
left = element_render(theme, "axis.ticks.y.left",
89-
x = rep(unit.c(one - theme$axis.ticks.length.y.left, one), nticks),
90-
y = rep(at, each = 2),
91-
id.lengths = rep(2, nticks))
100+
x = rep(unit.c(one - theme$axis.ticks.length.y.left, one), nticks),
101+
y = rep(at, each = 2),
102+
id.lengths = rep(2, nticks)
103+
)
92104
)
93105

94106
# Create the gtable for the ticks + labels
95107
gt <- switch(position,
96-
top = gtable_col("axis",
97-
grobs = list(labels, ticks),
98-
width = one,
108+
top = gtable_col("axis",
109+
grobs = list(labels, ticks),
110+
width = one,
99111
heights = unit.c(grobHeight(labels), theme$axis.ticks.length.x.top)
100112
),
101113
bottom = gtable_col("axis",
102-
grobs = list(ticks, labels),
103-
width = one,
114+
grobs = list(ticks, labels),
115+
width = one,
104116
heights = unit.c(theme$axis.ticks.length.x.bottom, grobHeight(labels))
105117
),
106-
right = gtable_row("axis",
107-
grobs = list(ticks, labels),
108-
widths = unit.c(theme$axis.ticks.length.y.right, grobWidth(labels)),
109-
height = one
118+
right = gtable_row("axis",
119+
grobs = list(ticks, labels),
120+
widths = unit.c(theme$axis.ticks.length.y.right, grobWidth(labels)),
121+
height = one
110122
),
111-
left = gtable_row("axis",
112-
grobs = list(labels, ticks),
113-
widths = unit.c(grobWidth(labels), theme$axis.ticks.length.y.left),
114-
height = one
123+
left = gtable_row("axis",
124+
grobs = list(labels, ticks),
125+
widths = unit.c(grobWidth(labels), theme$axis.ticks.length.y.left),
126+
height = one
115127
)
116128
)
117129

118130
# Viewport for justifying the axis grob
119131
justvp <- switch(position,
120-
top = viewport(y = 0, just = "bottom", height = gtable_height(gt)),
121-
bottom = viewport(y = 1, just = "top", height = gtable_height(gt)),
122-
right = viewport(x = 0, just = "left", width = gtable_width(gt)),
123-
left = viewport(x = 1, just = "right", width = gtable_width(gt))
132+
top = viewport(y = 0, just = "bottom", height = gtable_height(gt)),
133+
bottom = viewport(y = 1, just = "top", height = gtable_height(gt)),
134+
right = viewport(x = 0, just = "left", width = gtable_width(gt)),
135+
left = viewport(x = 1, just = "right", width = gtable_width(gt))
124136
)
125137

126138
absoluteGrob(

‎R/theme-defaults.r

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,10 @@ theme_grey <- function(base_size = 11, base_family = "",
138138
axis.text.y = element_text(margin = margin(r = 0.8 * half_line / 2), hjust = 1),
139139
axis.text.y.right = element_text(margin = margin(l = 0.8 * half_line / 2), hjust = 0),
140140
axis.ticks = element_line(colour = "grey20"),
141-
axis.ticks.length = unit(half_line / 2, "pt"),
142-
axis.ticks.length.x = NULL,
143-
axis.ticks.length.x.top = NULL,
141+
axis.ticks.length = unit(half_line / 2, "pt"),
142+
axis.ticks.length.x = NULL,
143+
axis.ticks.length.x.top = NULL,
144144
axis.ticks.length.x.bottom = NULL,
145-
axis.ticks.length.y = NULL,
146-
axis.ticks.length.y.left = NULL,
147-
axis.ticks.length.y.right = NULL,
148145
axis.title.x = element_text(
149146
margin = margin(t = half_line / 2),
150147
vjust = 1
@@ -158,6 +155,9 @@ theme_grey <- function(base_size = 11, base_family = "",
158155
margin = margin(r = half_line / 2),
159156
vjust = 1
160157
),
158+
axis.ticks.length.y = NULL,
159+
axis.ticks.length.y.left = NULL,
160+
axis.ticks.length.y.right = NULL,
161161
axis.title.y.right = element_text(
162162
angle = -90,
163163
margin = margin(l = half_line / 2),
@@ -533,7 +533,7 @@ theme_test <- function(base_size = 11, base_family = "",
533533
axis.text.y = element_text(margin = margin(r = 0.8 * half_line / 2), hjust = 1),
534534
axis.text.y.right = element_text(margin = margin(l = 0.8 * half_line / 2), hjust = 0),
535535
axis.ticks = element_line(colour = "grey20"),
536-
axis.ticks.length = unit(half_line / 2, "pt"),
536+
axis.ticks.length = unit(half_line / 2, "pt"),
537537
axis.ticks.length.x = NULL,
538538
axis.ticks.length.x.top = NULL,
539539
axis.ticks.length.x.bottom = NULL,

‎R/theme-elements.r

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,15 @@ el_def <- function(class = NULL, inherit = NULL, description = NULL) {
285285
axis.text.y = el_def("element_text", "axis.text"),
286286
axis.text.y.left = el_def("element_text", "axis.text.y"),
287287
axis.text.y.right = el_def("element_text", "axis.text.y"),
288-
axis.ticks.length = el_def("unit"),
289-
axis.ticks.length.x = el_def("unit", "axis.ticks.length"),
290-
axis.ticks.length.x.top = el_def("unit", "axis.ticks.length.x"),
288+
axis.ticks.length = el_def("unit"),
289+
axis.ticks.length.x = el_def("unit", "axis.ticks.length"),
290+
axis.ticks.length.x.top = el_def("unit", "axis.ticks.length.x"),
291291
axis.ticks.length.x.bottom = el_def("unit", "axis.ticks.length.x"),
292-
axis.ticks.length.y = el_def("unit", "axis.ticks.length"),
293-
axis.ticks.length.y.left = el_def("unit", "axis.ticks.length.y"),
294-
axis.ticks.length.y.right = el_def("unit", "axis.ticks.length.y"),
295292
axis.ticks.x = el_def("element_line", "axis.ticks"),
296293
axis.ticks.x.top = el_def("element_line", "axis.ticks.x"),
294+
axis.ticks.length.y = el_def("unit", "axis.ticks.length"),
295+
axis.ticks.length.y.left = el_def("unit", "axis.ticks.length.y"),
296+
axis.ticks.length.y.right = el_def("unit", "axis.ticks.length.y"),
297297
axis.ticks.x.bottom = el_def("element_line", "axis.ticks.x"),
298298
axis.ticks.y = el_def("element_line", "axis.ticks"),
299299
axis.ticks.y.left = el_def("element_line", "axis.ticks.y"),

‎tests/testthat/test-theme.r

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,13 @@ test_that("axes ticks can have independent lengths", {
361361
scale_x_continuous(sec.axis = dup_axis()) +
362362
scale_y_continuous(sec.axis = dup_axis()) +
363363
theme(
364-
axis.ticks.length.x.top = unit(-.5, "cm"),
365-
axis.ticks.length.x.bottom = unit(-.25, "cm"),
366-
axis.ticks.length.y.left = unit(.25, "cm"),
367-
axis.ticks.length.y.right = unit(.5, "cm"),
368-
axis.text.x.bottom = element_text(margin=margin(t=.5, unit="cm")),
369-
axis.text.x.top = element_text(margin=margin(b=.75, unit="cm"))
370-
)
364+
axis.ticks.length.x.top = unit(-.5, "cm"),
365+
axis.ticks.length.x.bottom = unit(-.25, "cm"),
366+
axis.ticks.length.y.left = unit(.25, "cm"),
367+
axis.ticks.length.y.right = unit(.5, "cm"),
368+
axis.text.x.bottom = element_text(margin = margin(t = .5, unit = "cm")),
369+
axis.text.x.top = element_text(margin = margin(b = .75, unit = "cm"))
370+
)
371371
expect_doppelganger("ticks_length", plot)
372372
})
373373

0 commit comments

Comments
 (0)