Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
2b8fe03
3 improviements to transforms: 1. helper function to get an affine tr…
LucaMarconato Jan 8, 2023
2107071
removed type str for input_coordinate_system and output_coordinate_sy…
LucaMarconato Jan 8, 2023
e1e12a1
simplified logic of Sequence coordinate systems inference
LucaMarconato Jan 8, 2023
ad3e7b2
now Sequence works also for mismatched coordinate systems
LucaMarconato Jan 9, 2023
9a6d75f
transformations can be applied to any element and axes are automatica…
LucaMarconato Jan 9, 2023
1bb4e93
better repr for transforms; wip on transforms with mismatching axes
LucaMarconato Jan 11, 2023
370970d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 11, 2023
53b27ce
wip, some tests passing
LucaMarconato Jan 11, 2023
db0c786
all tests passing (but mypy)
LucaMarconato Jan 11, 2023
3985195
Merge branch 'feature/transform_ergonomics' of https://github.com/scv…
LucaMarconato Jan 11, 2023
e8962d7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 11, 2023
5482193
simplified parser, all tests passing, fixed mypy
LucaMarconato Jan 12, 2023
32eb7ab
Merge branch 'feature/transform_ergonomics' of https://github.com/scv…
LucaMarconato Jan 12, 2023
62639c8
complex trans converted to affine; fixed bug with sequences and misma…
LucaMarconato Jan 12, 2023
2f6ea94
wip
LucaMarconato Jan 13, 2023
20f2e3a
wip2
LucaMarconato Jan 13, 2023
017b2b9
fixed problem with io (more in a future pr); started refactoring out …
LucaMarconato Jan 16, 2023
172c861
added basic structure; added identity and tests
LucaMarconato Jan 16, 2023
d12b992
restored the previous ngff sequence axes inference logic from 358a338
LucaMarconato Jan 16, 2023
1d0cb58
added MapAxis and tests
LucaMarconato Jan 16, 2023
208f896
added translation and scale, with tests
LucaMarconato Jan 16, 2023
e208a37
added affine, with tests
LucaMarconato Jan 16, 2023
00c50e8
added sequence, with tests; bugfix
LucaMarconato Jan 16, 2023
8874c31
added repr
LucaMarconato Jan 16, 2023
e09e3a8
code for transforming coordinates (+ tests), working on transforming …
LucaMarconato Jan 17, 2023
c644035
trying to fix tests in ubuntu
LucaMarconato Jan 17, 2023
31685c5
transforming Points, Polygons and Shapes
LucaMarconato Jan 19, 2023
6f59e6d
wip transformation on raster elements
LucaMarconato Jan 19, 2023
e489a28
wip transform raster
LucaMarconato Jan 20, 2023
4c998f9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 20, 2023
f4b8ac0
wip transform raster, added unpad_raster(), wip its test
LucaMarconato Jan 22, 2023
569d7c8
Merge branch 'feature/transform_ergonomics' of https://github.com/scv…
LucaMarconato Jan 22, 2023
e049f6d
fixed precommits
LucaMarconato Jan 24, 2023
3a05cea
started integrating the new transfrom with the rest of the code, star…
LucaMarconato Jan 25, 2023
cc57547
conversion between new transforms and ngff transforms; fixed tranform…
LucaMarconato Jan 25, 2023
83b32ad
all tests passing, mypy failing
LucaMarconato Jan 25, 2023
ce998a3
all precommit passing
LucaMarconato Jan 25, 2023
80aa0a2
Merge branch 'main' into feature/transform_ergonomics
LucaMarconato Jan 25, 2023
a119537
isolated the code to write the coordinate transformation to disk, ind…
LucaMarconato Jan 25, 2023
5ea7400
fixed critical bug with io and lazy loading
LucaMarconato Jan 26, 2023
44f420b
fixed additional tiny bug with incremental io and added tests
LucaMarconato Jan 26, 2023
d7af80d
method for replacing transformations on disk for non-raster types
LucaMarconato Jan 26, 2023
0774a24
raster non-multiscale: method for replacing transforms on disk
LucaMarconato Jan 26, 2023
479ec5e
raster multiscale (last missing): method for replacing transforms on …
LucaMarconato Jan 26, 2023
a878db3
fix bug with parser: passing transforms both as argument and inside the
LucaMarconato Jan 26, 2023
40b2028
helper function to create coordinate systems
LucaMarconato Jan 26, 2023
8a08340
function to map between coordinate systems
LucaMarconato Jan 26, 2023
8944cd1
Merge branch 'shapesmodel/id' into feature/transform_ergonomics
LucaMarconato Jan 26, 2023
59699b8
fix check downscale factors parser multiscale
LucaMarconato Jan 26, 2023
ccde1c0
removed ngff transforms from __init__; check on shape_type for Shapes…
LucaMarconato Jan 30, 2023
3a2ee6e
support for multiple transformations per element
LucaMarconato Jan 30, 2023
c476486
Merge branch 'main' into feature/transform_ergonomics
LucaMarconato Jan 30, 2023
7b9bf5b
implemented transformation to coordinate system
LucaMarconato Jan 30, 2023
553e762
small fixes around io and viz
LucaMarconato Jan 31, 2023
40a33b5
fixed bug with sequence and added test
LucaMarconato Jan 31, 2023
8fe9cd9
Updated design doc
Feb 1, 2023
95acd24
Apply suggestions from code review
LucaMarconato Feb 2, 2023
96d9a4f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 2, 2023
1e92fed
small fixes after giovp review
LucaMarconato Feb 6, 2023
7af34c4
Merge branch 'feature/transform_ergonomics' of https://github.com/scv…
LucaMarconato Feb 6, 2023
77e7863
starting adding new functions for set/get/del transform
LucaMarconato Feb 11, 2023
f69704e
Apply suggestions from code review
LucaMarconato Feb 12, 2023
b9118af
finished adding the new set/get/remove transfomation func
LucaMarconato Feb 12, 2023
92f1aa7
Merge branch 'feature/transform_ergonomics' of https://github.com/scv…
LucaMarconato Feb 12, 2023
a595489
wip new points
LucaMarconato Feb 12, 2023
652d0eb
Merge branch 'main' into feature/transform_ergonomics
LucaMarconato Feb 12, 2023
eb10b3b
almost all tests passing
LucaMarconato Feb 12, 2023
1ef2cf0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 12, 2023
0164eb5
all tests passing
LucaMarconato Feb 12, 2023
7c07a07
Merge branch 'feature/transform_ergonomics' of https://github.com/scv…
LucaMarconato Feb 12, 2023
545349f
readded pyarrow dependency
LucaMarconato Feb 12, 2023
3eac031
fixed bug with PointsFormat (validation failed after io because of mi…
LucaMarconato Feb 12, 2023
3a31ae8
fix in points parse
LucaMarconato Feb 13, 2023
e1745f5
Merge branch 'main' into feature/transform_ergonomics
LucaMarconato Feb 13, 2023
458ba9d
updated design doc; fix __repr__; fix points model
LucaMarconato Feb 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip2
  • Loading branch information
LucaMarconato committed Jan 13, 2023
commit 20f2e3a79bb3417db7c6dadaa5e93b68237f43b4
4 changes: 3 additions & 1 deletion spatialdata/_core/_spatialdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ def __init__(
def query(self) -> QueryManager:
return self._query

def _add_image_in_memory(self, name: str, image: Union[SpatialImage, MultiscaleSpatialImage], overwrite: bool=True) -> None:
def _add_image_in_memory(
self, name: str, image: Union[SpatialImage, MultiscaleSpatialImage], overwrite: bool = True
) -> None:
if name in self._images:
if not overwrite:
raise ValueError(f"Image {name} already exists in the dataset.")
Expand Down
3 changes: 2 additions & 1 deletion tests/_core/test_transformations.py
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ def test_assignment_bug_infinite_recusion():
== "The transformation is not consistent because it introduces axes that; cant be passed through from the input axes."
)


def test_compose_in_xy_and_operate_in_cyx():
xy_cs = get_default_coordinate_system(("x", "y"))
cyx_cs = get_default_coordinate_system(("c", "y", "x"))
Expand All @@ -610,4 +611,4 @@ def test_compose_in_xy_and_operate_in_cyx():
sequence = Sequence([rotation, scale], input_coordinate_system=cyx_cs, output_coordinate_system=cyx_cs)
affine = sequence.to_affine()
print(affine)
assert affine.affine[0, 0] == 1.
assert affine.affine[0, 0] == 1.0