Skip to content

Pull changes from main #68

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

Merged
rcalinjageman merged 8 commits into from
Dec 19, 2024
Merged

Pull changes from main #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
91494cb
Merge pull request #60 from rcalinjageman/development
rcalinjageman Sep 12, 2024
c66f363
Merge pull request #62 from rcalinjageman/development
rcalinjageman Sep 23, 2024
fc2fa7e
Merge pull request #63 from rcalinjageman/development
rcalinjageman Sep 24, 2024
e95b974
Merge pull request #64 from rcalinjageman/development
rcalinjageman Sep 24, 2024
7247754
replace ggh4x
teunbrand Nov 16, 2024
7b909f6
simplify
teunbrand Dec 14, 2024
35583b0
Merge pull request #66 from teunbrand/replace_ggh4x_legendry
rcalinjageman Dec 19, 2024
3bccc39
Merge pull request #67 from rcalinjageman/development
rcalinjageman Dec 19, 2024
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
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ Imports:
metafor,
ggplot2,
ggdist,
ggh4x,
ggtext,
ggbeeswarm,
glue,
Rdpack,
stringr,
mathjaxr
mathjaxr,
legendry (>= 0.2)
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
RdMacros: Rdpack, mathjaxr
Expand Down
3 changes: 1 addition & 2 deletions R/jamovimdiff2x2.b.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,7 @@ jamovimdiff2x2Class <- if (requireNamespace('jmvcore', quietly=TRUE)) R6::R6Clas


myplot$scales$scales[[2]]$labels <- mylabs
myplot <- myplot + ggplot2::guides(x = ggh4x::guide_axis_nested(delim = " - "))

myplot <- myplot + guides(x = legendry::guide_axis_nested(key = " - "))

print(myplot)
TRUE
Expand Down
8 changes: 5 additions & 3 deletions R/plot_meta.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,9 +588,11 @@ esci_plot_difference_axis_x <- function(

# Just plot a truncated axis
myplot <- myplot + ggplot2::guides(
x.sec = ggh4x::guide_axis_truncated(
trunc_lower = new_lower + reference_value,
trunc_upper = new_upper + reference_value
x.sec = legendry::guide_axis_base(
cap = as.vector(rbind(
new_lower + reference_value,
new_upper + reference_value
))
)
)

Expand Down