From c47abcabf23585ad5d21c1a9fba299434dc859c4 Mon Sep 17 00:00:00 2001 From: pfgherardini Date: Mon, 27 Aug 2018 14:48:46 -0700 Subject: [PATCH] closes #19 --- DESCRIPTION | 2 +- inst/normalizer_shinyGUI/server.R | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7e76908..6d860d4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: premessa Type: Package Title: R package for pre-processing of flow and mass cytometry data -Version: 0.2.2 +Version: 0.2.3 Author: "Pier Federico Gherardini [aut, cre]" Description: This package includes panel editing/renaming for FCS files, bead-based normalization and debarcoding. Imports: shiny (>= 0.14), flowCore, reshape, ggplot2, hexbin, gridExtra, rhandsontable, jsonlite diff --git a/inst/normalizer_shinyGUI/server.R b/inst/normalizer_shinyGUI/server.R index ffb9a22..9bebfee 100644 --- a/inst/normalizer_shinyGUI/server.R +++ b/inst/normalizer_shinyGUI/server.R @@ -105,7 +105,7 @@ shinyServer(function(input, output, session) { title = "Normalizer report", "Bead removal started, please wait..." )) - remove_beads_from_file(file.path(normed.dir, input$beadremovalui_selected_fcs), + premessa::remove_beads_from_file(file.path(normed.dir, input$beadremovalui_selected_fcs), input$beadremovalui_cutoff, beads.removed.dir) showModal(modalDialog( title = "Normalizer report", @@ -125,7 +125,7 @@ shinyServer(function(input, output, session) { )) files.list <- lapply(files.list, function(f.name) { fcs <- flowCore::read.FCS(file.path(normed.dir, f.name)) - remove_beads_from_file(file.path(normed.dir, f.name), input$beadremovalui_cutoff, beads.removed.dir) + premessa::remove_beads_from_file(file.path(normed.dir, f.name), input$beadremovalui_cutoff, beads.removed.dir) return(f.name) }) showModal(modalDialog(