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 rendering of alternative representation if there are more components in the alternative representation than in ROI #1240

Merged
merged 6 commits into from
Feb 6, 2025

Conversation

Czaki
Copy link
Collaborator

@Czaki Czaki commented Feb 5, 2025

Summary by Sourcery

Bug Fixes:

  • Fixed an issue where alternative representations with more components than the ROI were not rendered correctly.

Summary by CodeRabbit

  • New Features

    • Enhanced ROI visualization with dynamic color assignment, providing more accurate and flexible display when different ROI alternatives are selected.
    • Improved handling of ROI component sizing, ensuring that visual representations adjust seamlessly based on varied component configurations.
    • Added functionality to test alternative representations of ROI data, enhancing test coverage for component size retrieval.
    • Updated project version and included new ROI entry in the project dictionary.
  • Bug Fixes

    • Corrected logic in ROI component index retrieval for improved accuracy.

@Czaki Czaki added this to the 0.16.1 milestone Feb 5, 2025
Copy link
Contributor

sourcery-ai bot commented Feb 5, 2025

Reviewer's Guide by Sourcery

The pull request fixes an issue where the alternative representation in ROI rendering would fail if it contained more components than the original ROI. This was achieved by introducing a method to retrieve the number of components in the alternative representation and using that value when determining the color mapping.

Sequence diagram for ROI component color mapping

sequenceDiagram
    participant NapariView
    participant ROIInfo
    NapariView->>ROIInfo: get_components_num(roi_alternative_selection)
    alt roi_alternative_selection is 'ROI' or not in alternative
        ROIInfo-->>NapariView: max(bound_info)
    else has alternative representation
        ROIInfo-->>NapariView: max value from alternative representation
    end
    Note over NapariView: Map colors to components<br/>using returned count
Loading

Class diagram showing ROIInfo changes

classDiagram
    class ROIInfo {
        -roi
        -bound_info
        -sizes
        -_alternative_component_size: dict
        +fit_to_image(image: Image) ROIInfo
        +get_components_num(name: str) int
        +__str__() str
    }
    note for ROIInfo "Added _alternative_component_size cache
and get_components_num method"
Loading

File-Level Changes

Change Details Files
Added a method to calculate and store the number of components in alternative ROI representations.
  • Added _alternative_component_size attribute to store component sizes.
  • Implemented get_components_num method to retrieve the number of components for a given ROI representation (default or alternative).
  • The get_components_num method caches the component size for alternative representations.
package/PartSegCore/roi_info.py
Modified the color mapping logic to use the number of components from the selected ROI representation (default or alternative).
  • Modified get_roi_view_parameters to use image_info.roi_info.get_components_num with the selected ROI alternative to determine the range for color mapping.
package/PartSeg/common_gui/napari_image_view.py

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

coderabbitai bot commented Feb 5, 2025

Walkthrough

The changes modify how ROI component counts are determined in the application. In the ImageView class, the get_roi_view_parameters method now calls the ROIInfo object's new get_components_num method using the selected ROI alternative rather than a static count. Additionally, the ROIInfo class gains a new instance variable for caching and a method that computes and returns the number of components dynamically based on the specified alternative. These modifications enable the ROI view to adapt to different component configurations without altering the overall processing flow.

Changes

File(s) Change Summary
package/PartSeg/common_gui/napari_image_view.py Modified get_roi_view_parameters to use image_info.roi_info.get_components_num(self.roi_alternative_selection) instead of image_info.roi_count.
package/PartSegCore/roi_info.py Added new method get_components_num and a caching variable _alternative_component_size to dynamically determine and cache the number of ROI components based on alternative names.
package/tests/test_PartSegCore/test_segmentation.py Renamed TestSegmentationInfo to TestROIInfo and added test_alternative method to test the functionality of ROIInfo with alternative representations.
.github/project_dict.pws Updated version number from 14 to 15 and added ROI to the project dictionary.

Sequence Diagram(s)

sequenceDiagram
    participant IV as ImageView
    participant II as ImageInfo
    participant RI as ROIInfo

    IV->>II: get_roi_view_parameters(image_info)
    II->>RI: get_components_num(roi_alternative_selection)
    alt Component count calculated
        RI-->>II: computed component count
    else Cached value exists
        RI-->>II: cached component count
    end
    II-->>IV: return ROI view parameters with color mapping based on count
Loading

