Skip to content

Commit e2729df

Browse files
committed
Update documentation website (long overdue)
Merge branch 'RELEASE_3_22' into documentation-devel # Conflicts: # DESCRIPTION
2 parents 8e51eef + bf9b3b9 commit e2729df

File tree

114 files changed

+3182
-1212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3182
-1212
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- uses: r-lib/actions/setup-pandoc@v2
3636

3737
- if: runner.os == 'macOS'
38-
run: brew install apache-arrow
38+
run: brew install apache-arrow fftw jpeg-turbo libtiff imagemagick pkg-config
3939

4040
- name: Setup R and Bioconductor
4141
uses: grimbough/bioc-actions/setup-bioc@v1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
*.Rproj
66
inst/doc
77
docs
8+
.DS_Store

DESCRIPTION

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Package: SpatialFeatureExperiment
22
Type: Package
33
Title: Integrating SpatialExperiment with Simple Features in sf
4-
Version: 1.7.1
4+
Version: 1.12.1
55
Authors@R:
6-
c(person("Lambda", "Moses", email = "dlu2@caltech.edu",
6+
c(person("Lambda", "Moses", email = "dl3764@columbia.edu",
77
role = c("aut", "cre"),
88
comment = c(ORCID = "0000-0002-7092-9427")),
99
person("Alik", "Huseynov",
@@ -20,7 +20,7 @@ Description: A new S4 class integrating Simple Features with the R package sf
2020
be used.
2121
Imports:
2222
Biobase,
23-
BiocGenerics,
23+
BiocGenerics (>= 0.51.2),
2424
BiocNeighbors,
2525
BiocParallel,
2626
data.table,
@@ -37,6 +37,7 @@ Imports:
3737
sfheaders,
3838
SingleCellExperiment,
3939
SpatialExperiment,
40+
spatialreg,
4041
spdep (>= 1.1-7),
4142
SummarizedExperiment,
4243
stats,
@@ -45,7 +46,7 @@ Imports:
4546
zeallot
4647
License: Artistic-2.0
4748
Encoding: UTF-8
48-
RoxygenNote: 7.3.2
49+
RoxygenNote: 7.3.3
4950
Collate:
5051
'AllGenerics.R'
5152
'utils.R'
@@ -57,6 +58,7 @@ Collate:
5758
'changeSampleIDs.R'
5859
'coerce.R'
5960
'data.R'
61+
'debris.R'
6062
'df2sf.R'
6163
'dimGeometries.R'
6264
'featureData.R'
@@ -66,20 +68,24 @@ Collate:
6668
'image.R'
6769
'int_dimData.R'
6870
'internal-Voyager.R'
71+
'listw2sparse.R'
6972
'localResults.R'
7073
'read.R'
7174
'reexports.R'
7275
'saveRDS.R'
7376
'spatialGraphs.R'
7477
'split.R'
7578
'subset.R'
79+
'tissue_boundary.R'
7680
'transformation.R'
7781
'updateObject.R'
7882
'validity.R'
83+
'zzz.R'
7984
Suggests:
8085
arrow,
8186
BiocStyle,
8287
dplyr,
88+
gmp,
8389
knitr,
8490
RBioFormats,
8591
rhdf5,
@@ -92,10 +98,12 @@ Suggests:
9298
sparseMatrixStats,
9399
testthat (>= 3.0.0),
94100
tidyr,
95-
Voyager,
101+
VisiumIO,
102+
Voyager (>= 1.7.2),
103+
withr,
96104
xml2
97105
Remotes:
98-
Voyager=github::pachterlab/voyager
106+
Voyager=github::pachterlab/voyager@devel
99107
Config/testthat/edition: 3
100108
Depends:
101109
R (>= 4.2.0)

NAMESPACE

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export("txSpots<-")
4040
export(.check_features)
4141
export(.check_rg)
4242
export(.check_sample_id)
43+
export(.ext_)
4344
export(.rm_empty_geometries)
4445
export(.symbol2id)
4546
export(.value2df)
@@ -89,8 +90,10 @@ export(df2sf)
8990
export(dimGeometries)
9091
export(dimGeometry)
9192
export(dimGeometryNames)
93+
export(findDebrisCells)
9294
export(findSpatialNeighbors)
9395
export(findVisiumGraph)
96+
export(findVisiumHDGraph)
9497
export(formatTxSpots)
9598
export(formatTxTech)
9699
export(gdalParquetAvailable)
@@ -99,6 +102,8 @@ export(getImg)
99102
export(getParams)
100103
export(getPixelSize)
101104
export(getTechTxFields)
105+
export(getTissueBoundaryConcave)
106+
export(getTissueBoundaryImg)
102107
export(imageIDs)
103108
export(imgData)
104109
export(imgRaster)
@@ -112,11 +117,13 @@ export(localResults)
112117
export(logcounts)
113118
export(mirror)
114119
export(mirrorImg)
120+
export(multi_listw2sparse)
115121
export(nucSeg)
116122
export(origin)
117123
export(read10xVisiumSFE)
118124
export(readCosMX)
119125
export(readSelectTx)
126+
export(readVisiumHD)
120127
export(readVizgen)
121128
export(readXenium)
122129
export(reducedDim)
@@ -142,6 +149,7 @@ export(spatialGraph)
142149
export(spatialGraphNames)
143150
export(spatialGraphs)
144151
export(splitByCol)
152+
export(splitComponent)
145153
export(splitContiguity)
146154
export(splitSamples)
147155
export(spotPoly)
@@ -187,12 +195,14 @@ exportMethods(annotGeometry)
187195
exportMethods(annotGeometryNames)
188196
exportMethods(bbox)
189197
exportMethods(cbind)
198+
exportMethods(containsOutOfMemoryData)
190199
exportMethods(cropImg)
191200
exportMethods(dim)
192201
exportMethods(dimGeometries)
193202
exportMethods(dimGeometry)
194203
exportMethods(dimGeometryNames)
195204
exportMethods(ext)
205+
exportMethods(findDebrisCells)
196206
exportMethods(findSpatialNeighbors)
197207
exportMethods(imgRaster)
198208
exportMethods(imgSource)
@@ -225,6 +235,8 @@ importClassesFrom(SpatialExperiment,SpatialExperiment)
225235
importClassesFrom(SpatialExperiment,VirtualSpatialImage)
226236
importClassesFrom(terra,SpatRaster)
227237
importFrom(BiocGenerics,cbind)
238+
importFrom(BiocGenerics,containsOutOfMemoryData)
239+
importFrom(BiocGenerics,saveRDS)
228240
importFrom(BiocGenerics,updateObject)
229241
importFrom(BiocNeighbors,AnnoyParam)
230242
importFrom(BiocNeighbors,KmknnParam)
@@ -235,18 +247,26 @@ importFrom(BiocParallel,bplapply)
235247
importFrom(BiocParallel,bpmapply)
236248
importFrom(DropletUtils,read10xCounts)
237249
importFrom(EBImage,Image)
250+
importFrom(EBImage,closing)
251+
importFrom(EBImage,fillHull)
252+
importFrom(EBImage,makeBrush)
253+
importFrom(EBImage,normalize)
254+
importFrom(EBImage,otsu)
238255
importFrom(Matrix,colSums)
239256
importFrom(Matrix,rowSums)
240257
importFrom(Matrix,sparseMatrix)
258+
importFrom(S4Vectors,"mcols<-")
241259
importFrom(S4Vectors,"metadata<-")
242260
importFrom(S4Vectors,DataFrame)
243261
importFrom(S4Vectors,SimpleList)
244262
importFrom(S4Vectors,combineCols)
245263
importFrom(S4Vectors,isEmpty)
246264
importFrom(S4Vectors,make_zero_col_DFrame)
265+
importFrom(S4Vectors,mcols)
247266
importFrom(S4Vectors,metadata)
248267
importFrom(S4Vectors,setValidity2)
249268
importFrom(S4Vectors,showAsCell)
269+
importFrom(S4Vectors,split)
250270
importFrom(SingleCellExperiment,"altExp<-")
251271
importFrom(SingleCellExperiment,"int_colData<-")
252272
importFrom(SingleCellExperiment,"int_elementMetadata<-")
@@ -267,14 +287,14 @@ importFrom(SingleCellExperiment,reducedDimNames)
267287
importFrom(SingleCellExperiment,reducedDims)
268288
importFrom(SpatialExperiment,"imgData<-")
269289
importFrom(SpatialExperiment,"spatialCoords<-")
290+
importFrom(SpatialExperiment,"spatialCoordsNames<-")
270291
importFrom(SpatialExperiment,SpatialExperiment)
271292
importFrom(SpatialExperiment,addImg)
272293
importFrom(SpatialExperiment,getImg)
273294
importFrom(SpatialExperiment,imgData)
274295
importFrom(SpatialExperiment,imgRaster)
275296
importFrom(SpatialExperiment,imgSource)
276297
importFrom(SpatialExperiment,mirrorImg)
277-
importFrom(SpatialExperiment,read10xVisium)
278298
importFrom(SpatialExperiment,rmvImg)
279299
importFrom(SpatialExperiment,rotateImg)
280300
importFrom(SpatialExperiment,spatialCoords)
@@ -287,6 +307,7 @@ importFrom(SummarizedExperiment,assayNames)
287307
importFrom(SummarizedExperiment,assays)
288308
importFrom(SummarizedExperiment,colData)
289309
importFrom(SummarizedExperiment,rowData)
310+
importFrom(data.table,":=")
290311
importFrom(data.table,as.data.table)
291312
importFrom(data.table,fread)
292313
importFrom(data.table,is.data.table)
@@ -313,7 +334,11 @@ importFrom(methods,slot)
313334
importFrom(methods,slotNames)
314335
importFrom(methods,validObject)
315336
importFrom(rjson,fromJSON)
337+
importFrom(rlang,"!!")
338+
importFrom(rlang,"%||%")
339+
importFrom(rlang,.data)
316340
importFrom(rlang,check_installed)
341+
importFrom(rlang,sym)
317342
importFrom(sf,"st_agr<-")
318343
importFrom(sf,"st_geometry<-")
319344
importFrom(sf,st_agr)
@@ -326,7 +351,7 @@ importFrom(sf,st_cast)
326351
importFrom(sf,st_centroid)
327352
importFrom(sf,st_collection_extract)
328353
importFrom(sf,st_coordinates)
329-
importFrom(sf,st_covered_by)
354+
importFrom(sf,st_covers)
330355
importFrom(sf,st_disjoint)
331356
importFrom(sf,st_distance)
332357
importFrom(sf,st_drop_geometry)
@@ -349,6 +374,7 @@ importFrom(sf,st_polygon)
349374
importFrom(sf,st_read)
350375
importFrom(sf,st_sf)
351376
importFrom(sf,st_sfc)
377+
importFrom(sf,st_simplify)
352378
importFrom(sf,st_union)
353379
importFrom(sf,st_z_range)
354380
importFrom(sf,st_zm)
@@ -357,12 +383,15 @@ importFrom(sfheaders,sf_multilinestring)
357383
importFrom(sfheaders,sf_multipoint)
358384
importFrom(sfheaders,sf_multipolygon)
359385
importFrom(sfheaders,sf_polygon)
386+
importFrom(spatialreg,as_dgRMatrix_listw)
360387
importFrom(spdep,card)
361388
importFrom(spdep,dnearneigh)
362389
importFrom(spdep,gabrielneigh)
363390
importFrom(spdep,graph2nb)
364391
importFrom(spdep,knearneigh)
365392
importFrom(spdep,knn2nb)
393+
importFrom(spdep,mat2listw)
394+
importFrom(spdep,n.comp.nb)
366395
importFrom(spdep,nb2listw)
367396
importFrom(spdep,nb2listwdist)
368397
importFrom(spdep,poly2nb)
@@ -374,6 +403,7 @@ importFrom(stats,median)
374403
importFrom(stats,na.omit)
375404
importFrom(stats,setNames)
376405
importFrom(terra,"ext<-")
406+
importFrom(terra,as.raster)
377407
importFrom(terra,ext)
378408
importFrom(terra,inMemory)
379409
importFrom(terra,nlyr)
@@ -389,4 +419,5 @@ importFrom(utils,getFromNamespace)
389419
importFrom(utils,head)
390420
importFrom(utils,packageVersion)
391421
importFrom(utils,read.csv)
422+
importFrom(utils,tail)
392423
importFrom(zeallot,"%<-%")

R/AllGenerics.R

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ setGeneric(".mirror_img", function(x, direction, bbox_all, ...) standardGeneric(
232232

233233
setGeneric(".rotate_img", function(x, degrees, bbox_all, ...) standardGeneric(".rotate_img"))
234234

235+
setGeneric(".scale_img", function(x, factor, bbox_all, ...) standardGeneric(".scale_img"))
236+
235237
#' @export
236238
setGeneric("scaleImg", function(x, factor, ...) standardGeneric("scaleImg"))
237239

@@ -244,7 +246,9 @@ setGeneric("affineImg", function(x, M, v, ...) standardGeneric("affineImg"))
244246
#' @export
245247
setGeneric("cropImg", function(x, bbox, ...) standardGeneric("cropImg"))
246248

247-
if (!isGeneric("saveRDS")) {setGeneric("saveRDS", function (object, file="", ascii=FALSE, version=NULL, compress=TRUE, refhook=NULL) standardGeneric("saveRDS"))}
249+
if (!isGeneric("readRDS")) {
250+
setGeneric("readRDS", function(file, refhook = NULL) standardGeneric("readRDS"))
251+
}
248252

249253
#' @export
250254
setGeneric("toExtImage", function(x, ...) standardGeneric("toExtImage"))
@@ -272,3 +276,8 @@ setGeneric("Img<-", function(x, sample_id = 1L, image_id, scale_fct = 1, value)
272276

273277
#' @export
274278
setGeneric("splitByCol", function(x, f, ...) standardGeneric("splitByCol"))
279+
280+
#' @export
281+
setGeneric("findDebrisCells", function(x, max_cells = 5, distance_cutoff = 50,
282+
BNPARAM = NULL, BPPARAM = SerialParam())
283+
standardGeneric("findDebrisCells"))

0 commit comments

Comments
 (0)