Merge pull request #740 from mingl1997/devel

Updated description and Seurat functions
compbiomed · Jan 13, 2024 · 2b43412 · 2b43412
2 parents b8bb6fe + b7f209d
commit 2b43412
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -139,6 +139,7 @@ Suggests:
     RColorBrewer,
     fastmap (>= 1.1.0),
     harmony,
+    SeuratObject,
     optparse
 VignetteBuilder: knitr
 URL: https://www.camplab.net/sctk/

diff --git a/R/seuratFunctions.R b/R/seuratFunctions.R
@@ -1621,12 +1621,13 @@ convertSCEToSeurat <-
       colnames(decontM) <- colnames(seuratObject)
       rownames(decontM) <- gsub('_', '-', rownames(decontM))
       if(seurat.version >= 5.0){
+        # CreateAssayObject and similar were moved to SeuratObject now (added it to suggests)
         seuratObject[["decontXcounts"]] <-
-          Seurat::CreateAssay5Object(counts = .convertToMatrix(decontM)) #warning currently: Missing or unexported object: 'Seurat::CreateAssay5Object'
+          SeuratObject::CreateAssay5Object(counts = .convertToMatrix(decontM)) 
       }
       else{
         seuratObject[["decontXcounts"]] <-
-          Seurat::CreateAssayObject(counts = .convertToMatrix(decontM))
+          SeuratObject::CreateAssayObject(counts = .convertToMatrix(decontM))
       }
 
     }

diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf