Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
49515f7
WIP: replacing histogram with image and allowing it to receive featur…
zoccoler May 10, 2024
bced866
remove test files
zoccoler May 15, 2024
21d01e8
rename categorical_colormap to overlay_colormap, add color_normalizat…
zoccoler May 15, 2024
2c45771
Update scatter_artist_example.ipynb
zoccoler May 15, 2024
5fe2f12
Update features_histogram.ipynb
zoccoler May 15, 2024
62db31c
remove test notebook
zoccoler May 15, 2024
81fc123
do not build book on PR
zoccoler May 16, 2024
3497ec7
fix tests (no need ofr color_indices to be only integers anymore, flo…
zoccoler May 16, 2024
b32e99c
remove macos-13 python 3.9
zoccoler May 16, 2024
ec32f75
WIP: fixing histogram normalization
zoccoler Jul 25, 2024
952bfab
only draw overlay if there are non-NaN values, fix norm to linear if …
zoccoler Jul 25, 2024
270623f
Add colormap module with colormap wrapper with `categorical` attribute
zoccoler Jul 26, 2024
d29f01f
add overlay_colormap property to Scatter and Histogram, fix normaliza…
zoccoler Jul 26, 2024
2feffd8
Merge branch 'main' into color_histogram_with_floats
zoccoler Jul 26, 2024
e425654
small fixes to histogram 2d
zoccoler Jul 26, 2024
570c729
rename method 'indices_in_patches_above_threshold' in tests
zoccoler Jul 26, 2024
38b272d
Update example notebooks
zoccoler Jul 26, 2024
2fdb2cb
Add more tests to artists: colormaps and histogram overlay properties
zoccoler Jul 26, 2024
26693ca
modularize array_to_pcolormesh_rgba into smaller methods, add overlay…
zoccoler Jul 29, 2024
e464007
Update test_artists.py
zoccoler Jul 29, 2024
fdfc35b
Update histogram_artist_example.ipynb
zoccoler Jul 29, 2024
d018263
Update artists documentation
zoccoler Jul 29, 2024
1850365
match sum statistic output with other statistics outputs, having NaNs…
zoccoler Jul 29, 2024
0153257
Add test for _calculate_statistic_histogram
zoccoler Jul 29, 2024
ec692f5
Add overlay_visible property to Scatter artist and make colormap BiaC…
zoccoler Mar 21, 2025
d8087fd
Always resets colormap to default colormap when selection is applied
zoccoler Mar 21, 2025
1487a75
Add hide/show overlay button to toolbar
zoccoler Mar 21, 2025
b930bb2
Emit signal when selection is applied
zoccoler Mar 21, 2025
93d7994
update selectors Interactive selection_applied_signal documentation
zoccoler Mar 21, 2025
61bd3f1
update artists Scatter overlay_visible property documentation
zoccoler Mar 21, 2025
8336ca0
Update scatter_artist_example.ipynb
zoccoler Mar 21, 2025
d22de04
Merge branch 'main' into color_histogram_with_floats
zoccoler Mar 21, 2025
15974f7
fix tests order
zoccoler Mar 21, 2025
0a1f51d
de-construct `color_indices` setter into separate subfunctions
jo-mueller Mar 31, 2025
20f1fa0
refactored log-normalization handling
jo-mueller Mar 31, 2025
d15524f
change default edgecolor to white
jo-mueller Mar 31, 2025
05b0225
fix check for cmap name
jo-mueller Mar 31, 2025
2324eec
refactored checks and used explicit class check
jo-mueller Mar 31, 2025
f3c0569
do not update color indices on colormap change
jo-mueller Apr 9, 2025
67f1b3b
emit color indices instead of boolean
jo-mueller Apr 9, 2025
a86a8d6
Revert "do not update color indices on colormap change"
jo-mueller Apr 10, 2025
6c37853
Merge pull request #42 from jo-mueller/refactor-scatter-coloring
jo-mueller Apr 10, 2025
aa0c2d4
Use lower median in _calculate_statistic_histogram and format code
zoccoler Apr 11, 2025
df4fa4b
fix histogram test to account for using lower_median in _calculate_st…
zoccoler Apr 11, 2025
a80b99d
Update gifs
zoccoler Apr 11, 2025
90bed52
Update notebooks outputs
zoccoler Apr 11, 2025
c2fc102
Add plublic properties alpha to Scatter and indices_in_patches_above_…
zoccoler Apr 11, 2025
6beca91
format code
zoccoler Apr 11, 2025
4c97b2d
bump version
zoccoler Apr 11, 2025
2db3d6b
update download miniforge link
zoccoler Apr 11, 2025
9bc1e17
add overlay_colormap as abstract method, fix typos and rmeove unused …
zoccoler Apr 11, 2025
780919b
Fix methods dosctrings for proper documentation display
zoccoler Apr 11, 2025
fc34f73
Add return annotation to active_artist and remove unused imports
zoccoler Apr 11, 2025
c2655ad
Fix artists documentation page with recent changes
zoccoler Apr 11, 2025
2746ef5
Add support for python 3.11 and 3.12
zoccoler Apr 11, 2025
979103b
run automated tests for newer python versions
zoccoler Apr 11, 2025
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
3 changes: 0 additions & 3 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
branches:
- master
- main
pull_request:
branches:
- main

# This job installs dependencies, build the book, and pushes it to `gh-pages`
jobs:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest, windows-latest, macos-13, macos-14]
python-version: ['3.9', '3.10']
python-version: ['3.9', '3.10', '3.11', '3.12']
exclude:
- python-version: "3.9"
platform: macos-14
- python-version: "3.9"
platform: macos-13

