Skip to content

type_mean_se #571

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
marcboschmatas wants to merge 7 commits into
base: main
Choose a base branch
from
Open

type_mean_se #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
298c249
first try for type meanse
marcbosch-ivalua Apr 23, 2026
0252c25
added errorbar, documented
marcbosch-ivalua Apr 23, 2026
f490a0f
minor bug
marcbosch-ivalua Apr 23, 2026
1027b81
fixed x axis issue & dodge
marcbosch-ivalua Apr 23, 2026
13c2dc0
update docs
marcbosch-ivalua Apr 23, 2026
96c444e
update docs change name
marcbosch-ivalua Apr 23, 2026
f741bb3
cleaning
marcbosch-ivalua Apr 23, 2026
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
2 changes: 2 additions & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export(type_jitter)
export(type_lines)
export(type_lm)
export(type_loess)
export(type_mean_se)
export(type_pointrange)
export(type_points)
export(type_polygon)
Expand Down Expand Up @@ -119,6 +120,7 @@ importFrom(stats,predict)
importFrom(stats,qnorm)
importFrom(stats,qt)
importFrom(stats,quantile)
importFrom(stats,sd)
importFrom(stats,setNames)
importFrom(stats,spline)
importFrom(stats,terms)
Expand Down
41 changes: 30 additions & 11 deletions R/align_layer.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,36 @@
align_layer = function(settings) {
# Retrieve xlabs and plot/device metadata from original layer
tinyplot_env = get(".tinyplot_env", envir = parent.env(environment()))
xlabs_orig = tryCatch(get("xlabs_orig", envir = tinyplot_env), error = function(e) NULL)
usr_orig = tryCatch(get("usr_orig", envir = tinyplot_env), error = function(e) NULL)
dev_orig = tryCatch(get("dev_orig", envir = tinyplot_env), error = function(e) NULL)

xlabs_orig = tryCatch(
get("xlabs_orig", envir = tinyplot_env),
error = function(e) NULL
)
usr_orig = tryCatch(
get("usr_orig", envir = tinyplot_env),
error = function(e) NULL
)
dev_orig = tryCatch(
get("dev_orig", envir = tinyplot_env),
error = function(e) NULL
)

# Validate that we're adding to the same plot (not a stale xlabs from previous plot)
if (is.null(usr_orig) || is.null(dev_orig) || dev_orig != dev.cur()) {
return(invisible())
}
# Normalize current usr for comparison (accounting for flipped plots)
usr_layer = if (isTRUE(settings$flip)) par("usr")[c(3,4,1,2)] else par("usr")
usr_layer = if (isTRUE(settings$flip)) {
par("usr")[c(3, 4, 1, 2)]
} else {
par("usr")
}
if (!identical(usr_orig, usr_layer)) {
return(invisible())
}

# xlabs of current layer
xlabs_layer = settings[["xlabs"]]

# Only adjust if original layer has named xlabs
if (!is.null(names(xlabs_orig))) {
if (is.factor(settings$datapoints[["x"]])) {
Expand All @@ -30,16 +43,20 @@ align_layer = function(settings) {
settings$datapoints[["x"]]
}
)
settings$datapoints = settings$datapoints[order(settings$datapoints[["x"]]), ]
settings$datapoints = settings$datapoints[
order(settings$datapoints[["x"]]),
]
} else if (!is.null(names(xlabs_layer))) {
# Case 2: match implicit integer -> label mapping (e.g., lines added to errorbars)
if (setequal(names(xlabs_layer), names(xlabs_orig))) {
# If mappings already agree and no dodge, no realignment needed
if (identical(xlabs_layer, xlabs_orig) && is.null(settings$dodge)) return(invisible())
if (identical(xlabs_layer, xlabs_orig) && is.null(settings$dodge)) {
return(invisible())
}
orig_order = xlabs_orig[names(xlabs_layer)[settings$datapoints[["x"]]]]
x_layer = settings$datapoints[["x"]]
if (is.null(settings$dodge)) {
x_new = x_layer[orig_order]
x_new = x_layer[orig_order]
} else {
names(x_layer) = names(xlabs_layer)[round(x_layer)]
x_new = x_layer + (xlabs_orig[names(round(x_layer))] - round(x_layer))
Expand All @@ -51,7 +68,9 @@ align_layer = function(settings) {
settings$datapoints[[v]] = x_new
}
}
settings$datapoints = settings$datapoints[order(settings$datapoints[["x"]]), ]
settings$datapoints = settings$datapoints[
order(settings$datapoints[["x"]]),
]
settings$datapoints[["rowid"]] = seq_len(nrow(settings$datapoints))
}
}
Expand Down
Loading