Skip to content

To Arial #70

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

Open
beansrowning wants to merge 2 commits into
base: master
Choose a base branch
from
Open

To Arial #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42eafbb
Switching all to Arial
beansrowning Jun 27, 2022
fbca307
Merge branch 'master' into to-arial
beansrowning Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions R/viz_maps.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ map_template <- function(df, category_color_labels = "None", category_color_valu
na.translate = T
) +
ggplot2::theme(
plot.title = ggplot2::element_text(size = 15, face = "bold", family = "Calibri"),
plot.subtitle = ggplot2::element_text(size = 8, family = "Calibri", margin = margin(0, 0, 5, 0)),
plot.caption = ggplot2::element_text(size = 6, family = "Calibri", hjust = 0, vjust = 2),
plot.title = ggplot2::element_text(size = 15, face = "bold", family = "Arial"),
plot.subtitle = ggplot2::element_text(size = 8, family = "Arial", margin = margin(0, 0, 5, 0)),
plot.caption = ggplot2::element_text(size = 6, family = "Arial", hjust = 0, vjust = 2),
plot.caption.position = "plot",
legend.position = c(0.01, 0),
legend.justification = c("left", "bottom"),
legend.box.just = "left",
legend.key.size = unit(0.5, "cm"),
legend.margin = ggplot2::margin(2, 2, 2, 2),
legend.title = ggplot2::element_text(size = 8, family = "Calibri"),
legend.text = ggplot2::element_text(size = 6, family = "Calibri"),
legend.title = ggplot2::element_text(size = 8, family = "Arial"),
legend.text = ggplot2::element_text(size = 6, family = "Arial"),
legend.background = element_rect(fill = scales::alpha("white", 0.5), colour = "white")
)
} else {
Expand All @@ -76,17 +76,17 @@ map_template <- function(df, category_color_labels = "None", category_color_valu
na.translate = T
) +
ggplot2::theme(
plot.title = ggplot2::element_text(size = 15, face = "bold", family = "Calibri"),
plot.subtitle = ggplot2::element_text(size = 8, family = "Calibri", margin = margin(0, 0, 5, 0)),
plot.caption = ggplot2::element_text(size = 6, family = "Calibri", hjust = 0, vjust = 2),
plot.title = ggplot2::element_text(size = 15, face = "bold", family = "Arial"),
plot.subtitle = ggplot2::element_text(size = 8, family = "Arial", margin = margin(0, 0, 5, 0)),
plot.caption = ggplot2::element_text(size = 6, family = "Arial", hjust = 0, vjust = 2),
plot.caption.position = "plot",
legend.position = c(0.01, 0),
legend.justification = c("left", "bottom"),
legend.box.just = "left",
legend.key.size = unit(0.5, "cm"),
legend.margin = ggplot2::margin(2, 2, 2, 2),
legend.title = ggplot2::element_text(size = 8, family = "Calibri"),
legend.text = ggplot2::element_text(size = 6, family = "Calibri"),
legend.title = ggplot2::element_text(size = 8, family = "Arial"),
legend.text = ggplot2::element_text(size = 6, family = "Arial"),
legend.background = element_rect(fill = scales::alpha("white", 0.5), colour = "white")
)
}
Expand Down
84 changes: 42 additions & 42 deletions R/viz_plots.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ plot_epicurve <- function(df, type = "cases", by_cat = "WHO Region", legend = "i
) +
ggplot2::theme_classic() +
ggplot2::theme(
plot.title = ggplot2::element_text(size = 17, face = "bold", family = "Calibri"),
plot.title = ggplot2::element_text(size = 17, face = "bold", family = "Arial"),
plot.margin = unit(c(5.5, 11, 5.5, 5.5), "points"),
axis.text.x = ggplot2::element_text(size = 9, family = "Calibri", angle = 45, hjust = 1),
axis.text.y = ggplot2::element_text(size = 10, family = "Calibri"),
axis.title = ggplot2::element_text(size = 12, family = "Calibri"),
legend.title = ggplot2::element_text(size = 12, face = "bold", family = "Calibri"),
legend.text = ggplot2::element_text(size = 9, family = "Calibri"),
axis.text.x = ggplot2::element_text(size = 9, family = "Arial", angle = 45, hjust = 1),
axis.text.y = ggplot2::element_text(size = 10, family = "Arial"),
axis.title = ggplot2::element_text(size = 12, family = "Arial"),
legend.title = ggplot2::element_text(size = 12, face = "bold", family = "Arial"),
legend.text = ggplot2::element_text(size = 9, family = "Arial"),
legend.key.size = unit(0.5, "cm")
) +
ggplot2::guides(fill = ggplot2::guide_legend(overide.aex = list(size = 9)))
Expand Down Expand Up @@ -201,11 +201,11 @@ plot_epicurve_ind <- function(df, type = "cases", incidence = T) {
subtitle = paste0(format(min(df$date, na.rm = T), "%B %d, %Y"), " - ", format(max(df$date, na.rm = T), "%B %d, %Y"))
) +
ggplot2::theme(
plot.title = ggplot2::element_text(size = 14, face = "bold", family = "Calibri"),
axis.text = ggplot2::element_text(size = 10, family = "Calibri"),
axis.title = ggplot2::element_text(size = 12, family = "Calibri"),
legend.title = ggplot2::element_text(size = 12, face = "bold", family = "Calibri"),
legend.text = ggplot2::element_text(size = 9, family = "Calibri")
plot.title = ggplot2::element_text(size = 14, face = "bold", family = "Arial"),
axis.text = ggplot2::element_text(size = 10, family = "Arial"),
axis.title = ggplot2::element_text(size = 12, family = "Arial"),
legend.title = ggplot2::element_text(size = 12, face = "bold", family = "Arial"),
legend.text = ggplot2::element_text(size = 9, family = "Arial")
)
} else {
df %>%
Expand Down Expand Up @@ -251,11 +251,11 @@ plot_epicurve_ind <- function(df, type = "cases", incidence = T) {
subtitle = paste0(format(min(df$date, na.rm = T), "%B %d, %Y"), " - ", format(max(df$date, na.rm = T), "%B %d, %Y"))
) +
ggplot2::theme(
plot.title = ggplot2::element_text(size = 14, face = "bold", family = "Calibri"),
axis.text = ggplot2::element_text(size = 8, family = "Calibri"),
axis.title = ggplot2::element_text(size = 10, family = "Calibri"),
legend.title = ggplot2::element_text(size = 12, face = "bold", family = "Calibri"),
legend.text = ggplot2::element_text(size = 9, family = "Calibri")
plot.title = ggplot2::element_text(size = 14, face = "bold", family = "Arial"),
axis.text = ggplot2::element_text(size = 8, family = "Arial"),
axis.title = ggplot2::element_text(size = 10, family = "Arial"),
legend.title = ggplot2::element_text(size = 12, face = "bold", family = "Arial"),
legend.text = ggplot2::element_text(size = 9, family = "Arial")
)
}
}
Expand Down Expand Up @@ -309,13 +309,13 @@ plot_epicurve_epidouble <- function(df) {
subtitle = paste0("Week of:", format(min(df$weekdate, na.rm = T), "%B %d, %Y"), " - ", format(max(df$weekdate, na.rm = T), "%B %d, %Y"))
) +
ggplot2::theme(
plot.title = ggplot2::element_text(size = 16, face = "bold", family = "Calibri"),
axis.text = ggplot2::element_text(size = 14, family = "Calibri"),
axis.title = ggplot2::element_text(size = 14, family = "Calibri"),
plot.title = ggplot2::element_text(size = 16, face = "bold", family = "Arial"),
axis.text = ggplot2::element_text(size = 14, family = "Arial"),
axis.title = ggplot2::element_text(size = 14, family = "Arial"),
legend.position = "top",
legend.key = element_blank(),
legend.title = ggplot2::element_blank(),
legend.text = ggplot2::element_text(size = 12, family = "Calibri")
legend.text = ggplot2::element_text(size = 12, family = "Arial")
) +
ggplot2::guides(color = ggplot2::guide_legend(override.aes = list(fill = c("lightblue", NA))))
}
Expand Down Expand Up @@ -365,13 +365,13 @@ plot_epicurve_dailydouble <- function(df) {
subtitle = paste0("Week of:", format(min(df$weekdate, na.rm = T), "%B %d, %Y"), " - ", format(max(df$weekdate, na.rm = T), "%B %d, %Y"))
) +
ggplot2::theme(
plot.title = ggplot2::element_text(size = 16, face = "bold", family = "Calibri"),
axis.text = ggplot2::element_text(size = 14, family = "Calibri"),
axis.title = ggplot2::element_text(size = 14, family = "Calibri"),
plot.title = ggplot2::element_text(size = 16, face = "bold", family = "Arial"),
axis.text = ggplot2::element_text(size = 14, family = "Arial"),
axis.title = ggplot2::element_text(size = 14, family = "Arial"),
legend.position = "top",
legend.key = element_blank(),
legend.title = ggplot2::element_blank(),
legend.text = ggplot2::element_text(size = 12, family = "Calibri")
legend.text = ggplot2::element_text(size = 12, family = "Arial")
) +
ggplot2::guides(color = ggplot2::guide_legend(override.aes = list(fill = c("lightblue", NA))))
}
Expand Down Expand Up @@ -430,14 +430,14 @@ plot_riskmatrix <- function(df, region = "WHO Region", v = T, h = T) {
ggplot2::annotate(geom = "text", x = -133, y = 25.7, label = "25.0+ per 100k", color = "red3", size = 3) +
ggplot2::theme_classic() +
ggplot2::theme(
axis.text = element_text(size = 8, family = "Calibri"),
axis.title = element_text(size = 10, family = "Calibri"),
legend.text = element_text(size = 7, family = "Calibri"),
legend.title = element_text(size = 9, family = "Calibri"),
plot.title = element_text(size = 16, face = "bold", family = "Calibri"),
plot.subtitle = element_text(size = 11, family = "Calibri"),
axis.text = element_text(size = 8, family = "Arial"),
axis.title = element_text(size = 10, family = "Arial"),
legend.text = element_text(size = 7, family = "Arial"),
legend.title = element_text(size = 9, family = "Arial"),
plot.title = element_text(size = 16, face = "bold", family = "Arial"),
plot.subtitle = element_text(size = 11, family = "Arial"),
plot.margin = unit(c(0.5, 0.5, 0.5, 0.5), "cm"),
plot.caption = element_text(hjust = 0, size = 11, family = "Calibri")
plot.caption = element_text(hjust = 0, size = 11, family = "Arial")
) +
ggplot2::labs(
title = "Burden and Recent Trends",
Expand Down Expand Up @@ -712,12 +712,12 @@ plot_vaxcoverage <- function(
title = ptitle,
subtitle = psubtitle,
caption = cap,
legend.title = element_text(size = 10, face = "bold", family = "Calibri")
legend.title = element_text(size = 10, face = "bold", family = "Arial")
) +
ggplot2::theme(
plot.title = element_text(size = 14, face = "bold", family = "Calibri"),
axis.title = element_text(size = 12, family = "Calibri"),
plot.caption = element_text(hjust = 0, size = 12, family = "Calibri")
plot.title = element_text(size = 14, face = "bold", family = "Arial"),
axis.title = element_text(size = 12, family = "Arial"),
plot.caption = element_text(hjust = 0, size = 12, family = "Arial")
)

return(plot_out)
Expand Down Expand Up @@ -833,14 +833,14 @@ plot_vaxcurve <- function(df, type = "partial", by_cat = "Dept. of State Region"
) +
ggplot2::theme_classic() +
ggplot2::theme(
plot.title = element_text(size = 15, family = "Calibri", face = "bold"),
plot.subtitle = element_text(size = 14, family = "Calibri", face = "bold", margin = margin(0, 0, 10, 0)),
plot.title = element_text(size = 15, family = "Arial", face = "bold"),
plot.subtitle = element_text(size = 14, family = "Arial", face = "bold", margin = margin(0, 0, 10, 0)),
plot.margin = unit(c(0.5, 0.5, 0.5, 0.5), "cm"),
axis.title.x = element_text(size = 12, family = "Calibri", margin = margin(10, 0, 0, 0)),
axis.title.y = element_text(size = 12, family = "Calibri", margin = margin(0, 10, 0, 0)),
axis.text = element_text(size = 10, family = "Calibri"),
legend.title = element_text(size = 12, family = "Calibri", face = "bold"),
legend.text = element_text(size = 8, family = "Calibri"),
axis.title.x = element_text(size = 12, family = "Arial", margin = margin(10, 0, 0, 0)),
axis.title.y = element_text(size = 12, family = "Arial", margin = margin(0, 10, 0, 0)),
axis.text = element_text(size = 10, family = "Arial"),
legend.title = element_text(size = 12, family = "Arial", face = "bold"),
legend.text = element_text(size = 8, family = "Arial"),
legend.position = c(0.15, 0.75)
)

Expand Down
2 changes: 1 addition & 1 deletion R/viz_tables.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ table_countriesofconcern <- function(df, df_vax_man, country_list, df_variant_pc


flextable::flextable(out) %>%
flextable::font(fontname = "Calibri", part = "all") %>%
flextable::font(fontname = "Arial", part = "all") %>%
flextable::fontsize(size = 9, part = "all") %>%
flextable::color(color = "white", part = "header") %>%
flextable::bold(bold = TRUE, part = "header") %>%
Expand Down