Merge branch 'drieslab:suite_modular' into suite_modular

drieslab · Oct 20, 2023 · 742fa78 · 742fa78
2 parents 0fe66fa + 64f1ac6
commit 742fa78
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 75 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -259,6 +259,7 @@ export(plotHeatmap)
 export(plotICF)
 export(plotICFSpot)
 export(plotInteractionChangedFeats)
+export(plotInteractive3D)
 export(plotInteractivePolygons)
 export(plotMetaDataCellsHeatmap)
 export(plotMetaDataHeatmap)

diff --git a/R/auxiliary_giotto.R b/R/auxiliary_giotto.R
@@ -40,8 +40,8 @@ libNorm_giotto = function(mymatrix, scalefactor){
 #' @keywords internal
 logNorm_giotto = function(mymatrix, base, offset) {
 
-  if(methods::is(mymatrix, 'HDF5Matrix')) {
-    mymatrix@x = log(mymatrix + offset)/log(base)
+  if(methods::is(mymatrix, 'DelayedArray')) {
+    mymatrix = log(mymatrix + offset)/log(base)
     # } else if(methods::is(mymatrix, 'DelayedMatrix')) {
     #   mymatrix = log(mymatrix + offset)/log(base)
   } else if(methods::is(mymatrix, 'dgCMatrix')) {