Possibly related PRs

Poem

I'm a little rabbit, hopping with glee,
New dynamic code blooms like a tree.
ROI counts now flow with a clever tweak,
Colors and components no longer stale and meek.
In my code garden, fresh ideas play—hooray!
🐇✨
Happy hops to a brighter day!

Tip

🌐 Web search-backed reviews and chat
  • We have enabled web search-based reviews and chat for all users. This feature allows CodeRabbit to access the latest documentation and information on the web.
  • You can disable this feature by setting web_search: false in the knowledge_base settings.
  • Please share any feedback in the Discord discussion.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9edb953 and 20598fd.

📒 Files selected for processing (1)
  • .github/project_dict.pws (2 hunks)
⏰ Context from checks skipped due to timeout of 300000ms (13)
  • GitHub Check: 4DNucleome.PartSeg (Tests_other test windows)
  • GitHub Check: 4DNucleome.PartSeg (Tests_linux test_linux)
  • GitHub Check: 4DNucleome.PartSeg (Tests_other test macos)
  • GitHub Check: 4DNucleome.PartSeg (Builds pyinstaller windows)
  • GitHub Check: 4DNucleome.PartSeg (Builds pyinstaller macos_arm)
  • GitHub Check: 4DNucleome.PartSeg (Builds pyinstaller macos)
  • GitHub Check: 4DNucleome.PartSeg (Builds pyinstaller_linux)
  • GitHub Check: 4DNucleome.PartSeg (Builds sdist)
  • GitHub Check: 4DNucleome.PartSeg (manifest_check manifest_check)
  • GitHub Check: 4DNucleome.PartSeg (Documentation_check Notebook_check)
  • GitHub Check: 4DNucleome.PartSeg (formatting_check check_formating)
  • GitHub Check: 4DNucleome.PartSeg (Documentation_check help)
  • GitHub Check: 4DNucleome.PartSeg (GetTestData linux)
🔇 Additional comments (2)
.github/project_dict.pws (2)

1-1: LGTM: Version increment is appropriate.

The version number increment from 14 to 15 follows proper versioning practices for adding new terms to the project dictionary.


16-16: LGTM: ROI term addition is appropriate.

The addition of "ROI" to the project dictionary aligns with its usage in the codebase, particularly with the recent changes to ROI-related functionality.

Let's verify the usage of ROI term in the codebase:

✅ Verification successful

🏁 Script executed:

#!/bin/bash
# Description: Verify ROI term usage in the codebase
# Expect: Multiple occurrences confirming it's a commonly used term

rg -i "\bROI\b" --type py

Length of output: 73915


ROI Term Usage Confirmed

The “ROI” term is extensively used throughout the codebase, consistent with its addition to the project dictionary. All references in various parts of the code support its proper integration into the ROI-related functionality.

  • Usage is verified in tests, analysis, segmentation, GUI layers, and other key modules.
  • The term maintains correct capitalization and ordering in the dictionary.

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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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 using 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 generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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 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.

Hey @Czaki - I've reviewed your changes - here's some feedback:

Overall Comments:

  • In the new get_components_num method, consider adding a docstring explaining the purpose and expected behavior, especially regarding when it falls back to using bound_info and caching the alternative component size.
  • Ensure that self.alternative[name] is non-empty before using np.max on it. If there's a possibility it might be empty, add a validation or a default behavior to prevent runtime errors.
Here's what I looked at during the review
  • 🟡 General issues: 1 issue found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

if name == "ROI" or name not in self.alternative:
return max(self.bound_info)
if name not in self._alternative_component_size:
self._alternative_component_size[name] = np.max(self.alternative[name])
Copy link
Contributor

Choose a reason for hiding this comment

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

issue: Consider handling the case where self.alternative[name] is empty to avoid ValueError from np.max

np.max will raise a ValueError on empty arrays. Consider returning 0 for empty arrays or adding a check using if self.alternative[name].size > 0.

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

🧹 Nitpick comments (1)
package/PartSegCore/roi_info.py (1)

74-79: Add docstring to document the method's purpose and parameters.

The implementation is clean and efficient with good use of caching. Consider adding a docstring to document:

  • Purpose of the method
  • name parameter and its expected values
  • Return value and its meaning
 def get_components_num(self, name):
