Compare ⋅ wilkelab/gridtext

Overview Diff Coverage Changes Files Commits

No flags found

Use flags to group coverage reports by test type, project and/or folders.
Then setup custom commit statuses and notifications for each flag.

e.g., #unittest #integration

#production #enterprise

#frontend #backend

Learn more about Codecov Flags here.

Showing 2 of 3 files from the diff.

85.71% 100.00% ø

R/drawing-context.R changed.

96.55% 100.00% ø

R/text-details.R changed.

Other files ignored by Codecov

NEWS.md has changed.

@@ -46,8 +46,8 @@

Loading

update_gpar <- function(gp, gp_new) {
  names_new <- names(gp_new)
  names_old <- names(gp)
  gp[c(intersect(names_old, names_new), "font")] <- NULL
  gp_new["font"] <- NULL
  gp[c(intersect(names_old, names_new), "fontface")] <- NULL
  gp_new["fontface"] <- NULL
  do.call(gpar, c(gp, gp_new))
}


@@ -70,13 +70,13 @@

Loading


# update the fontface of a drawing context
set_context_fontface <- function(drawing_context, fontface = "plain", overwrite = FALSE) {
  fontface_old <- drawing_context$gp$fontface
  font_old <- drawing_context$gp$font

  # combine bold and italic if needed
  if (!isTRUE(overwrite)) {
    if (isTRUE(fontface == "italic") && isTRUE(fontface_old == "bold")) {
    if (isTRUE(fontface == "italic") && isTRUE(font_old == 2)) { # see ?grid::gpar for fontface codes
      fontface <- "bold.italic"
    } else if (isTRUE(fontface == "bold") && isTRUE(fontface_old == "italic")) {
    } else if (isTRUE(fontface == "bold") && isTRUE(font_old == 3)) {
      fontface <- "bold.italic"
    }
  }

@@ -3,7 +3,7 @@

Loading

#' Calculate text details for a given text label
#' @param label Character vector containing the label. Can handle only one label at a time.
#' @param gp Grid graphical parameters defining the font (`fontfamily`, `fontface`, and
#'   `fontface` should be defined).
#'   `fontsize` should be defined).
#' @examples
#' text_details("Hello world!", grid::gpar(fontfamily = "", fontface = "plain", fontsize = 12))
#' text_details("Hello world!", grid::gpar(fontfamily = "", fontface = "plain", fontsize = 24))

@@ -14,11 +14,11 @@

Loading

#' @noRd
text_details <- function(label, gp = gpar()) {
  fontfamily <- gp$fontfamily %||% grid::get.gpar("fontfamily")$fontfamily
  fontface <- gp$fontface %||% grid::get.gpar("fontface")$fontface
  font <- gp$font %||% grid::get.gpar("font")$font
  fontsize <- gp$fontsize %||% grid::get.gpar("fontsize")$fontsize

  devname <- names(grDevices::dev.cur())
  fontkey <- paste0(devname, fontfamily, fontface, fontsize)
  fontkey <- paste0(devname, fontfamily, font, fontsize)
  if (devname == "null device") {
    cache <- FALSE   # don't cache if no device open
  } else {

@@ -30,16 +30,16 @@

Loading

  }

  # ascent and width depend on label and font
  l1 <- text_info(label, fontkey, fontfamily, fontface, fontsize, cache)
  l1 <- text_info(label, fontkey, fontfamily, font, fontsize, cache)
  # descent and space width depend only on font
  l2 <- font_info(fontkey, fontfamily, fontface, fontsize, cache)
  l2 <- font_info(fontkey, fontfamily, font, fontsize, cache)

  # concatenate, result is a list with four members, width_pt, ascent_pt, descent_pt, space_pt
  c(l1, l2)
}

font_info_cache <- new.env(parent = emptyenv())
font_info <- function(fontkey, fontfamily, fontface, fontsize, cache) {
font_info <- function(fontkey, fontfamily, font, fontsize, cache) {
  info <- font_info_cache[[fontkey]]

  if (is.null(info)) {

@@ -48,7 +48,7 @@

Loading

      gp = gpar(
        fontsize = fontsize,
        fontfamily = fontfamily,
        fontface = fontface,
        font = font,
        cex = 1
      )
    )), "pt", valueOnly = TRUE)

@@ -58,7 +58,7 @@

Loading

      gp = gpar(
        fontsize = fontsize,
        fontfamily = fontfamily,
        fontface = fontface,
        font = font,
        cex = 1
      )
    )), "pt", valueOnly = TRUE)

@@ -73,7 +73,7 @@

Loading

}

text_info_cache <- new.env(parent = emptyenv())
text_info <- function(label, fontkey, fontfamily, fontface, fontsize, cache) {
text_info <- function(label, fontkey, fontfamily, font, fontsize, cache) {
  key <- paste0(label, fontkey)
  info <- text_info_cache[[key]]


@@ -83,7 +83,7 @@

Loading

      gp = gpar(
        fontsize = fontsize,
        fontfamily = fontfamily,
        fontface = fontface,
        font = font,
        cex = 1
      )
    )), "pt", valueOnly = TRUE)

@@ -93,7 +93,7 @@

Loading

      gp = gpar(
        fontsize = fontsize,
        fontfamily = fontfamily,
        fontface = fontface,
        font = font,
        cex = 1
      )
    )), "pt", valueOnly = TRUE)

Everything is accounted for!

No changes detected that need to be reviewed.

What changes does Codecov check for?

Lines, not adjusted in diff, that have changed coverage data.

Files that introduced coverage data that had none before.

Files that have missing coverage data that once were tracked.

