From 8c7fafe51c6e8e73a7a1b3865362249fe3aee61e Mon Sep 17 00:00:00 2001 From: Andreas Gammelgaard Damsbo Date: Tue, 2 Dec 2025 13:59:05 +0100 Subject: [PATCH] updated for new version --- CITATION.cff | 36 +++++++++++++++++++++++++++++++++++- DESCRIPTION | 2 +- NAMESPACE | 2 ++ NEWS.md | 8 ++++++++ R/app_version.R | 2 +- R/cut-variable-ext.R | 6 +++++- R/hosted_version.R | 2 +- R/sysdata.rda | Bin 2695 -> 2685 bytes SESSION.md | 34 ++++++++++++++++------------------ 9 files changed, 69 insertions(+), 23 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index fcab7f68..41ce08b6 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "FreesearchR" in publications use:' type: software license: AGPL-3.0-or-later title: 'FreesearchR: Easy data analysis for clinicians' -version: 25.11.1 +version: 25.12.1 doi: 10.5281/zenodo.14527429 identifiers: - type: url @@ -1063,6 +1063,40 @@ references: orcid: https://orcid.org/0000-0002-7559-1154 year: '2025' doi: 10.32614/CRAN.package.stRoke +- type: software + title: data.table + abstract: 'data.table: Extension of `data.frame`' + notes: Imports + url: https://r-datatable.com + repository: https://CRAN.R-project.org/package=data.table + authors: + - family-names: Barrett + given-names: Tyson + email: t.barrett88@gmail.com + orcid: https://orcid.org/0000-0002-2137-1391 + - family-names: Dowle + given-names: Matt + email: mattjdowle@gmail.com + - family-names: Srinivasan + given-names: Arun + email: asrini@pm.me + - family-names: Gorecki + given-names: Jan + - family-names: Chirico + given-names: Michael + orcid: https://orcid.org/0000-0003-0787-087X + - family-names: Hocking + given-names: Toby + orcid: https://orcid.org/0000-0002-3146-0865 + - family-names: Schwendinger + given-names: Benjamin + orcid: https://orcid.org/0000-0003-3315-8114 + - family-names: Krylov + given-names: Ivan + email: ikrylov@disroot.org + orcid: https://orcid.org/0000-0002-0172-3812 + year: '2025' + doi: 10.32614/CRAN.package.data.table - type: software title: styler abstract: 'styler: Non-Invasive Pretty Printing of R Code' diff --git a/DESCRIPTION b/DESCRIPTION index 7301de4b..035421e6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: FreesearchR Title: Easy data analysis for clinicians -Version: 25.11.2 +Version: 25.12.1 Authors@R: c( person("Andreas Gammelgaard", "Damsbo",email="agdamsbo@clin.au.dk", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7559-1154")), diff --git a/NAMESPACE b/NAMESPACE index 127b112c..1365c2d0 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -51,6 +51,7 @@ export(default_parsing) export(detect_delimiter) export(drop_empty_event) export(expression_string) +export(factor_new_levels_labels) export(factorize) export(file_export) export(format_writer) @@ -148,6 +149,7 @@ export(symmetrical_scale_x_log10) export(tbl_merge) export(type_icons) export(ui_elements) +export(unique_names) export(unique_short) export(update_factor_server) export(update_factor_ui) diff --git a/NEWS.md b/NEWS.md index 6a4a4600..9e59a927 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +# FreesearchR 25.12.1 + +*NEW* Option to edit factor label names in the "New factor" pop-up. This allows for easier naming for tables, but also to combine levels. A new variable is appended to the dataset if label names are changed. Code is now also exported. + +*FIX* Fixes a bug, where white space in code exported was removed. Now a little too many spaces are included. Fine tuning continues. + +*NEW* Easily copy code by just clicking "copy" in code blocks. + # FreesearchR 25.11.2 *NEW* Vignettes were moved to the [FreesearchR project knowledge base](https://freesearchr.github.io/FreesearchR-knowledge/). This was mainly to ease rendering and allow quick and easy updates as well as future translations. diff --git a/R/app_version.R b/R/app_version.R index 54c6cdf0..c86ba1bf 100644 --- a/R/app_version.R +++ b/R/app_version.R @@ -1 +1 @@ -app_version <- function()'25.11.2' +app_version <- function()'25.12.1' diff --git a/R/cut-variable-ext.R b/R/cut-variable-ext.R index c1879b7c..cb27543c 100644 --- a/R/cut-variable-ext.R +++ b/R/cut-variable-ext.R @@ -374,7 +374,11 @@ cut_variable_server <- function(id, data_r = reactive(NULL)) { } ) - data <- append_column(data, column = new_variable, name = paste0(variable, "_cut"), index = "right") + data <- append_column(data, + column = new_variable, + name = unique_names(paste0(variable, "_cut"), + existing = names(data)), + index = "right") code <- rlang::call2( "append_column", diff --git a/R/hosted_version.R b/R/hosted_version.R index b477b7ff..920e146f 100644 --- a/R/hosted_version.R +++ b/R/hosted_version.R @@ -1 +1 @@ -hosted_version <- function()'v25.11.2-251119' +hosted_version <- function()'v25.12.1-251202' diff --git a/R/sysdata.rda b/R/sysdata.rda index d644c1986565e8c198017c66c6b9511a2ec9b3da..d526373777ba70aaa9d861488b1b6d8e0a62ffc1 100644 GIT binary patch literal 2685 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 B;WhvO diff --git a/SESSION.md b/SESSION.md index 80527531..41b64837 100644 --- a/SESSION.md +++ b/SESSION.md @@ -1,21 +1,21 @@ -------------------------------------------------------------------------------- -------------------------------- R environment --------------------------------- -------------------------------------------------------------------------------- -|setting |value | -|:-----------|:------------------------------------------| -|version |R version 4.4.1 (2024-06-14) | -|os |macOS 15.7.1 | -|system |aarch64, darwin20 | -|ui |RStudio | -|language |(EN) | -|collate |en_US.UTF-8 | -|ctype |en_US.UTF-8 | -|tz |Europe/Copenhagen | -|date |2025-11-09 | -|rstudio |2025.05.0+496 Mariposa Orchid (desktop) | -|pandoc |3.6.4 @ /opt/homebrew/bin/ (via rmarkdown) | -|quarto |1.7.30 @ /usr/local/bin/quarto | -|FreesearchR |25.11.1.251109 | +|setting |value | +|:-----------|:----------------------------------------------| +|version |R version 4.4.1 (2024-06-14) | +|os |macOS 26.1 | +|system |aarch64, darwin20 | +|ui |RStudio | +|language |(EN) | +|collate |en_US.UTF-8 | +|ctype |en_US.UTF-8 | +|tz |Europe/Copenhagen | +|date |2025-12-02 | +|rstudio |2025.09.2+418 Cucumberleaf Sunflower (desktop) | +|pandoc |3.6.4 @ /opt/homebrew/bin/ (via rmarkdown) | +|quarto |1.7.30 @ /usr/local/bin/quarto | +|FreesearchR |25.12.1.251202 | -------------------------------------------------------------------------------- @@ -83,7 +83,7 @@ |foreach |1.5.2 |2022-02-02 |CRAN (R 4.4.0) | |foreign |0.8-90 |2025-03-31 |CRAN (R 4.4.1) | |Formula |1.2-5 |2023-02-24 |CRAN (R 4.4.1) | -|FreesearchR |25.11.1 |NA |NA | +|FreesearchR |25.12.1 |NA |NA | |fs |1.6.6 |2025-04-12 |CRAN (R 4.4.1) | |gdtools |0.4.2 |2025-03-27 |CRAN (R 4.4.1) | |generics |0.1.4 |2025-05-09 |CRAN (R 4.4.1) | @@ -117,11 +117,9 @@ |later |1.4.2 |2025-04-08 |RSPM (R 4.4.0) | |lattice |0.22-7 |2025-04-02 |CRAN (R 4.4.1) | |lifecycle |1.0.4 |2023-11-07 |CRAN (R 4.4.1) | -|litedown |0.7 |2025-04-08 |CRAN (R 4.4.1) | |lme4 |1.1-37 |2025-03-26 |CRAN (R 4.4.1) | |lubridate |1.9.4 |2024-12-08 |CRAN (R 4.4.1) | |magrittr |2.0.3 |2022-03-30 |RSPM (R 4.4.0) | -|markdown |2.0 |2025-03-23 |CRAN (R 4.4.1) | |MASS |7.3-65 |2025-02-28 |CRAN (R 4.4.1) | |Matrix |1.7-3 |2025-03-11 |RSPM (R 4.4.0) | |memoise |2.0.1 |2021-11-26 |CRAN (R 4.4.0) |