Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pyqt scatter widget #270

Merged
merged 102 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
71c2110
simplify conditional
melonora Mar 28, 2024
93ca0ed
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora May 21, 2024
537853d
basic pyqt graph
fjorka May 31, 2024
2460d47
mouse actions test
fjorka Jun 5, 2024
3288add
editable rois added
fjorka Jun 6, 2024
26a95b9
working gradient widget
fjorka Jun 17, 2024
f363842
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora Jun 19, 2024
5bd4aca
discret data works with lut widget
fjorka Jun 20, 2024
93dc9fa
discrete widget prototype
fjorka Jun 21, 2024
07f60a5
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora Jun 24, 2024
784e95b
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora Jun 24, 2024
03b424e
discrete color widget works
fjorka Jun 25, 2024
83c4d02
Rectangular selection implemented
fjorka Jun 25, 2024
1a7d2a9
complex shapes columns saved with names
fjorka Jun 26, 2024
1a1ef7c
translocation of ROIs works
fjorka Jun 27, 2024
9b8913c
shortcuts implemented
fjorka Jun 27, 2024
a0ed8aa
highlight sensitivity linked to zoom
fjorka Jul 8, 2024
238dfd1
display discrete values by name
fjorka Jul 8, 2024
f63a0f4
fixed histogram notches
fjorka Jul 8, 2024
ff81309
fixed sensitivity issues with debouncing timer
fjorka Jul 8, 2024
79a2a50
Merge branch 'scverse:main' into main
melonora Jul 9, 2024
ffc88c8
Merge branch 'main' into kmk-scatter-pg
fjorka Jul 11, 2024
9900545
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 11, 2024
5467df1
main fix for merge
fjorka Jul 22, 2024
6ef6929
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 22, 2024
29b1579
Merge branch 'scverse:main' into main
melonora Jul 22, 2024
5ee4962
rename dialog
fjorka Jul 22, 2024
0f177ab
Merge branch 'kmk-scatter-pg' of https://github.com/fjorka/napari-spa…
fjorka Jul 22, 2024
5af973f
Merge branch 'main' into kmk-scatter-pg
fjorka Jul 22, 2024
f731e4c
Merge branch 'main' into kmk-scatter-pg
fjorka Jul 22, 2024
8f49fc2
Merge branch 'main' into kmk-scatter-pg
fjorka Jul 23, 2024
a6a0764
Merge branch 'kmk-scatter-pg' of https://github.com/fjorka/napari-spa…
fjorka Jul 23, 2024
eedb0d6
tests - part 1
fjorka Jul 23, 2024
c35df51
tests part 2
fjorka Jul 23, 2024
6a01f72
pyqtgraph added to the setup
fjorka Jul 23, 2024
5b43711
notebook - update_01
fjorka Jul 24, 2024
6cafd0a
changed initialization logic
fjorka Jul 24, 2024
b87f09e
init modified - v2
fjorka Jul 24, 2024
721ff71
logger trim
fjorka Jul 24, 2024
c223d84
Merge branch 'main' into kmk-scatter-pg
fjorka Jul 24, 2024
272167a
axis naming fixed
fjorka Jul 25, 2024
78b7c25
scatter export connects with the main viewer
fjorka Jul 29, 2024
d36ce91
saving implemented
fjorka Jul 31, 2024
6a994cc
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 31, 2024
c754f36
allow annotation overwriting
fjorka Jul 31, 2024
6b1e0ce
Merge branch 'kmk-scatter-pg' of https://github.com/fjorka/napari-spa…
fjorka Jul 31, 2024
9192fe2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 31, 2024
b8d0b1b
style fix
fjorka Jul 31, 2024
c7584eb
allow annotation overwriting - part2
fjorka Jul 31, 2024
91a90b6
Merge branch 'main' into kmk-scatter-pg
fjorka Jul 31, 2024
f3c3eae
overwrite warning
fjorka Jul 31, 2024
98b4851
pyqt5 in cfg
fjorka Jul 31, 2024
c13f799
cfg test
fjorka Jul 31, 2024
ec02ce5
test cfg 2
fjorka Jul 31, 2024
7f451b0
status updates added
fjorka Jul 31, 2024
1db8433
corrections for scatterwidget init
fjorka Aug 1, 2024
6449419
plot widget tests updated
fjorka Aug 5, 2024
035c9c8
fixtures fixed
fjorka Aug 5, 2024
b7d1465
export tests
fjorka Aug 5, 2024
7ca47ce
PEP8 name changes
fjorka Aug 6, 2024
ac38bd6
PEP8 vs mouse events war resolved. Mice won.
fjorka Aug 6, 2024
3e8845b
notebooks - part_1
fjorka Aug 6, 2024
c791d2d
notebooks - part_2
fjorka Aug 6, 2024
5a2de2e
Merge branch 'scverse:main' into main
melonora Aug 9, 2024
bcfd988
workaround mouse bug windows and macOS
LucaMarconato Aug 15, 2024
efb3da7
fix paths icons
LucaMarconato Aug 19, 2024
6e12897
Merge branch 'main' into kmk-scatter-pg
LucaMarconato Aug 19, 2024
fb2f513
adding pytest-mock to test install requirements
LucaMarconato Aug 19, 2024
f6b13b8
small fixes
LucaMarconato Aug 19, 2024
44c3fd0
Merge branch 'main' into kmk-scatter-pg
fjorka Aug 26, 2024
1acdd85
remove points border
fjorka Aug 26, 2024
d71e8a5
Merge branch 'main' into kmk-scatter-pg
fjorka Aug 26, 2024
bcb97e8
changes to the notebooks based on the review
fjorka Aug 26, 2024
0896365
Merge branch 'kmk-scatter-pg' of https://github.com/fjorka/napari-spa…
fjorka Aug 26, 2024
9191c7e
index
fjorka Aug 26, 2024
48ea7b2
initial_pos initialized
fjorka Aug 26, 2024
b274305
control of auto range changed
fjorka Aug 27, 2024
e1ce4b9
Merge branch 'main' into kmk-scatter-pg
fjorka Aug 27, 2024
a59c28c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
6416425
Merge branch 'main' into kmk-scatter-pg
fjorka Aug 27, 2024
26dc1ed
improved comments for tests
fjorka Aug 27, 2024
eaeaed6
Merge branch 'kmk-scatter-pg' of https://github.com/fjorka/napari-spa…
fjorka Aug 27, 2024
219b1bb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
f8d4166
pyqtgraph dropped from docs and readthedocs
fjorka Aug 27, 2024
019c518
fixed finding view widget by number
fjorka Aug 27, 2024
6f8ce1e
Merge branch 'kmk-scatter-pg' of https://github.com/fjorka/napari-spa…
fjorka Aug 27, 2024
ef619d8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
973ebcc
updated changelog
fjorka Aug 27, 2024
162fa5b
Merge branch 'kmk-scatter-pg' of https://github.com/fjorka/napari-spa…
fjorka Aug 27, 2024
4c29d6b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
64d1466
fix position line placement
fjorka Aug 28, 2024
d40fb7c
Explicitly asking to install napari
fjorka Aug 28, 2024
ccdd69f
unification of notebooks starting parts
fjorka Aug 28, 2024
7576271
Merge branch 'scverse:main' into main
melonora Sep 7, 2024
85e5c61
Merge branch 'scverse:main' into main
melonora Sep 19, 2024
dcc6b68
Merge branch 'scverse:main' into main
melonora Oct 14, 2024
3036463
Merge branch 'scverse:main' into main
melonora Dec 2, 2024
c316ad2
merge main
melonora Dec 6, 2024
3792658
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 6, 2024
7909df8
fix data update
melonora Dec 6, 2024
1ce6258
Merge branch 'kmk-scatter-pg' of https://github.com/fjorka/napari-spa…
melonora Dec 6, 2024
7d60e03
updated notebooks
LucaMarconato Dec 17, 2024
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
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,25 @@ and this project adheres to [Semantic Versioning][].
- Bug when changing channel for a multichannel image #301 #302
- Bug when plotting catgorical annotations on points #304

