Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

helper and viewer-level access to data_labels properties #2626

Merged
merged 3 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ API Changes
- ``width`` argument in Line Analysis plugin is renamed to ``continuum_width`` and ``width``
will be removed in a future release. [#2587]

- New API access to ``viz.data_labels``, ``viewer.data_labels_visible``, and
``viewer.data_labels_loaded``. [#2626]

Cubeviz
^^^^^^^

Expand Down
53 changes: 43 additions & 10 deletions jdaviz/configs/default/plugins/viewers.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,58 @@
@property
def user_api(self):
# default exposed user APIs. Can override this method in any particular viewer.
if not isinstance(self, TableViewer):
expose = ['data_labels', 'data_labels_loaded', 'data_labels_visible']
else:
expose = []

Check warning on line 42 in jdaviz/configs/default/plugins/viewers.py

View check run for this annotation

Codecov / codecov/patch

jdaviz/configs/default/plugins/viewers.py#L42

Added line #L42 was not covered by tests
if isinstance(self, BqplotImageView):
if isinstance(self, AstrowidgetsImageViewerMixin):
expose = ['save',
'center_on', 'offset_by', 'zoom_level', 'zoom',
'colormap_options', 'set_colormap',
'stretch_options', 'stretch',
'autocut_options', 'cuts',
'marker', 'add_markers', 'remove_markers', 'reset_markers',
'blink_once', 'reset_limits']
expose += ['save',
'center_on', 'offset_by', 'zoom_level', 'zoom',
'colormap_options', 'set_colormap',
'stretch_options', 'stretch',
'autocut_options', 'cuts',
'marker', 'add_markers', 'remove_markers', 'reset_markers',
'blink_once', 'reset_limits']
else:
# cubeviz image viewers don't inherit from AstrowidgetsImageViewerMixin yet,
# but also shouldn't expose set_limits because of equal aspect ratio concerns
expose = []
expose += []
elif isinstance(self, TableViewer):
expose = []
expose += []

Check warning on line 57 in jdaviz/configs/default/plugins/viewers.py

View check run for this annotation

Codecov / codecov/patch

jdaviz/configs/default/plugins/viewers.py#L57

Added line #L57 was not covered by tests
else:
expose = ['set_limits', 'reset_limits']
expose += ['set_limits', 'reset_limits']
return ViewerUserApi(self, expose=expose)

@property
def data_labels_loaded(self):
"""
List of data labels loaded in this viewer.

Returns
-------
data_labels : list
list of strings
"""
viewer_item = self.jdaviz_app._get_viewer_item(self.reference_id)
return [self.jdaviz_app._get_data_item_by_id(data_id)['name']
for data_id in viewer_item.get('selected_data_items', {}).keys()]

@property
def data_labels_visible(self):
"""
List of data labels visible in this viewer.

Returns
-------
data_labels : list
list of strings
"""
viewer_item = self.jdaviz_app._get_viewer_item(self.reference_id)
return [self.jdaviz_app._get_data_item_by_id(data_id)['name']
for data_id, visibility in viewer_item.get('selected_data_items', {}).items()
if visibility != 'hidden']

def reset_limits(self):
"""
Reset viewer axes limits.
Expand Down
12 changes: 12 additions & 0 deletions jdaviz/core/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,18 @@ def load_data(self, data, data_label=None, parser_reference=None, **kwargs):
kwargs['data_label'] = data_label
self.app.load_data(data, parser_reference=parser_reference, **kwargs)

@property
def data_labels(self):
"""
List of data labels loaded and available in jdaviz

Returns
-------
data_labels : list
list of strings
"""
return [data.label for data in self.app.data_collection]

@property
def plugins(self):
"""
Expand Down
9 changes: 9 additions & 0 deletions jdaviz/tests/test_user_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,12 @@ def test_specviz_zoom_level(specviz_helper):
assert v._obj.state.x_max == 2
assert v._obj.state.y_min == 1
assert v._obj.state.y_max == 2


def test_specviz_data_labels(specviz_helper, spectrum1d):
label = "Test 1D Spectrum"
specviz_helper.load_data(spectrum1d, data_label=label)

assert specviz_helper.data_labels == [label]
assert specviz_helper.viewers['spectrum-viewer'].data_labels_loaded == [label]
assert specviz_helper.viewers['spectrum-viewer'].data_labels_visible == [label]
Loading