Lighten knob outline and embossed text for dark bricks.

This commit is contained in:
Ryan Timpe
2019-06-21 13:26:03 -04:00
parent b6010d668e
commit e1ce8d4201
3 changed files with 14 additions and 6 deletions

View File

@@ -13,14 +13,12 @@ export(display_bricks)
export(display_colors)
export(display_pieces)
export(display_set)
export(drawDetails.resizingTextGrob)
export(generate_instructions)
export(geom_brick_point)
export(geom_brick_rect)
export(image_to_bricks)
export(layer_from_bricks)
export(legoize)
export(preDrawDetails.resizingTextGrob)
export(resizingTextGrob)
export(scale_image)
export(table_pieces)

View File

@@ -138,6 +138,11 @@ GeomBrick <- ggproto("GeomBrick", Geom,
coords_nudge <- ggplot2::transform_position(coords,
function(x) x + x_size*(5/8)*(1/2)*(1/4),
function(y) y - y_size*(5/8)*(1/2)*(1/4))
# outline and text for dark colors
coords$color_intensity <- as.numeric(colSums(col2rgb(coords$fill)))
coords$text_alpha <- ifelse(coords$color_intensity < 200, 0.2, 0.2)
coords$text_col <- ifelse(coords$color_intensity < 200, "#CCCCCC", "#333333")
gm_knob_shadow <- grid::circleGrob(
coords_nudge$x,
@@ -157,7 +162,8 @@ GeomBrick <- ggproto("GeomBrick", Geom,
r= diameter*(5/8)*(1/2),
default.units = "native",
gp = grid::gpar(
col = alpha("#333333", 0.2),
# col = alpha("#333333", 0.2),
col = alpha(coords$text_col, coords$text_alpha),
fill = alpha(coords$fill, coords$alpha),
size = coords$size * .pt,
lty = coords$linetype
@@ -185,7 +191,8 @@ GeomBrick <- ggproto("GeomBrick", Geom,
hjust = data$hjust, vjust = data$vjust,
rot = data$angle,
gp = grid::gpar(
col = alpha("#333333", 0.2),
# col = alpha("#333333", 0.2),
col = alpha(coords$text_col, coords$text_alpha),
cex = 3/8 * 0.5 * (1.5) * ((100/n)^(1/2)), #100 bricks is optimal size for labels by default?
fontfamily = data$family,
fontface = "bold",

View File

@@ -5,6 +5,7 @@
\alias{resizingTextGrob}
\alias{drawDetails.resizingTextGrob}
\alias{preDrawDetails.resizingTextGrob}
\alias{postDrawDetails.resizingTextGrob}
\alias{GeomBrick}
\alias{GeomStud}
\title{GeomBrick}
@@ -12,9 +13,11 @@
\usage{
resizingTextGrob(...)
drawDetails.resizingTextGrob(x, recording = TRUE)
\method{drawDetails}{resizingTextGrob}(x, recording = TRUE)
preDrawDetails.resizingTextGrob(x)
\method{preDrawDetails}{resizingTextGrob}(x)
\method{postDrawDetails}{resizingTextGrob}(x)
GeomStud
}