steps:
- uses: actions/checkout@v3
Expand Down
40 changes: 30 additions & 10 deletions docs/artists_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
~Artist.data
~Artist.visible
~Artist.color_indices
~Artist.overlay_colormap

.. rubric:: Attributes Summary

.. autosummary::

~Artist.ax
~Artist.categorical_colormap

.. rubric:: Methods Summary

Expand All @@ -31,11 +31,11 @@
.. autoattribute:: data
.. autoattribute:: visible
.. autoattribute:: color_indices
.. autoattribute:: overlay_colormap

.. rubric:: Attributes Documentation

.. autoattribute:: ax
.. autoattribute:: categorical_colormap

.. rubric:: Methods Documentation

Expand All @@ -51,14 +51,17 @@
~Scatter.data
~Scatter.visible
~Scatter.color_indices
~Scatter.alpha
~Scatter.size
~Scatter.overlay_colormap
~Scatter.overlay_visible
~Scatter.color_normalization_method

.. rubric:: Attributes Summary

.. autosummary::

~Artist.ax
~Artist.categorical_colormap

.. rubric:: Methods Summary

Expand All @@ -79,11 +82,14 @@
.. autoattribute:: visible
.. autoattribute:: color_indices
.. autoattribute:: size
.. autoattribute:: alpha
.. autoattribute:: overlay_colormap
.. autoattribute:: overlay_visible
.. autoattribute:: color_normalization_method

.. rubric:: Attributes Documentation

.. autoattribute:: ax
.. autoattribute:: categorical_colormap

.. rubric:: Methods Documentation

Expand All @@ -105,21 +111,28 @@
~Histogram2D.visible
~Histogram2D.color_indices
~Histogram2D.bins
~Histogram2D.histogram_colormap
~Histogram2D.histogram
~Histogram2D.histogram_colormap
~Histogram2D.histogram_interpolation
~Histogram2D.histogram_color_normalization_method
~Histogram2D.overlay_colormap
~Histogram2D.overlay_interpolation
~Histogram2D.overlay_color_normalization_method
~Histogram2D.overlay_opacity
~Histogram2D.overlay_visible


