Skip to content

Commit 9332557

Browse files
committed
update function for grouping variable display names by class to use nested named lists (fixes error with duplicate names)
1 parent 198a0be commit 9332557

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

functions/utils.R

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ get_friendly_numeric_columns <- function(){
9797
discard(~is.na(.))
9898
}
9999

100-
get_friendly_numeric_columns_by_group <- function(){
101-
panimmune_data$feature_df %>%
102-
rename("Class" = `Variable Class`) %>%
103-
select(Class, FriendlyLabel) %>%
104-
filter(FriendlyLabel %in% get_friendly_numeric_columns()) %>%
105-
mutate(Class = ifelse(is.na(Class), "Other", Class)) %>%
106-
split(.$Class) %>%
107-
map(function(df) df$FriendlyLabel)
100+
get_friendly_numeric_columns_by_group <- function() {
101+
panimmune_data$feature_df %>%
102+
select(Class = `Variable Class`, FriendlyLabel, FeatureMatrixLabelTSV) %>%
103+
filter(FriendlyLabel %in% get_friendly_numeric_columns()) %>%
104+
mutate(Class = ifelse(is.na(Class), "Other", Class)) %>%
105+
nest(-Class) %>%
106+
mutate(data = map(data, deframe)) %>%
107+
deframe()
108108
}
109109

110110
get_numeric_columns <- function(){

modules/immunefeaturesmodule.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ immunefeatures <- function(input, output, session, ss_choice, subset_df) {
107107
output$violinPlot <- renderPlotly({
108108

109109
display_x <- ss_choice()
110-
display_y <- input$violin_y
111110
internal_x <- get_variable_internal_name(display_x)
112-
internal_y <- get_variable_internal_name(display_y)
111+
internal_y <- input$violin_y
112+
display_y <- get_variable_display_name(internal_y)
113113

114114
plot_df <- subset_df() %>%
115115
select_(.dots = c(internal_x, internal_y)) %>%

0 commit comments

Comments
 (0)