From 3e66476372576be969384b90fc5023d8c97af5fb Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Fri, 25 Aug 2023 12:07:08 -0400 Subject: [PATCH 1/3] Update implementation of linear sizing to more closely match matplotlib viewer. --- glue_jupyter/bqplot/scatter/layer_artist.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/glue_jupyter/bqplot/scatter/layer_artist.py b/glue_jupyter/bqplot/scatter/layer_artist.py index 9d997658..882f98b8 100644 --- a/glue_jupyter/bqplot/scatter/layer_artist.py +++ b/glue_jupyter/bqplot/scatter/layer_artist.py @@ -91,11 +91,9 @@ def __init__(self, view, viewer_state, layer_state=None, layer=None): # Scatter points - self.scale_size_scatter = bqplot.LinearScale() self.scale_color_scatter = bqplot.ColorScale() self.scales_scatter = dict( self.view.scales, - size=self.scale_size_scatter, color=self.scale_color_scatter, ) @@ -270,15 +268,15 @@ def _update_visual_attributes(self, changed, force=False): self.state.size * self.state.size_scaling, ) self.scatter_mark.size = None - self.scale_size_scatter.min = 0 - self.scale_size_scatter.max = 1 else: - self.scatter_mark.default_size = int(self.state.size_scaling * 25) - self.scatter_mark.size = ensure_numerical( - self.layer[self.state.size_att].ravel() - ) - self.scale_size_scatter.min = float_or_none(self.state.size_vmin) - self.scale_size_scatter.max = float_or_none(self.state.size_vmax) + self.scatter_mark.default_size = int(self.state.size_scaling * 7) + s = ensure_numerical(self.layer[self.state.size_att].ravel()) + s = (s - self.state.size_vmin) / (self.state.size_vmax - self.state.size_vmin) + np.clip(s, 0, 1, out=s) + s *= 0.95 + s += 0.05 + s *= self.scatter_mark.default_size + self.scatter_mark.size = s ** 2 if ( self.state.vector_visible From 410f37def838133c3e0a4d0cae0bcf1dcd306c90 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Fri, 25 Aug 2023 14:02:51 -0400 Subject: [PATCH 2/3] Codestyle fixes. --- glue_jupyter/bqplot/scatter/layer_artist.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glue_jupyter/bqplot/scatter/layer_artist.py b/glue_jupyter/bqplot/scatter/layer_artist.py index 882f98b8..c42db619 100644 --- a/glue_jupyter/bqplot/scatter/layer_artist.py +++ b/glue_jupyter/bqplot/scatter/layer_artist.py @@ -271,7 +271,8 @@ def _update_visual_attributes(self, changed, force=False): else: self.scatter_mark.default_size = int(self.state.size_scaling * 7) s = ensure_numerical(self.layer[self.state.size_att].ravel()) - s = (s - self.state.size_vmin) / (self.state.size_vmax - self.state.size_vmin) + s = ((s - self.state.size_vmin) / + (self.state.size_vmax - self.state.size_vmin)) np.clip(s, 0, 1, out=s) s *= 0.95 s += 0.05 From 807daeebbdca1f2662cd6b2fd645df782982f4e0 Mon Sep 17 00:00:00 2001 From: Jon Carifio Date: Wed, 6 Sep 2023 02:10:43 -0400 Subject: [PATCH 3/3] Update hashes for CircleCI reference images. --- glue_jupyter/tests/images/py311-test-visual.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glue_jupyter/tests/images/py311-test-visual.json b/glue_jupyter/tests/images/py311-test-visual.json index dcb3f742..c2c0d65c 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]": "3fe576be80889cc20063dd9e17f39899b2e40fb9a779eaa02e19b01181b332aa", - "glue_jupyter.bqplot.scatter.tests.test_visual.test_visual_scatter2d_density[chromium]": "f09681c1d9aea95612e4a268ab9ada15f5cb7c0158bfc5b13ccb0c890779feb2" -} \ No newline at end of file + "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" +}