.. rubric:: Attributes Summary

.. autosummary::

~Artist.ax
~Artist.categorical_colormap

.. rubric:: Methods Summary

.. autosummary::

~Histogram2D.indices_in_above_threshold_patches
~Histogram2D.indices_in_patches_above_threshold
~Histogram2D.draw

.. rubric:: Signals Summary
Expand All @@ -135,17 +148,24 @@
.. autoattribute:: visible
.. autoattribute:: color_indices
.. autoattribute:: bins
.. autoattribute:: histogram_colormap
.. autoattribute:: histogram
.. autoattribute:: histogram_colormap
.. autoattribute:: histogram_interpolation
.. autoattribute:: histogram_color_normalization_method
.. autoattribute:: overlay_colormap
.. autoattribute:: overlay_interpolation
.. autoattribute:: overlay_color_normalization_method
.. autoattribute:: overlay_opacity
.. autoattribute:: overlay_visible


.. rubric:: Attributes Documentation

.. autoattribute:: ax
.. autoattribute:: categorical_colormap

.. rubric:: Methods Documentation

.. automethod:: indices_in_above_threshold_patches
.. automethod:: indices_in_patches_above_threshold
.. automethod:: draw

.. rubric:: Signals Documentation
Expand Down
37 changes: 19 additions & 18 deletions docs/examples/canvas_widget_example.ipynb

Large diffs are not rendered by default.

464 changes: 423 additions & 41 deletions docs/examples/histogram_artist_example.ipynb

Large diffs are not rendered by default.

212 changes: 185 additions & 27 deletions docs/examples/scatter_artist_example.ipynb

Large diffs are not rendered by default.

Binary file modified docs/images/ellipse_selector.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/lasso_selector.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/rectangle_selector.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This package is not intended to be a napari plugin by itself, but it is intended

## Installation

* Make sure you have Python in your computer, e.g. download [miniforge](https://github.com/conda-forge/miniforge?tab=readme-ov-file#download).
* Make sure you have Python in your computer, e.g. download [miniforge](https://conda-forge.org/download/).

* Create a new environment, for example, like this:

Expand Down
4 changes: 4 additions & 0 deletions docs/selectors_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@
.. automethod:: on_button_press
.. automethod:: remove

.. rubric:: Signals Documentation

.. autoattribute:: selection_applied_signal

.. rubric:: Slots Methods Documentation

.. automethod:: update_active_artist
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"

[tool.black]
line-length = 79
target-version = ['py38', 'py39', 'py310']
target-version = ['py39', 'py310', 'py311', 'py312']


[tool.ruff]
Expand Down Expand Up @@ -52,5 +52,5 @@ exclude = [
"*_vendor*",
]

target-version = "py39"
target-version = "py310"
fix = true
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ classifiers =
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Topic :: Scientific/Engineering :: Image Processing
project_urls =
Bug Tracker = https://github.com/BiAPoL/biaplotter/issues
Expand Down
15 changes: 11 additions & 4 deletions src/biaplotter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
__version__ = "0.0.5alpha.3"
__version__ = "0.0.6"
from .artists import Histogram2D, Scatter
from .colormap import BiaColormap
from .plotter import CanvasWidget
from .artists import Scatter, Histogram2D
from .selectors import InteractiveRectangleSelector, InteractiveEllipseSelector, InteractiveLassoSelector
from .selectors import (InteractiveEllipseSelector, InteractiveLassoSelector,
InteractiveRectangleSelector)

__all__ = (
"CanvasWidget", "Scatter", "Histogram2D", "InteractiveRectangleSelector", "InteractiveEllipseSelector", "InteractiveLassoSelector"
"CanvasWidget",
"Scatter",
"Histogram2D",
"InteractiveRectangleSelector",
"InteractiveEllipseSelector",
"InteractiveLassoSelector",
)
Loading