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

fix: Fix selection of custom label colors for napari 0.5.0 #1138

Merged
merged 3 commits into from
Jul 12, 2024

Conversation

Czaki
Copy link
Collaborator

@Czaki Czaki commented Jul 11, 2024

Summary by CodeRabbit

  • New Features

    • Improved handling of colormap properties for ROI and mask visualization based on different Napari versions.
  • Tests

    • Added a new function get_color_dict to retrieve color information in test cases, ensuring compatibility across Napari versions.

@Czaki Czaki added this to the 0.15.4 milestone Jul 11, 2024
Copy link
Contributor

coderabbitai bot commented Jul 11, 2024

Walkthrough

The updates introduce conditional handling for colormap properties in the NapariImageView class based on the version of Napari being used. This ensures compatibility across Napari versions 4.13 and 5. Additionally, a new utility function get_color_dict was added to the test suite to facilitate version-specific color property assertions, enhancing the robustness of the test cases.

Changes

Files Change Summaries
package/PartSeg/common_gui/napari_image_view.py Adjusted methods to handle colormap properties conditionally based on Napari versions 4.13 and 5.
package/tests/test_PartSeg/test_napari_image_view.py Added get_color_dict function to retrieve color information from a layer based on the Napari version.

Poem

In the code where colors dance,
Between versions, there's a chance,
Napari's hues now set with care,
Conditional love everywhere.
Tests ensure the shades are right,
Making sure our views stay bright.
Cheers to changes, pure delight! 🎨🐰


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

sourcery-ai bot commented Jul 11, 2024

🧙 Sourcery has finished reviewing your pull request!


Tips
  • Trigger a new Sourcery review by commenting @sourcery-ai review on the pull request.
  • Continue your discussion with Sourcery by replying directly to review comments.
  • You can change your review settings at any time by accessing your dashboard:
    • Enable or disable the Sourcery-generated pull request summary or reviewer's guide;
    • Change the review language;
  • You can always contact us if you have any questions or feedback.

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

We've reviewed this pull request using the Sourcery rules engine. If you would also like our AI-powered code review then let us know.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 0926915 and 018b35e.

Files selected for processing (1)
  • package/PartSeg/common_gui/napari_image_view.py (3 hunks)
Additional comments not posted (3)
package/PartSeg/common_gui/napari_image_view.py (3)

Line range hint 485-493: LGTM! Consider adding comments for better clarity.

The code changes are approved. Adding comments to explain the version-specific logic can enhance readability.

# Check Napari version and assign colormap properties accordingly
if _napari_ge_5:
    image_info.roi.colormap = self.get_roi_view_parameters(image_info)
    return
if _napari_ge_4_13:
    image_info.roi.color = self.get_roi_view_parameters(image_info)
    return

589-594: LGTM! Consider adding comments for better clarity.

The code changes are approved. Adding comments to explain the version-specific logic can enhance readability.

# Check Napari version and assign colormap properties accordingly
if _napari_ge_5:
    image_info.mask.colormap = self.mask_color()
else:
    image_info.mask.color = self.mask_color()

611-616: LGTM! Consider adding comments for better clarity.

The code changes are approved. Adding comments to explain the version-specific logic can enhance readability.

# Check Napari version and assign colormap properties accordingly
if _napari_ge_5:
    image_info.mask.colormap = colormap
else:
    image_info.mask.color = colormap

Copy link

codecov bot commented Jul 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.02%. Comparing base (ef25753) to head (1534d1a).
Report is 62 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1138      +/-   ##
===========================================
+ Coverage    93.00%   93.02%   +0.01%     
===========================================
  Files          207      207              
  Lines        32645    32656      +11     
===========================================
+ Hits         30363    30379      +16     
+ Misses        2282     2277       -5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

sonarcloud bot commented Jul 12, 2024

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 018b35e and 1534d1a.

Files selected for processing (1)
  • package/tests/test_PartSeg/test_napari_image_view.py (2 hunks)
Additional comments not posted (3)
package/tests/test_PartSeg/test_napari_image_view.py (3)

36-38: Function get_color_dict looks good!

The function correctly retrieves color_dict from colormap when NAPARI_GE_5_0 is true.


42-44: Function get_color_dict looks good!

The function correctly retrieves the color attribute of the layer when NAPARI_GE_5_0 is false.


169-173: Usage of get_color_dict in test cases looks good!

The function is correctly used to assert color properties of the mask based on the Napari version.

@Czaki Czaki changed the title fix: fix selection of label colors for napari 0.5.0 fix: Fix selection of custom label colors for napari 0.5.0 Jul 12, 2024
@Czaki Czaki merged commit 4bd99b8 into develop Jul 12, 2024
57 checks passed
@Czaki Czaki deleted the fix_color_oflabels branch July 12, 2024 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant