diff --git a/R/shiny-ui-base.R b/R/shiny-ui-base.R index 995a9b24a4112e05468422c0b41b2a2654979964..22b18a98fd38a550ff9b74940fe57344d7c03589 100644 --- a/R/shiny-ui-base.R +++ b/R/shiny-ui-base.R @@ -102,26 +102,6 @@ list2rev <- function(lst) { lst else do.call(react_v,lapply(lst,list2rev)) } -add_mzML_files<-function(df,paths) { - lSet<-levels(df$set) - if (length(lSet > 0) && !is.na(lSet)) { - - nR<-length(paths) - if (nR > 0) { - st <- nrow(df)+1 - fi <- nrow(df)+nR - df[st:fi,'tag'] <- levels(df$tag)[[1]] - df[st:fi,'set'] <- levels(df$set)[[1]] - df[st:fi,'mode'] <- levels(df$mode)[[1]] - df[st:fi,'Files'] <- paths - } - } else { - warning("Define sets using the compound set table before trying to add files!") - - } - df -} - new_rv_state <- function(project) { p <- normalizePath(path=project,winslash = '/') x <- react_v(m=list2rev(new_state(list(project=p,data=""),GUI=T))) diff --git a/R/shiny-ui-config.R b/R/shiny-ui-config.R index ed68f30a1414f547b1b28a8bff00eddbefaf5d4b..3adff84107b1edd75e8e988d86a6b971877cc260 100644 --- a/R/shiny-ui-config.R +++ b/R/shiny-ui-config.R @@ -309,4 +309,22 @@ combine_tags <- function(df_tags,txt_tags) { df_tags <- factor(as.character(df_tags)) df_tags <- factor(as.character(df_tags),levels = unique(c(TAG_DEF,levels(df_tags),txt_tags))) df_tags +add_mzML_files<-function(df,paths) { + lSet<-levels(df$set) + if (length(lSet > 0) && !is.na(lSet)) { + + nR<-length(paths) + if (nR > 0) { + st <- nrow(df)+1 + fi <- nrow(df)+nR + df[st:fi,'tag'] <- levels(df$tag)[[1]] + df[st:fi,'set'] <- levels(df$set)[[1]] + df[st:fi,'mode'] <- levels(df$mode)[[1]] + df[st:fi,'Files'] <- paths + } + } else { + warning("Define sets using the compound set table before trying to add files!") + + } + df }