fix #141

dputhier · Jan 9, 2024 · 1c84726 · 1c84726
1 parent 52b0219
commit 1c84726
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/R/dist2border.R b/R/dist2border.R
@@ -252,9 +252,25 @@ plot_stratum <- function(seurat_obj=NULL,
     if(intensity_slot=="sct"){
       slot_intensity <- seurat_obj@assays$SC
     }else if(intensity_slot=="counts"){
-      slot_intensity <- seurat_obj@assays$Spatial@counts
+
+      slot_intensity <- try({
+        seurat_obj@assays$Spatial$counts
+      }, silent = TRUE)
+
+      if (class(slot_intensity) == "try-error") {
+        slot_intensity <- seurat_obj@assays$Spatial@counts
+      }
+
     }else if(intensity_slot=="data"){
-      slot_intensity <- seurat_obj@assays$Spatial@data
+
+      slot_intensity <- try({
+        seurat_obj@assays$Spatial$data
+      }, silent = TRUE)
+
+      if (class(slot_intensity) == "try-error") {
+        slot_intensity <- seurat_obj@assays$Spatial@data
+      }
+
     }
 
     if(is.null(slot_intensity))

diff --git a/R/plot_spatial.R b/R/plot_spatial.R
@@ -100,11 +100,29 @@ plot_spatial <- function(seurat_obj=NULL,
 
   }else{
     if(intensity_slot=="sct"){
+
       slot_intensity <- seurat_obj@assays$SC
+
     }else if(intensity_slot=="counts"){
-      slot_intensity <- seurat_obj@assays$Spatial@counts
+
+      slot_intensity <- try({
+        seurat_obj@assays$Spatial$counts
+      }, silent = TRUE)
+
+      if (class(slot_intensity) == "try-error") {
+        slot_intensity <- seurat_obj@assays$Spatial@counts
+      }
+
     }else if(intensity_slot=="data"){
-      slot_intensity <- seurat_obj@assays$Spatial@data
+
+      slot_intensity <- try({
+        seurat_obj@assays$Spatial$data
+      }, silent = TRUE)
+
+      if (class(slot_intensity) == "try-error") {
+        slot_intensity <- seurat_obj@assays$Spatial@data
+      }
+
     }
 
     if(is.null(slot_intensity))