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.

Sign up for GitHub

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

fix: use last focused/resized view to determine shape of BqplotImageView #475

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+17 −6
Open

fix: use last focused/resized view to determine shape of BqplotImageView #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1673389
fix: use last focused/resized view to determine shape of BqplotImageView
iisakkirotko Dec 11, 2024
7562d4a
chore: bump bqplot-image-gl dependency
iisakkirotko Dec 27, 2024
6dc1708
fix: unpin solara
maartenbreddels Jan 29, 2025
ebad9ed
ci: pin playwright similar to solara for compatibility
maartenbreddels Jan 30, 2025
7f801ec
fix: pin pytest-playwright
maartenbreddels Jan 30, 2025
1d77b1d
temp: try matplotlib branch
maartenbreddels Jan 31, 2025
fbd3c2b
chore: trigger ci
maartenbreddels Jan 31, 2025
42b4706
try different dependency mix
maartenbreddels Jan 31, 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
14 changes: 12 additions & 2 deletions glue_jupyter/bqplot/image/viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from datetime import datetime

from glue.viewers.image.composite_array import CompositeArray
from bqplot_image_gl.viewlistener import ViewListener

Expand Down Expand Up @@ -81,9 +83,17 @@ def _reset_limits(self, old, new):
self.state.reset_limits()

def _on_view_change(self, *args):
views = sorted(self._vl.view_data)
# Order view_data by focused_at and then resized_at, latest change first
views = sorted(
self._vl.view_data.values(),
key=lambda x: (
datetime.fromisoformat(x['focused_at']),
datetime.fromisoformat(x['resized_at'])
),
reverse=True
)
if len(views) > 0:
first_view = self._vl.view_data[views[0]]
first_view = views[0]
self.shape = (int(first_view['height']), int(first_view['width']))
self._composite_image.update()
else:
Expand Down
9 changes: 5 additions & 4 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ install_requires =
ipywidgets>=7.4.0
ipyvue>=1.2.0,<2
ipyvuetify>=1.2.0,<2
bqplot-image-gl>=1.5.0
bqplot-image-gl>=1.6.0
bqplot>=0.12.17
bqplot-gl
scikit-image
Expand All @@ -35,10 +35,11 @@ test =
pytest-cov
nbconvert>=6.4.5
visualtest =
playwright
pytest-playwright
playwright==1.41.2
pytest-playwright==0.5.2
pytest-mpl
solara[pytest]<1.29
pytest-ipywidgets[all]
solara-ui @ https://github.com/widgetti/solara/archive/refs/heads/fix_matplotlib_backend_keyerror.zip
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something therein is pinning jupyter-client 7.x, jupyterlab 3.x and notebook 6.x now, among others.
But for visualtest only we probably can/have to live with that for now.

docs =
sphinx
sphinx-automodapi
Expand Down