## [0.5.3] - 2024-08-

### Added

- New Scatter Widget based on PyQtGraph, replacing the previous Matplotlib-based widget.
- New Features:
- Separate color controls for continuous and discrete data:
- Continuous: Histogram of values, LUT adjustment, contrast control.
- Discrete: Scrollable legend, class color modification.
- Pseudohistogram plot for single-axis data.
- Highlight nearby data points under the cursor with dynamic status display.
- Expanded ROI annotations (lasso and rectangle tools)
- Multiple disjointed ROIs with modifiable options.
- Annotation name dialog for saving annotations.

### Updated

Documentation: Notebooks updated with the new Scatter Widget information and screenshots.

## [0.5.2] - 2024-08-16

### Minor
Expand Down
1 change: 1 addition & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ cli.md
notebooks/nanostring_analysis
notebooks/mibitof_analysis
notebooks/scatterwidget
notebooks/scatterwidget_annotation
```
216 changes: 72 additions & 144 deletions docs/notebooks/mibitof_analysis.ipynb

Large diffs are not rendered by default.

325 changes: 124 additions & 201 deletions docs/notebooks/nanostring_analysis.ipynb

Large diffs are not rendered by default.

361 changes: 332 additions & 29 deletions docs/notebooks/scatterwidget.ipynb

Large diffs are not rendered by default.

318 changes: 318 additions & 0 deletions docs/notebooks/scatterwidget_annotation.ipynb

Large diffs are not rendered by default.

410 changes: 182 additions & 228 deletions docs/notebooks/spatialdata.ipynb

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ exclude = [
"__pycache__",
"build",
"docs/_build",
"docs/notebooks",
"dist",
"setup.py",
]
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ install_requires =
packaging
pandas
pillow
pyqtgraph
qtpy
scanpy
scipy
Expand All @@ -69,6 +70,7 @@ test =
loguru
pytest
pytest-cov # https://pytest-cov.readthedocs.io/en/latest/
pytest-mock # https://pytest-mock.readthedocs.io/en/latest/
pytest-qt # https://pytest-qt.readthedocs.io/en/latest/
pre-commit>=2.9.0

Expand Down
Loading
Loading