88.58% 100.00% ø

Merge pull request #25 from netique/master

clauswilke

6192174

CI Passed

Hiding 2 contexual commits

88.58% ø ø

retrieve font, not fontface in set_context_fontface, change fontface char to font int

netique

b410f97

Hiding 2 contexual commits

88.58% 100.00% ø

Merge pull request #26 from MichaelChirico/patch-1

clauswilke

6d6c03e

CI Passed

Files		•	•	•	Coverage
R	ø	ø	ø	ø	81.71%
src	ø	ø	ø	ø	93.79%
Project Totals (24 files)	1,331	1,179	0	152	88.58%

30	30		}
31	31
32	32		# ascent and width depend on label and font
33		-	l1 <- text_info(label, fontkey, fontfamily, fontface, fontsize, cache)
	33	+	l1 <- text_info(label, fontkey, fontfamily, font, fontsize, cache)
34	34		# descent and space width depend only on font
35		-	l2 <- font_info(fontkey, fontfamily, fontface, fontsize, cache)
	35	+	l2 <- font_info(fontkey, fontfamily, font, fontsize, cache)
36	36
37	37		# concatenate, result is a list with four members, width_pt, ascent_pt, descent_pt, space_pt
38	38		c(l1, l2)
39	39		}
40	40
41	41		font_info_cache <- new.env(parent = emptyenv())
42		-	font_info <- function(fontkey, fontfamily, fontface, fontsize, cache) {
	42	+	font_info <- function(fontkey, fontfamily, font, fontsize, cache) {
43	43		info <- font_info_cache[[fontkey]]
44	44
45	45		if (is.null(info)) {

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

Compare `6d6c03e ... +5 ... 6192174`

No flags found

Everything is accounted for!

What changes does Codecov check for?

Show failed CI and contexual commits `c`

7 Commits

46	46		update_gpar <- function(gp, gp_new) {
47	47		names_new <- names(gp_new)
48	48		names_old <- names(gp)
49		-	gp[c(intersect(names_old, names_new), "font")] <- NULL
50		-	gp_new["font"] <- NULL
	49	+	gp[c(intersect(names_old, names_new), "fontface")] <- NULL
	50	+	gp_new["fontface"] <- NULL
51	51		do.call(gpar, c(gp, gp_new))
52	52		}
53	53

70	70
71	71		# update the fontface of a drawing context
72	72		set_context_fontface <- function(drawing_context, fontface = "plain", overwrite = FALSE) {
73		-	fontface_old <- drawing_context$gp$fontface
	73	+	font_old <- drawing_context$gp$font
74	74
75	75		# combine bold and italic if needed
76	76		if (!isTRUE(overwrite)) {
77		-	if (isTRUE(fontface == "italic") && isTRUE(fontface_old == "bold")) {
	77	+	if (isTRUE(fontface == "italic") && isTRUE(font_old == 2)) { # see ?grid::gpar for fontface codes
78	78		fontface <- "bold.italic"
79		-	} else if (isTRUE(fontface == "bold") && isTRUE(fontface_old == "italic")) {
	79	+	} else if (isTRUE(fontface == "bold") && isTRUE(font_old == 3)) {
80	80		fontface <- "bold.italic"
81	81		}
82	82		}

3	3		#' Calculate text details for a given text label
4	4		#' @param label Character vector containing the label. Can handle only one label at a time.
5	5		#' @param gp Grid graphical parameters defining the font (`fontfamily`, `fontface`, and
6		-	#' `fontface` should be defined).
	6	+	#' `fontsize` should be defined).
7	7		#' @examples
8	8		#' text_details("Hello world!", grid::gpar(fontfamily = "", fontface = "plain", fontsize = 12))
9	9		#' text_details("Hello world!", grid::gpar(fontfamily = "", fontface = "plain", fontsize = 24))

14	14		#' @noRd
15	15		text_details <- function(label, gp = gpar()) {
16	16		fontfamily <- gp$fontfamily %\|\|% grid::get.gpar("fontfamily")$fontfamily
17		-	fontface <- gp$fontface %\|\|% grid::get.gpar("fontface")$fontface
	17	+	font <- gp$font %\|\|% grid::get.gpar("font")$font
18	18		fontsize <- gp$fontsize %\|\|% grid::get.gpar("fontsize")$fontsize
19	19
20	20		devname <- names(grDevices::dev.cur())
21		-	fontkey <- paste0(devname, fontfamily, fontface, fontsize)
	21	+	fontkey <- paste0(devname, fontfamily, font, fontsize)
22	22		if (devname == "null device") {
23	23		cache <- FALSE # don't cache if no device open
24	24		} else {

48	48		gp = gpar(
49	49		fontsize = fontsize,
50	50		fontfamily = fontfamily,
51		-	fontface = fontface,
	51	+	font = font,
52	52		cex = 1
53	53		)
54	54		)), "pt", valueOnly = TRUE)

73	73		}
74	74
75	75		text_info_cache <- new.env(parent = emptyenv())
76		-	text_info <- function(label, fontkey, fontfamily, fontface, fontsize, cache) {
	76	+	text_info <- function(label, fontkey, fontfamily, font, fontsize, cache) {
77	77		key <- paste0(label, fontkey)
78	78		info <- text_info_cache[[key]]
79	79

Compare 6d6c03e ... +5 ... 6192174

No flags found

Everything is accounted for!

What changes does Codecov check for?

Show failed CI and contexual commits c 7 Commits

Compare `6d6c03e ... +5 ... 6192174`

Show failed CI and contexual commits `c`

7 Commits