diff --git a/DESCRIPTION b/DESCRIPTION index afd134a..bd939d2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ABCindex Title: A Shiny app to calculate ABCI for checkerboard assays -Version: 0.99.802 +Version: 0.99.805 Authors@R: person(given = "Travis", family = "Blimkie", diff --git a/NEWS.md b/NEWS.md index 5c0b993..c43538a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +# ABCindex v0.99.805 + +## Changes + +* Edited screenshot images in help pages +* Concentrations now show in proper numeric order, when replicates don't share all concentrations + + # ABCindex v0.99.802 ## Changes diff --git a/R/2_upload.R b/R/2_upload.R index 892dff9..a4166cb 100644 --- a/R/2_upload.R +++ b/R/2_upload.R @@ -683,20 +683,16 @@ plate_reader_single <- function(file, sheet, ext) { ) %>% mutate(rows = x[3, 1], cols = x[1, 3], .before = 1) - levels_rows <- sort(unique(as.numeric(df4$rows_conc))) - levels_cols <- sort(unique(as.numeric(df4$cols_conc))) - df4 %>% - mutate( - well = wells, - rows_conc = factor(rows_conc, levels = levels_rows), - cols_conc = factor(cols_conc, levels = levels_cols), - bio = as.numeric(bio) - ) %>% + mutate(well = wells, bio = as.numeric(bio)) %>% select(well, starts_with("cols"), starts_with("rows"), bio) }) %>% purrr::set_names(~paste0(sheet, "_p", seq(length(.x)))) %>% - bind_rows(.id = "replicate") + bind_rows(.id = "replicate") %>% + mutate( + cols_conc = forcats::fct_inseq(cols_conc), + rows_conc = forcats::fct_inseq(rows_conc) + ) return(d5) } diff --git a/R/3_results.R b/R/3_results.R index 54df3a8..37a42ff 100644 --- a/R/3_results.R +++ b/R/3_results.R @@ -2006,10 +2006,12 @@ writer_xlsx <- function(x, filename) { df_clean <- df %>% select(cols_conc, rows_conc, abci_avg) %>% distinct(cols_conc, rows_conc, .keep_all = TRUE) %>% - tidyr::pivot_wider( - names_from = "cols_conc", - values_from = "abci_avg" + mutate( + cols_conc = as.numeric(as.character(cols_conc)), + rows_conc = as.numeric(as.character(rows_conc)) ) %>% + arrange(cols_conc, rows_conc) %>% + tidyr::pivot_wider(names_from = "cols_conc", values_from = "abci_avg") %>% tibble::column_to_rownames("rows_conc") addWorksheet(wb, nm) diff --git a/www/help/input_preview.png b/www/help/input_preview.png index 56f0326..33f032c 100644 Binary files a/www/help/input_preview.png and b/www/help/input_preview.png differ diff --git a/www/help/input_template.png b/www/help/input_template.png index 3e69a2d..6a77cff 100644 Binary files a/www/help/input_template.png and b/www/help/input_template.png differ diff --git a/www/help/originals/input_preview.png b/www/help/originals/input_preview.png new file mode 100644 index 0000000..56f0326 Binary files /dev/null and b/www/help/originals/input_preview.png differ diff --git a/www/help/originals/input_template.png b/www/help/originals/input_template.png new file mode 100644 index 0000000..3e69a2d Binary files /dev/null and b/www/help/originals/input_template.png differ diff --git a/www/help/originals/plot_examples.png b/www/help/originals/plot_examples.png new file mode 100644 index 0000000..1a3d053 Binary files /dev/null and b/www/help/originals/plot_examples.png differ diff --git a/www/help/plot_examples.png b/www/help/plot_examples.png index 1a3d053..f9bcfec 100644 Binary files a/www/help/plot_examples.png and b/www/help/plot_examples.png differ