Skip to content

Commit 7935a44

Browse files
committed
Merge branch 'giovp/get_element_instances' of https://github.com/scverse/spatialdata-plot into giovp/get_element_instances
2 parents 75ed8a0 + 0d7ced9 commit 7935a44

3 files changed

Lines changed: 80 additions & 80 deletions

File tree

CHANGELOG.md

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -12,169 +12,169 @@ and this project adheres to [Semantic Versioning][].
1212

1313
### Fixed
1414

15-
- Transformations of Points and Shapes are now applied before rendering with datashader (#378)
16-
- Fix bug due to `sc.get.obs_df()` returning a different type (#393)
17-
- Allowing instance mismatch between shapes and tables (#396)
18-
- Fix bug when plotting categorical points with datashader (#395)
15+
- Transformations of Points and Shapes are now applied before rendering with datashader (#378)
16+
- Fix bug due to `sc.get.obs_df()` returning a different type (#393)
17+
- Allowing instance mismatch between shapes and tables (#396)
18+
- Fix bug when plotting categorical points with datashader (#395)
1919

2020
## [0.2.8] - 2024-11-26
2121

2222
### Changed
2323

24-
- Support for `xarray.DataTree` (which moved from `datatree.DataTree`) (#380)
24+
- Support for `xarray.DataTree` (which moved from `datatree.DataTree`) (#380)
2525

2626
## [0.2.7] - 2024-10-24
2727

2828
### Added
2929

30-
- The user can now specify `datashader_reduction` to control the rendering behavior (#309)
31-
- Rendering outlines of shapes with datashader works now (#309)
30+
- The user can now specify `datashader_reduction` to control the rendering behavior (#309)
31+
- Rendering outlines of shapes with datashader works now (#309)
3232

3333
### Fixed
3434

35-
- datashader now uses canvas size = image size which speeds up the rendering (#309)
36-
- datashader now uses the `linear` as interpolation method for colormaps instead of the default `eq_hist` to make it equivalent to matplotlib (#309)
37-
- point sizes of datashader now agree with matplotlib also when dpi != 100 (#309)
38-
- Giving a custom colormap when rendering a multiscale image now works (#586)
35+
- datashader now uses canvas size = image size which speeds up the rendering (#309)
36+
- datashader now uses the `linear` as interpolation method for colormaps instead of the default `eq_hist` to make it equivalent to matplotlib (#309)
37+
- point sizes of datashader now agree with matplotlib also when dpi != 100 (#309)
38+
- Giving a custom colormap when rendering a multiscale image now works (#586)
3939

4040
## [0.2.6] - 2024-09-04
4141

4242
### Changed
4343

44-
- Lowered RMSE-threshold for plot-based tests from 45 to 15 (#344)
45-
- When subsetting to `groups`, `NA` isn't automatically added to legend (#344)
46-
- When rendering a single image channel, a colorbar is now shown (#346)
47-
- Removed `percentiles_for_norm` parameter (#346)
48-
- Changed `norm` to no longer accept bools, only `mpl.colors.Normalise` or `None` (#346)
44+
- Lowered RMSE-threshold for plot-based tests from 45 to 15 (#344)
45+
- When subsetting to `groups`, `NA` isn't automatically added to legend (#344)
46+
- When rendering a single image channel, a colorbar is now shown (#346)
47+
- Removed `percentiles_for_norm` parameter (#346)
48+
- Changed `norm` to no longer accept bools, only `mpl.colors.Normalise` or `None` (#346)
4949

5050
### Fixed
5151

52-
- Filtering with `groups` now preserves original cmap (#344)
53-
- Non-selected `groups` are now not shown in `na_color` (#344)
54-
- Several issues associated with `norm` and `colorbar` (#346)
52+
- Filtering with `groups` now preserves original cmap (#344)
53+
- Non-selected `groups` are now not shown in `na_color` (#344)
54+
- Several issues associated with `norm` and `colorbar` (#346)
5555

5656
## [0.2.5] - 2024-08-23
5757

5858
### Changed
5959

60-
- Replaced `outline` parameter in `render_labels` with alpha-based logic (#323)
61-
- Lowered RMSE-threshold for plot-based tests from 60 to 45 (#323)
62-
- Removed `preprocessing` (.pp) accessor (#329)
60+
- Replaced `outline` parameter in `render_labels` with alpha-based logic (#323)
61+
- Lowered RMSE-threshold for plot-based tests from 60 to 45 (#323)
62+
- Removed `preprocessing` (.pp) accessor (#329)
6363

6464
### Fixed
6565

66-
- Minor fixes for several tests as a result of the threshold change (#323)
66+
- Minor fixes for several tests as a result of the threshold change (#323)
6767

6868
## [0.2.4] - 2024-08-07
6969

7070
### Added
7171

72-
- Added utils function for 0-transparent cmaps (#302)
72+
- Added utils function for 0-transparent cmaps (#302)
7373

7474
### Fixed
7575

76-
- Took RNG out of categorical label test (#306)
77-
- Performance bug when plotting shapes (#298)
78-
- scale parameter was ignored for single-scale images (#301)
79-
- Changes to support for dask-expr (#283)
80-
- Added error handling for non-existent elements (#305)
81-
- Specifying vmin and vmax properly clips image data (#307)
82-
- import bug `get_cmap()` (8fd969c)
76+
- Took RNG out of categorical label test (#306)
77+
- Performance bug when plotting shapes (#298)
78+
- scale parameter was ignored for single-scale images (#301)
79+
- Changes to support for dask-expr (#283)
80+
- Added error handling for non-existent elements (#305)
81+
- Specifying vmin and vmax properly clips image data (#307)
82+
- import bug `get_cmap()` (8fd969c)
8383

8484
## [0.2.3] - 2024-07-03
8585

8686
### Added
8787

88-
- Datashader support for points and shapes (#244)
88+
- Datashader support for points and shapes (#244)
8989

9090
### Changed
9191

92-
- All parameters are now provided for a single element (#272)
92+
- All parameters are now provided for a single element (#272)
9393

9494
### Fixed
9595

96-
- Fix color assignment for NaN values (#257)
97-
- Zorder of rendering now strictly follows the order of the render_x calls (#244)
96+
- Fix color assignment for NaN values (#257)
97+
- Zorder of rendering now strictly follows the order of the render_x calls (#244)
9898

9999
## [0.2.2] - 2024-05-02
100100

101101
### Fixed
102102

103-
- Fixed `fill_alpha` ignoring `alpha` channel from custom cmap (#236)
104-
- Fix channel str support (#221)
103+
- Fixed `fill_alpha` ignoring `alpha` channel from custom cmap (#236)
104+
- Fix channel str support (#221)
105105

106106
## [0.2.1] - 2024-03-26
107107

108108
### Minor
109109

110-
- Adjusted GitHub worklows
110+
- Adjusted GitHub worklows
111111

112112
## [0.2.0] - 2024-03-24
113113

114114
### Added
115115

116-
- Support for plotting multiple tables @melonora
116+
- Support for plotting multiple tables @melonora
117117

118118
### Fixed
119119

120-
- Several bugfixes, especially for colors and palettes @melonora
120+
- Several bugfixes, especially for colors and palettes @melonora
121121

122122
## [0.1.0] - 2024-01-17
123123

124124
### Added
125125

126-
- Multiscale image handling: user can specify a scale, else the best scale is selected automatically given the figure size and dpi (#164)
127-
- Large images are automatically rasterized to speed up performance (#164)
128-
- Added better error message for mismatch in cs and ax number (#185)
129-
- Beter test coverage for correct plotting of elements after transformation (#198)
130-
- Can now stack render commands (#190, #192)
131-
- The `color` argument in render_shapes/points now accepts actual colors as well (#199)
132-
- Input arguments are now evaulated for their types in basic.py (#199)
126+
- Multiscale image handling: user can specify a scale, else the best scale is selected automatically given the figure size and dpi (#164)
127+
- Large images are automatically rasterized to speed up performance (#164)
128+
- Added better error message for mismatch in cs and ax number (#185)
129+
- Beter test coverage for correct plotting of elements after transformation (#198)
130+
- Can now stack render commands (#190, #192)
131+
- The `color` argument in render_shapes/points now accepts actual colors as well (#199)
132+
- Input arguments are now evaulated for their types in basic.py (#199)
133133

134134
### Fixed
135135

136-
- Now dropping index when plotting shapes after spatial query (#177)
137-
- Points are now being correctly rotated (#198)
138-
- User can now pass Colormap objects to the cmap argument in render_images. When only one cmap is given for 3 channels, it is now applied to each channel (#188, #194)
136+
- Now dropping index when plotting shapes after spatial query (#177)
137+
- Points are now being correctly rotated (#198)
138+
- User can now pass Colormap objects to the cmap argument in render_images. When only one cmap is given for 3 channels, it is now applied to each channel (#188, #194)
139139

140140
## [0.0.6] - 2023-11-06
141141

142142
### Added
143143

144-
- Pushed `get_extent` functionality upstream to `spatialdata` (#162)
144+
- Pushed `get_extent` functionality upstream to `spatialdata` (#162)
145145

146146
## [0.0.5] - 2023-10-02
147147

148148
### Added
149149

150-
- Can now scale shapes (#152)
151-
- Can now plot columns from GeoDataFrame (#149)
150+
- Can now scale shapes (#152)
151+
- Can now plot columns from GeoDataFrame (#149)
152152

153153
### Fixed
154154

155-
- Multipolygons are now handled correctly (#93)
156-
- Legend order is now deterministic (#143)
157-
- Images no longer normalised by default (#150)
158-
- Filtering of shapes and points using the `groups` argument is now possible, coloring by palette and cmap arguments works for shapes and points (#153)
159-
- Colorbar no longer autoscales to [0, 1] (#155)
160-
- Plotting shapes after a spatial query is now possible (#163)
155+
- Multipolygons are now handled correctly (#93)
156+
- Legend order is now deterministic (#143)
157+
- Images no longer normalised by default (#150)
158+
- Filtering of shapes and points using the `groups` argument is now possible, coloring by palette and cmap arguments works for shapes and points (#153)
159+
- Colorbar no longer autoscales to [0, 1] (#155)
160+
- Plotting shapes after a spatial query is now possible (#163)
161161

162162
## [0.0.4] - 2023-08-11
163163

164164
### Fixed
165165

166-
- Multi-scale images/labels are now correctly substituted and the action is logged (#131).
167-
- Empty geometries among the shapes can be handeled (#133).
168-
- `outline_width` parameter in render_shapes is now a float that actually determines the line width (#139).
166+
- Multi-scale images/labels are now correctly substituted and the action is logged (#131).
167+
- Empty geometries among the shapes can be handeled (#133).
168+
- `outline_width` parameter in render_shapes is now a float that actually determines the line width (#139).
169169

170170
## [0.0.2] - 2023-06-25
171171

172172
### Fixed
173173

174-
- Multiple bugfixes of which I didn't keep track of.
174+
- Multiple bugfixes of which I didn't keep track of.
175175

176176
## [0.0.1] - 2023-04-04
177177

178178
### Added
179179

180-
- Initial release of `spatialdata-plot` with support for `images`, `labels`, `points` and `shapes`.
180+
- Initial release of `spatialdata-plot` with support for `images`, `labels`, `points` and `shapes`.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ SpatialData’s plotting capabilities allow to quickly visualise all contained m
2626

2727
For more information on the `spatialdata-plot` library, please refer to the [documentation](https://spatialdata.scverse.org/projects/plot/en/latest/index.html). In particular, the
2828

29-
- [API documentation][link-api].
30-
- [Example notebooks][link-notebooks] (section "Visiualizations")
29+
- [API documentation][link-api].
30+
- [Example notebooks][link-notebooks] (section "Visiualizations")
3131

3232
## Installation
3333

docs/contributing.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ out to the developers of the dependency before the package is released to a wide
8282

8383
Many tests will produce plots and check that they are correct by comparing them with a previously saved and serialized version of the same plots. The ground truth images are located in `tests/_images`. Different OS/versions may produce similar but not identical plots (for instance the ticks/padding could vary). To take into account for this please consider the following:
8484

85-
- you should not use locally generated plots as ground truth images, but you should commit images that have been generated by a GitHub Action. The recommended workflow is to go to the ["actions" page for the repo](https://github.com/scverse/spatialdata-plot/actions/workflows/test.yaml), download the artifacts, and upload them as ground truth (after having reviewed them).
86-
- the ground truth images need to be updated when a new test is passing, or when a test starts producing a slightly different (but consistent) plot.
87-
- please never replace the ground truth images without having manually reviewed them.
88-
- if you run the tests locally in macOS or Windows they will likely fail because the ground truth images are generated using Ubuntu. To overcome this you can use `act`, which will generate a Docker reproducing the environment used in the GitHub Action. After the Docker container is generated you can use it within IDEs to run tests and debug code.
89-
- in the case of PyCharm, it is easier to create a container from a `Dockerfile` instead of using `act`. Please in such case use the `Dockerfile` made availabel in the repository. If you encountering problems with `act` or `docker`, please [get in touch with the developers via Zulip](https://scverse.zulipchat.com/#narrow/channel/443514-spatialdata-dev) and we will help troubleshoot the issue. See also additional details [here](https://github.com/scverse/spatialdata-plot/pull/397).
85+
- you should not use locally generated plots as ground truth images, but you should commit images that have been generated by a GitHub Action. The recommended workflow is to go to the ["actions" page for the repo](https://github.com/scverse/spatialdata-plot/actions/workflows/test.yaml), download the artifacts, and upload them as ground truth (after having reviewed them).
86+
- the ground truth images need to be updated when a new test is passing, or when a test starts producing a slightly different (but consistent) plot.
87+
- please never replace the ground truth images without having manually reviewed them.
88+
- if you run the tests locally in macOS or Windows they will likely fail because the ground truth images are generated using Ubuntu. To overcome this you can use `act`, which will generate a Docker reproducing the environment used in the GitHub Action. After the Docker container is generated you can use it within IDEs to run tests and debug code.
89+
- in the case of PyCharm, it is easier to create a container from a `Dockerfile` instead of using `act`. Please in such case use the `Dockerfile` made availabel in the repository. If you encountering problems with `act` or `docker`, please [get in touch with the developers via Zulip](https://scverse.zulipchat.com/#narrow/channel/443514-spatialdata-dev) and we will help troubleshoot the issue. See also additional details [here](https://github.com/scverse/spatialdata-plot/pull/397).
9090

9191
## Publishing a release
9292

@@ -109,11 +109,11 @@ Specify `vX.X.X` as a tag name and create a release. For more information, see [
109109

110110
Please write documentation for new or changed features and use-cases. This project uses [sphinx][] with the following features:
111111

112-
- the [myst][] extension allows to write documentation in markdown/Markedly Structured Text
113-
- [Numpy-style docstrings][numpydoc] (through the [napoloen][numpydoc-napoleon] extension).
114-
- Jupyter notebooks as tutorials through [myst-nb][] (See [Tutorials with myst-nb](#tutorials-with-myst-nb-and-jupyter-notebooks))
115-
- [Sphinx autodoc typehints][], to automatically reference annotated input and output types
116-
- Citations (like {cite:p}`Virshup_2023`) can be included with [sphinxcontrib-bibtex](https://sphinxcontrib-bibtex.readthedocs.io/)
112+
- the [myst][] extension allows to write documentation in markdown/Markedly Structured Text
113+
- [Numpy-style docstrings][numpydoc] (through the [napoloen][numpydoc-napoleon] extension).
114+
- Jupyter notebooks as tutorials through [myst-nb][] (See [Tutorials with myst-nb](#tutorials-with-myst-nb-and-jupyter-notebooks))
115+
- [Sphinx autodoc typehints][], to automatically reference annotated input and output types
116+
- Citations (like {cite:p}`Virshup_2023`) can be included with [sphinxcontrib-bibtex](https://sphinxcontrib-bibtex.readthedocs.io/)
117117

118118
See the [scanpy developer docs](https://scanpy.readthedocs.io/en/latest/dev/documentation.html) for more information
119119
on how to write documentation.
@@ -130,10 +130,10 @@ repository.
130130

131131
#### Hints
132132

133-
- If you refer to objects from other packages, please add an entry to `intersphinx_mapping` in `docs/conf.py`. Only
134-
if you do so can sphinx automatically create a link to the external documentation.
135-
- If building the documentation fails because of a missing link that is outside your control, you can add an entry to
136-
the `nitpick_ignore` list in `docs/conf.py`
133+
- If you refer to objects from other packages, please add an entry to `intersphinx_mapping` in `docs/conf.py`. Only
134+
if you do so can sphinx automatically create a link to the external documentation.
135+
- If building the documentation fails because of a missing link that is outside your control, you can add an entry to
136+
the `nitpick_ignore` list in `docs/conf.py`
137137

138138
#### Building the docs locally
139139

0 commit comments

Comments
 (0)