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

Support new CircularAnnulusROI #92

Merged
merged 1 commit into from
Jun 1, 2023

Conversation

pllim
Copy link
Contributor

@pllim pllim commented May 12, 2023

Support new CircularAnnulusROI from glue-viz/glue#2403 (not yet merged when this PR is opened, so dev tests might fail, so we need to rerun that when it is merged upstream) by building on #90 .

Motivation: Instead of exposting the outer and inner circles separately in Jdaviz, we can now expose the proper annulus parameters by using this new ROI.

🐱

@codecov
Copy link

codecov bot commented May 12, 2023

Codecov Report

Patch coverage: 60.00% and project coverage change: -0.68 ⚠️

Comparison is base (dab988a) 97.38% compared to head (8ce9ecc) 96.71%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #92      +/-   ##
==========================================
- Coverage   97.38%   96.71%   -0.68%     
==========================================
  Files          18       18              
  Lines        1379     1399      +20     
==========================================
+ Hits         1343     1353      +10     
- Misses         36       46      +10     
Impacted Files Coverage Δ
glue_astronomy/translators/tests/test_regions.py 98.66% <50.00%> (-0.67%) ⬇️
glue_astronomy/translators/regions.py 91.48% <61.90%> (-5.29%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@pllim
Copy link
Contributor Author

pllim commented May 12, 2023

The patch coverage will be low because for a given glue version, it will go a specific route, and not the other one.

@pllim
Copy link
Contributor Author

pllim commented May 12, 2023

And you will see import error for dev tests until glue-viz/glue#2403 is merged.

pllim added a commit to pllim/jdaviz that referenced this pull request May 12, 2023
and allow IMPORT DATA to load reg files.

Annulus support needs glue-viz/glue#2403 and glue-viz/glue-astronomy#92

[ci skip] [skip rtd]
@pllim
Copy link
Contributor Author

pllim commented May 16, 2023

A maintainer can please rerun the failed jobs. They should pass now, hopefully.

Copy link
Member

@astrofrog astrofrog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@astrofrog astrofrog merged commit 755874d into glue-viz:main Jun 1, 2023
@pllim pllim deleted the annulus-of-green-gables branch June 1, 2023 13:14
@pllim
Copy link
Contributor Author

pllim commented Jun 1, 2023

Thanks for the merge! What is your timeline for release?

@dhomeier dhomeier added the enhancement New feature or request label Jun 1, 2023
@dhomeier dhomeier changed the title FEAT: Support new CircularAnnulusROI Support new CircularAnnulusROI Jun 1, 2023
@dhomeier
Copy link
Contributor

dhomeier commented Jun 1, 2023

The glue side is released in 1.11.0, right?

@pllim
Copy link
Contributor Author

pllim commented Jun 1, 2023

@dhomeier , I don't know as glue-viz/glue#2403 is not milestoned.

@dhomeier
Copy link
Contributor

dhomeier commented Jun 1, 2023

It is https://github.com/glue-viz/glue/releases/tag/v1.11.0

@pllim
Copy link
Contributor Author

pllim commented Jun 1, 2023

@dhomeier , does this mean we need to bump glue pin here?

@dhomeier
Copy link
Contributor

dhomeier commented Jun 1, 2023

The tests passed with 1.10.0 as well https://github.com/glue-viz/glue-astronomy/actions/runs/4962038394/jobs/8949618535 (I am afraid we missed to clean up the GLUE_LT_1_10_1 here!); obviously the new translator would not be available then, but probably no need to enforce version >= 1.11.0.

@pllim
Copy link
Contributor Author

pllim commented Jun 1, 2023

missed to clean up

Ooops... Do you want me to PR?

@dhomeier
Copy link
Contributor

dhomeier commented Jun 1, 2023

Dunno, does this require a bugfix release? Functionally it should not make a difference, as there probably will be no glue-core 1.10.1...
Could still fix it for the next regular release.

@pllim
Copy link
Contributor Author

pllim commented Jun 1, 2023

Oh, in that case, I don't think it needs to change? Just a matter of pedantic?

pllim added a commit to pllim/jdaviz that referenced this pull request Jun 5, 2023
and allow IMPORT DATA to load reg files.

Annulus support provided by glue-viz/glue#2403 and glue-viz/glue-astronomy#92

Add test for exception.

Bump minimum requirements for glue-core and glue-astronomy.
rosteen added a commit to spacetelescope/jdaviz that referenced this pull request Jun 13, 2023
* Added .ico and .svg files

* app-wide display unit in specviz (#2048)

* basic app-wide display unit in specviz (not all plugins are updated yet)
* unit-aware select component which maps to glue-supported unit strings
* implement use_display_units option for get_data, get_subsets

Co-authored-by: Jesse Averbukh <[email protected]>
Co-authored-by: Kyle Conroy <[email protected]>

* bump glue-core to necessary version for display units

* change PR number in changelog to main PR

* Display units line analysis (#2128)

* emit event when display unit changed
* update line analysis for unit changes

* cubeviz/slice plugin unit conversion support

(we might want to generalize some of this logic more into the mark's _update_data when adding support for spectral lines as well)

* Display units support for markers plugin (#2130)

* update markers plugin for display units
* move unit-updating logic to mark itself
* LineUncertainties to be unit-aware
* fix support for markers in cubeviz

* display units: fix failing tests (#2132)

* fix error raised when spectrum uncertainty is None
* fix RTD build failure because of missing mixin available in import
* fix test setting display unit now that um is preferred to micron
* add disabled unit conversion plugin to mosviz
* avoid unit-conversion error in cubeviz tests
* bump versions of glue/glue-jupyter
* fix deg intialization in cubeviz slice plugin
* add LinesAutoUnit to __all__ so RTD can find it
* add use_display_units kwarg to get_spectral_regions
* fix setting display units for unitless data
* Apply suggestions from code review

Co-authored-by: P. L. Lim <[email protected]>

* Display units: line lists (#2148)

* BaseSpectrumVerticalLine to inherit unit-support from PluginMark
* convert units on internal rest value
* code cleanup

* remove unit conversion plugin from all bug specviz

* for initial implementation - eventually we'll want to implement across all plugins/viewers

* get_display_unit fallback for configs without unit conversion plugin

* Update glue-core dependency

* Update Subset Tools plugin to use display units (#2195)

* bump glue-core to necessary version for display units

* cubeviz/slice plugin unit conversion support

(we might want to generalize some of this logic more into the mark's _update_data when adding support for spectral lines as well)

* display units: fix failing tests (#2132)

* fix error raised when spectrum uncertainty is None
* fix RTD build failure because of missing mixin available in import
* fix test setting display unit now that um is preferred to micron
* add disabled unit conversion plugin to mosviz
* avoid unit-conversion error in cubeviz tests
* bump versions of glue/glue-jupyter
* fix deg intialization in cubeviz slice plugin
* add LinesAutoUnit to __all__ so RTD can find it
* add use_display_units kwarg to get_spectral_regions
* fix setting display units for unitless data
* Apply suggestions from code review

Co-authored-by: P. L. Lim <[email protected]>

* remove unit conversion plugin from all bug specviz

* for initial implementation - eventually we'll want to implement across all plugins/viewers

* Working on unit conversion handling in subset plugin

* Get subset updating working in non-default units

* Add changelog

* Update jdaviz/configs/default/plugins/subset_plugin/subset_plugin.vue

Co-authored-by: Kyle Conroy <[email protected]>

---------

Co-authored-by: Kyle Conroy <[email protected]>
Co-authored-by: P. L. Lim <[email protected]>

* allow downstream apps to set what classes are considered native marks

* Fix unit conversion for PluginMarks and y-limits (#2215)

* Fix unit conversion for PluginMarks and y-limits

* Only use equivalency if it's a spec viewer

* Store wavelength unit on data update

* Remove redundant line

* Better check in marks

* Replace subset_to_apply in docs where possible (#2223)

* Replace subset_to_apply in docs where possible (#2223)

* Avoid trying to convert units of empty marks arrays

* Add open method to automatically detect config and load data

* Update demo notebooks

* Codestyle

* Add autoconfig test coverage

* Revert "Update demo notebooks"

This reverts commit cc513b3.

* Add mention of open to relevant example notebooks

* Prepare to support open via cli

* Remove the need to open file twice for autoconfig detection

* Fix Helper vs App Docstring

* TST: Change PIP_EXTRA_INDEX_URL
because packages moved where they upload nightly builds.

* Display units: model fitting (#2216)

* model component compatibility based on display units
* equation validity based on display units
* allow re-estimating model parameters to update compat checks
* test coverage
* get_data(use_display_units) to pass spectral_density equivalency
* handle whitespace in model equation

* Add clarity for kwargs

* plugin results: support overwriting when data loaded in multiple viewers (#2222)

* reverts removal of call to set_plot_axes when loading data into viewer (#2235)

* fixes a bug in the axes labels on cube viewers in cubeviz as well as setting the correct attributes in lcviz

* Subsume failing identifier test into autoconfig test

* Update subset plugin UI (#2234)

* Update subset plugin UI

* Apply suggestions from code review

Co-authored-by: Kyle Conroy <[email protected]>

---------

Co-authored-by: Kyle Conroy <[email protected]>

* Changelog

* Add docs page to explain how to create jdaviz-readable products (#2228)

* Add page for data products

* Update index

* Fix title

* Capital letters

* Address first review comments

* Edit format

* Apply suggestions from code review

Co-authored-by: P. L. Lim <[email protected]>

* Including reference in import_data

* Update docs/create_products.rst

* Update docs/create_products.rst

---------

Co-authored-by: Camilla Pacifici <[email protected]>
Co-authored-by: P. L. Lim <[email protected]>
Co-authored-by: Ricky O'Steen <[email protected]>

* FEAT: Load annulus from file
and allow IMPORT DATA to load reg files.

Annulus support provided by glue-viz/glue#2403 and glue-viz/glue-astronomy#92

Add test for exception.

Bump minimum requirements for glue-core and glue-astronomy.

* disallow gaussian smooth output as input

* BUG: Fix ellipse translation
in app.get_subsets()

* DOC: Use pydata-sphinx-theme (#2243)

* DOC: Use pydata-sphinx-theme
that has dark mode, modern design, and mobile friendly

DOC: No longer need tomli

DOC: Now requires sphinx-astropy 1.9.1

* Add cards to index page
with icons

* Remove iframe hardcoding so it scales
in mobile mode

* DOC: Insert small logo next to title
instead of a giant logo above the title

* Add app method to simplify spectral subset (#2237)

* Add app method to simplify spectral subset

Add simplify button to subset plugin

* Fix xor bug exposed by simplify button

* Fix style checks

* Remove print statements

* Add tooltip to simplify button

* Make button appear only if the subset can be simplified

* Make simplify button appear only when applicable

* Apply suggestions from code review

Co-authored-by: P. L. Lim <[email protected]>

* Update changes file

---------

Co-authored-by: P. L. Lim <[email protected]>

* Fix missed conflict

---------

Co-authored-by: Jennifer Kotler <[email protected]>
Co-authored-by: P. L. Lim <[email protected]>
Co-authored-by: Jesse Averbukh <[email protected]>
Co-authored-by: Ricky O'Steen <[email protected]>
Co-authored-by: Ricky O'Steen <[email protected]>
Co-authored-by: Duy Nguyen <[email protected]>
Co-authored-by: Camilla Pacifici <[email protected]>
Co-authored-by: Camilla Pacifici <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants