From d3d640792cc79972a3dbcaff8ae78ae1be48dfdf Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Thu, 26 Oct 2023 16:17:04 +0100 Subject: [PATCH 1/2] Make use of latest improvements to custom stretches in glue-core --- glue_jupyter/bqplot/image/layer_artist.py | 2 +- glue_jupyter/bqplot/scatter/layer_artist.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glue_jupyter/bqplot/image/layer_artist.py b/glue_jupyter/bqplot/image/layer_artist.py index 5613cee7..dffff1a4 100644 --- a/glue_jupyter/bqplot/image/layer_artist.py +++ b/glue_jupyter/bqplot/image/layer_artist.py @@ -116,7 +116,7 @@ def _update_image(self, force=False, **kwargs): if force or any(prop in changed for prop in ('v_min', 'v_max', 'contrast', 'bias', 'alpha', 'color_mode', 'cmap', 'color', 'zorder', - 'visible', 'stretch', + 'visible', 'stretch', 'stretch_parameters', 'bitmap_visible', 'contour_visible')): self._update_visual_attributes() if force or 'levels' in changed: diff --git a/glue_jupyter/bqplot/scatter/layer_artist.py b/glue_jupyter/bqplot/scatter/layer_artist.py index 6164b663..6434f052 100644 --- a/glue_jupyter/bqplot/scatter/layer_artist.py +++ b/glue_jupyter/bqplot/scatter/layer_artist.py @@ -264,7 +264,7 @@ def _update_visual_attributes(self, changed, force=False): self.density_mark.vmax = self.state.cmap_vmax if force or "stretch" in changed: - self.density_mark.stretch = STRETCHES[self.state.stretch]() + self.density_mark.stretch = self.state.stretch_object if force or "dpi" in changed: self.density_mark.dpi = self._viewer_state.dpi From 4d4400ba67d366113446ffc99293987639ce259e Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Tue, 5 Dec 2023 14:39:22 +0000 Subject: [PATCH 2/2] Bump minimum required version of glue-core to v1.17.1 --- glue_jupyter/tests/images/py311-test-visual.json | 6 +++--- setup.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glue_jupyter/tests/images/py311-test-visual.json b/glue_jupyter/tests/images/py311-test-visual.json index c2c0d65c..ffafa5e4 100644 --- a/glue_jupyter/tests/images/py311-test-visual.json +++ b/glue_jupyter/tests/images/py311-test-visual.json @@ -1,4 +1,4 @@ { - "glue_jupyter.bqplot.scatter.tests.test_visual.test_visual_scatter2d[chromium]": "edd4e65c87369bc6e403f45e87d914223bc13f42c2f90a55535614923e233c00", - "glue_jupyter.bqplot.scatter.tests.test_visual.test_visual_scatter2d_density[chromium]": "60f38b822f89603874cd508e0c320db92185129631dd89a58624dd667eb8a5a7" -} + "glue_jupyter.bqplot.scatter.tests.test_visual.test_visual_scatter2d[chromium]": "fbdd9fe2649a0d72813c03e77af6233909df64207cb834f28da479f50b9e7a1d", + "glue_jupyter.bqplot.scatter.tests.test_visual.test_visual_scatter2d_density[chromium]": "d843a816a91e37cb0212c7caae913d7563f6c2eb42b49fa18345a5952e093b2f" +} \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 281f4276..67db47f0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,7 @@ python_requires = >=3.8 setup_requires = setuptools_scm install_requires = - glue-core>=1.14.1 + glue-core>=1.17.1 glue-vispy-viewers>=1.0 notebook>=4.0 ipympl>=0.3.0