Skip to content

New masking features#1815

Merged
bnmajor merged 19 commits intomasterfrom
new-masking-features
May 13, 2025
Merged

New masking features#1815
bnmajor merged 19 commits intomasterfrom
new-masking-features

Conversation

@bnmajor
Copy link
Collaborator

@bnmajor bnmajor commented Mar 26, 2025

  • Only apply changes to mask presentation on button press, not automatically
  • Remember which image mode a mask was created in
  • Remember which x-ray source was selected when the mask was created (if applicable)
  • Update mask manager dialog to use a tree view instead of a table view
  • Organize masks by view mode + x-ray source in tree
  • Keep backwards compatibility with old mask file versions
  • Automatically hide masks that were not created in the current view mode with the current x-ray source
  • Collapse mask categories that do not match current x-ray source
  • Allow users to skip this automatic mask hiding functionality if desired Skipping for now
  • Make sure that masks are sorted properly based on name then value
  • Remove old print statement in the hand drawn mask dialog
  • Add new top-level category that is not view mode specific ("global" or something similar)
  • Move info and "apply changes" button to bottom of dialog
  • Test threshold masking in all image modes

Addresses #1791

@bnmajor bnmajor force-pushed the new-masking-features branch 2 times, most recently from c12d623 to 7246347 Compare March 27, 2025 20:06
@bnmajor bnmajor marked this pull request as ready for review March 27, 2025 20:49
@bnmajor bnmajor requested review from psavery and saransh13 April 2, 2025 16:06
@bnmajor bnmajor force-pushed the new-masking-features branch from 1998c97 to 7687708 Compare April 11, 2025 18:13
@psavery psavery force-pushed the new-masking-features branch from 7687708 to 54efdb0 Compare April 17, 2025 22:29
@psavery
Copy link
Collaborator

psavery commented Apr 17, 2025

This was just rebased on master...

@bnmajor bnmajor mentioned this pull request May 7, 2025
4 tasks
@bnmajor bnmajor force-pushed the new-masking-features branch 2 times, most recently from 6dcad31 to a7e3684 Compare May 8, 2025 22:53
@bnmajor bnmajor mentioned this pull request May 9, 2025
1 task
bnmajor added 18 commits May 12, 2025 09:00
Instead of automatically updating masks as the presentation combo box is
changed, changes are tracked and only applied once "Apply Changes" is clicked.

Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Rather that a full re-creation of the tree on mask addition/deletion/re-name,
update in place. This preserves the collapsed/expanded state of all parent
items as changes are made.

Signed-off-by: Brianna Major <brianna.major@kitware.com>
If an instrument has multiple x-ray sources then when we are in polar mode we
will automatically hide any masks created for a different x-ray source than the
current selection. Those sections are also automatically collapsed in the
MaskManagerDialog and the section with masks that match the current x-ray
source is expanded.

Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Break the name into chunks so that we sort strings correctly and sort integers
numerically ([1, 2, ..., 10, ..., 20, ...]) rather than as strings
([1, 10, ..., 2, 20, ...]).

Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
This will include threshold and pinhole masks, which should not be associated
with a specific view mode.

Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
Signed-off-by: Brianna Major <brianna.major@kitware.com>
@bnmajor bnmajor force-pushed the new-masking-features branch 3 times, most recently from 276f5b0 to bc985a8 Compare May 13, 2025 14:27
Copy link
Member

@saransh13 saransh13 left a comment

Choose a reason for hiding this comment

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

LGTM

@bnmajor bnmajor merged commit e303861 into master May 13, 2025
9 checks passed
@bnmajor bnmajor deleted the new-masking-features branch May 13, 2025 19:46
@bnmajor bnmajor mentioned this pull request May 16, 2025
7 tasks
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.

3 participants