+    """
+    Get the number of components for a given representation.
+
+    Args:
+        name (str): Name of the representation. Use "ROI" for the main ROI,
+                   or the name of an alternative representation.
+
+    Returns:
+        int: Maximum component number in the specified representation.
+    """
     if name == "ROI" or name not in self.alternative:
         return max(self.bound_info)
     if name not in self._alternative_component_size:
         self._alternative_component_size[name] = np.max(self.alternative[name])
     return self._alternative_component_size[name]
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between cb68e74 and 7600fce.

📒 Files selected for processing (2)
  • package/PartSeg/common_gui/napari_image_view.py (1 hunks)
  • package/PartSegCore/roi_info.py (2 hunks)
⏰ Context from checks skipped due to timeout of 300000ms (27)
  • GitHub Check: 4DNucleome.PartSeg (Tests_other test windows)
  • GitHub Check: 4DNucleome.PartSeg (Tests_other test macos)
  • GitHub Check: 4DNucleome.PartSeg (Tests_linux test_linux)
  • GitHub Check: 4DNucleome.PartSeg (Builds pyinstaller windows)
  • GitHub Check: 4DNucleome.PartSeg (Builds pyinstaller macos_arm)
  • GitHub Check: 4DNucleome.PartSeg (Builds pyinstaller macos)
  • GitHub Check: 4DNucleome.PartSeg (Builds sdist)
  • GitHub Check: 4DNucleome.PartSeg (Builds pyinstaller_linux)
  • GitHub Check: Base py3.9 / ubuntu-24.04 py 3.9 latest PyQt5
  • GitHub Check: Base py3.12 / ubuntu-24.04 py 3.12 latest PyQt5
  • GitHub Check: Base py3.12 / ubuntu-22.04 py 3.12 latest PyQt6
  • GitHub Check: Base py3.12 / macos-14 py 3.12 latest PyQt6
  • GitHub Check: Base py3.11 / windows-latest py 3.11 latest PyQt5
  • GitHub Check: Base py3.11 / ubuntu-24.04 py 3.11 latest PyQt5
  • GitHub Check: Base py3.11 / macos-13 py 3.11 latest PyQt5
  • GitHub Check: Base py3.10 / ubuntu-24.04 py 3.10 latest PySide6
  • GitHub Check: Base py3.10 / ubuntu-24.04 py 3.10 latest PyQt5
  • GitHub Check: Base py3.10 / ubuntu-22.04 py 3.10 latest PyQt5 _pydantic_1
  • GitHub Check: Base py3.10 / ubuntu-20.04 py 3.10 latest PySide2
  • GitHub Check: Test PartSeg minimal / ubuntu-24.04 py 3.9 latest PyQt5
  • GitHub Check: test_coverage / ubuntu-24.04 py 3.12 latest PyQt5
  • GitHub Check: Test PartSeg conda
  • GitHub Check: 4DNucleome.PartSeg (formatting_check check_formating)
  • GitHub Check: 4DNucleome.PartSeg (Documentation_check help)
  • GitHub Check: 4DNucleome.PartSeg (Documentation_check Notebook_check)
  • GitHub Check: 4DNucleome.PartSeg (GetTestData linux)
  • GitHub Check: 4DNucleome.PartSeg (manifest_check manifest_check)
🔇 Additional comments (2)
package/PartSegCore/roi_info.py (1)

65-65: LGTM!

Good practice to initialize the cache dictionary in __init__.

package/PartSeg/common_gui/napari_image_view.py (1)

486-489: LGTM!

The change correctly uses the dynamic component count from ROIInfo, fixing the rendering issue when alternative representations have more components than the main ROI.

Copy link

codecov bot commented Feb 5, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.15%. Comparing base (d178e72) to head (20598fd).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #1240   +/-   ##
========================================
  Coverage    93.14%   93.15%           
========================================
  Files          210      210           
  Lines        33268    33288   +20     
========================================
+ Hits         30989    31009   +20     
  Misses        2279     2279           

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

@Czaki Czaki changed the title fix: Fix rendering alternative representaion if there are more components in alternative representation than in ROI fix: Fix rendering of alternative representation if there are more components in the alternative representation than in ROI Feb 6, 2025
Copy link

sonarqubecloud bot commented Feb 6, 2025

@Czaki Czaki merged commit cc63206 into develop Feb 6, 2025
57 checks passed
@Czaki Czaki deleted the fix_coloring_alternative branch February 6, 2025 19:22
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