Merge pull request #409 from astrofrog/stretch-instances

Make use of latest improvements to custom stretches in glue-core
glue-viz · Dec 7, 2023 · 307a11d · 307a11d
2 parents 85ef4ac + 4d4400b
commit 307a11d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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

diff --git 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"
+}
diff --git 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