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

Backport PR #2595 on branch v3.8.x (fix image layer visibility toggle via glue-jupyter) #2596

Merged
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -4,7 +4,10 @@
Bug Fixes
---------

- Compatibility with glue-core 1.17. [#2591]
- Compatibility with glue-core 1.17. [#2591, #2595]

- Fix image layer visibility toggle in plot options. [#2595]


Cubeviz
^^^^^^^
14 changes: 3 additions & 11 deletions jdaviz/configs/default/plugins/plot_options/plot_options.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
import matplotlib
import numpy as np

from astropy.utils import minversion
from astropy.visualization import (
ManualInterval, ContrastBiasStretch, PercentileInterval
)
@@ -33,8 +32,6 @@

__all__ = ['PlotOptions']

GLUE_LT_1_17 = not minversion("glue", "1.17")


class SplineStretch:
"""
@@ -92,10 +89,7 @@ def update_knots(self, x, y):

# Add the spline stretch to the glue stretch registry if not registered
if "spline" not in stretches:
if GLUE_LT_1_17:
stretches.add("spline", SplineStretch(), display="Spline")
else:
stretches.add("spline", SplineStretch, display="Spline")
stretches.add("spline", SplineStretch, display="Spline")


@tray_registry('g-plot-options', label="Plot Options")
@@ -852,10 +846,8 @@ def _update_stretch_curve(self, msg=None):
# procedure in glue's CompositeArray:
interval = ManualInterval(self.stretch_vmin_value, self.stretch_vmax_value)
contrast_bias = ContrastBiasStretch(self.image_contrast_value, self.image_bias_value)
if GLUE_LT_1_17:
stretch = stretches.members[self.stretch_function_value]
else:
stretch = stretches.members[self.stretch_function_value]()
stretch = layer.state.stretch_object

layer_cmap = layer.state.cmap

# show the colorbar
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ dependencies = [
"traitlets>=5.0.5",
"bqplot>=0.12.37",
"bqplot-image-gl>=1.4.11",
"glue-core>=1.16.0",
"glue-jupyter>=0.19",
"glue-core>=1.17.1",
"glue-jupyter>=0.20",
"echo>=0.5.0",
"ipykernel>=6.19.4",
"ipyvue>=1.6",
Loading