Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

silence warnings in create_dxfs_style() #721

Merged
merged 1 commit into from
Aug 6, 2023
Merged

silence warnings in create_dxfs_style() #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions R/standardize.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,12 @@ standardize_case_names <- function(..., return = FALSE, arguments = NULL) {
#' @param ... ...
#' @returns void. assigns an object in the parent frame
#' @noRd
standardize <- function(...) {
standardize <- function(..., arguments) {

nms <- list(...)
arguments <- ls(envir = parent.frame())
if (missing(arguments)) {
arguments <- ls(envir = parent.frame())
}

rtns <- standardize_color_names(nms, return = TRUE)
rtns <- standardize_case_names(rtns, return = TRUE, arguments = arguments)
Expand Down
27 changes: 14 additions & 13 deletions R/wb_styles.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,10 +722,11 @@ create_dxfs_style <- function(
...
) {

standardize(...)

args <- list(...)
nams <- names(args)
arguments <- c(..., ls(),
"left_color", "left_style", "right_color", "right_style",
"top_color", "top_style", "bottom_color", "bottom_style"
)
standardize(..., arguments = arguments)

if (is.null(font_color)) font_color <- ""
if (is.null(font_size)) font_size <- ""
Expand All @@ -746,7 +747,7 @@ create_dxfs_style <- function(
)

if (exists("pattern_type")) {
pattern_type <- args$patternType
pattern_type <- pattern_type
} else {
pattern_type <- "solid"
}
Expand All @@ -765,14 +766,14 @@ create_dxfs_style <- function(

# untested
if (!is.null(border)) {
left_color <- if ("left_color" %in% nams) args$left_color else border_color
left_style <- if ("left_style" %in% nams) args$left_style else border_style
right_color <- if ("right_color" %in% nams) args$right_color else border_color
right_style <- if ("right_style" %in% nams) args$right_style else border_style
top_color <- if ("top_color" %in% nams) args$top_color else border_color
top_style <- if ("top_style" %in% nams) args$top_style else border_style
bottom_color <- if ("bottom_color" %in% nams) args$bottom_color else border_color
bottom_style <- if ("bottom_style" %in% nams) args$bottom_style else border_style
left_color <- if (exists("left_color")) left_color else border_color
left_style <- if (exists("left_style")) left_style else border_style
right_color <- if (exists("right_color")) right_color else border_color
right_style <- if (exists("right_style")) right_style else border_style
top_color <- if (exists("top_color")) top_color else border_color
top_style <- if (exists("top_style")) top_style else border_style
bottom_color <- if (exists("bottom_color")) bottom_color else border_color
bottom_style <- if (exists("bottom_style")) bottom_style else border_style

border <- create_border(
left = left_style,
Expand Down