From 63d64a935981565ca04880832a1220ee26f0f726 Mon Sep 17 00:00:00 2001 From: Samuel Wieczorek Date: Sat, 14 Dec 2024 15:55:44 +0100 Subject: [PATCH] Updagte aggregation funcs --- R/mod_download_dataset.R | 3 +-- inst/workflow/PipelinePeptide/R/PipelinePeptide_Aggregation.R | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/R/mod_download_dataset.R b/R/mod_download_dataset.R index 803b7ed..4f09d7c 100644 --- a/R/mod_download_dataset.R +++ b/R/mod_download_dataset.R @@ -65,8 +65,7 @@ download_dataset_server <- function(id, rv$export_file_xlsx <- tryCatch({ out.xlsx <- tempfile(fileext = ".xlsx") - obj.cleaned <- DaparToolshed::CleanRowData(dataIn()) - DaparToolshed::write.excel(obj = obj.cleaned, filename = out.xlsx) + DaparToolshed::write.excel(obj = dataIn(), filename = out.xlsx) out.xlsx }, diff --git a/inst/workflow/PipelinePeptide/R/PipelinePeptide_Aggregation.R b/inst/workflow/PipelinePeptide/R/PipelinePeptide_Aggregation.R index 1d51ec9..fcfda71 100644 --- a/inst/workflow/PipelinePeptide/R/PipelinePeptide_Aggregation.R +++ b/inst/workflow/PipelinePeptide/R/PipelinePeptide_Aggregation.R @@ -94,7 +94,6 @@ PipelinePeptide_Aggregation_server <- function(id, Aggregation_considerPeptides = "allPeptides", Aggregation_proteinId = "None", Aggregation_topN = 3, - Aggregation_filterProtAfterAgregation = NULL, Aggregation_addRowData = FALSE, Addmetadata_columnsForProteinDataset = NULL ) @@ -569,7 +568,6 @@ PipelinePeptide_Aggregation_server <- function(id, rv.custom$history[['Aggregation_considerPeptides']] <- as.numeric(rv.widgets$Aggregation_considerPeptides) rv.custom$history[['Aggregation_proteinId']] <- as.numeric(rv.widgets$Aggregation_proteinId) rv.custom$history[['Aggregation_topN']] <- as.numeric(rv.widgets$Aggregation_topN) - rv.custom$history[['Aggregation_filterProtAfterAgregation']] <- as.numeric(rv.widgets$Aggregation_filterProtAfterAgregation) rv.custom$history[['Aggregation_addRowData']] <- rv.widgets$Aggregation_addRowData paramshistory(rv.custom$temp.aggregate[[length(rv.custom$temp.aggregate)]]) <- rv.custom$history