From edceb811e6e3fc61443ea1754de43f79a0124961 Mon Sep 17 00:00:00 2001
From: baj12 <bernd.jagla@pasteur.fr>
Date: Fri, 1 Nov 2019 18:37:59 +0100
Subject: [PATCH] tagged version
---
DESCRIPTION | 2 +-
inst/app/moduleServer.R | 2 +-
inst/app/reactives.R | 11 ++---------
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index a33a5b5..b63778a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: SCHNAPPs
Type: Package
Title: Single Cell Shiny Application for Analysing Single Cell Transcriptomics Data
-Version: 1.1.22
+Version: 1.1.23
Authors@R: c(person("Bernd", "Jagla", role = c("aut", "cre"), email = "bernd.jagla@pasteur.fr", comment = c(ORCID = "0000-0002-7696-0484")))
Maintainer: Bernd Jagla <bernd.jagla@pasteur.fr>
Description: Single Cell sHiny APPlication (SCHNAPPs) is a R/Shiny based application to interact, manipulate, explore, and analyze single cell RNA-seq experiments, including MARS-seq and others.
diff --git a/inst/app/moduleServer.R b/inst/app/moduleServer.R
index 273616f..53c2a92 100644
--- a/inst/app/moduleServer.R
+++ b/inst/app/moduleServer.R
@@ -797,7 +797,7 @@ tableSelectionServer <- function(input, output, session,
}
ns <- session$ns
-
+ nsStr = ns("-")
dataTables <- dataTab()
selectedRows <- input$cellNameTable_rows_selected
scEx <- scEx()
diff --git a/inst/app/reactives.R b/inst/app/reactives.R
index ad144e2..17bc006 100644
--- a/inst/app/reactives.R
+++ b/inst/app/reactives.R
@@ -1025,11 +1025,7 @@ gsRMGenesTable <- reactive({
)
}
# load("~/SCHNAPPsDebug/removedGenesTable.RData")
-<<<<<<< HEAD
-
-=======
-
->>>>>>> GUI2
+
scEx <- assays(dataTables$scEx)[[1]]
fd <- rowData(dataTables$scEx)
dt <- fd[useGenes, ]
@@ -1043,10 +1039,7 @@ gsRMGenesTable <- reactive({
firstCol <- firstCol <- c(firstCol, which(colnames(dt) %in% c("rowSums", "rowSamples")))
colOrder <- c(firstCol, (1:ncol(dt))[-firstCol])
dt <- dt[, colOrder]
-<<<<<<< HEAD
-
-=======
->>>>>>> GUI2
+
# dt <- dt[dt$rowSums < minGenes, ]
exportTestValues(removedGenesTable = {
as.data.frame(dt)
--
GitLab