Skip to content

feat(ui): canvas auto mask followups 2 #7180

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 17 commits into from
Oct 24, 2024
Merged

feat(ui): canvas auto mask followups 2 #7180

merged 17 commits into from
Oct 24, 2024

Conversation

psychedelicious
Copy link
Collaborator

Summary

  • Make auto-mask processing more resilient (see commit for technical details).
  • Remove neutral points option. They seem to do nothing. Internally the logic for them still exists in case we want to restore the functionality.
  • Rename foreground & background to include and exclude
  • Add auto-mask button to toolbar above the layers list.
  • Close the viewer when starting filter/transform/auto-mask.
  • Extend layer conversion functionality. These conversions are supported, both as "convert" and "copy to":
    • Raster Layer -> Control Layer
    • Raster Layer -> Inpaint Mask
    • Raster Layer -> Regional Guidance
    • Control Layer -> Control Layer
    • Control Layer -> Inpaint Mask
    • Control Layer -> Regional Guidance
    • Inpaint Mask -> Regional Guidance
    • Regional Guidance -> Inpaint Mask
  • Add support for sub-menus - necessary to not have footlong context menus. This is handled in useSubMenu and one tiny component. Special handling for touch/pen devices.
  • Move image context menu metadata recall actions to sub-menu.
  • Tidy up the canvas context menu. It's is now the selected layer's menu, with an extra group below for canvas actions. Sub-menus are now used for Save to Gallery and Create From Bbox.
  • Add Pull Bbox Into context menu action for global ref images. They didn't have any actions besides the row of icons before - feels better with something in there.
  • Add sub-menus for the convert/copy actions for all layer types.
  • Add pulsing animation to auto-mask preview overlay.
  • Change auto-mask Apply button to Save As. The output can be saved as any layer type. Raster layers get the image cutout, while mask layers get a mask. This creates the new layer and ends the auto-masking operation.

Related Issues / Discussions

QA Instructions

Try the things listed. There are a lot of permutations of convert/copy - pretty sure I tested them all.

Merge Plan

RC2

Checklist

  • The PR has a short but descriptive title, suitable for a changelog
  • Tests added / updated (if applicable)
  • Documentation added / updated (if applicable)

@github-actions github-actions bot added the frontend PRs that change frontend files label Oct 24, 2024
@psychedelicious @hipsterusername
feat(ui): more resilient auto-masking processing
13a2db3 
- Use a hash of the last processed points instead of a `hasProcessed` flag to determine whether or not we should re-process a given set of points.
- Store point coords in state instead of pulling them out of the konva node positions. This makes moving a point a more explicit action in code.
- Add a `roundCoord` util to round the x and y values of a coordinate.
- Ensure we always re-process when $points changes.
@psychedelicious @hipsterusername
feat(ui): remove neutral points
a5989d8
@psychedelicious @hipsterusername
feat(ui): rename "foreground"/"background" -> "include"/"exclude"
f3c8cee
@psychedelicious @hipsterusername
feat(ui): add automask button to toolbar
e14eeeb
@psychedelicious @hipsterusername
feat(ui): replace automask apply w/ save as menu
7810db6
@psychedelicious @hipsterusername
feat(ui): close viewer when filtering/transforming/automasking
9a1bc6a
@psychedelicious @hipsterusername
feat(ui): add useSubMenu hook to abstract logic for sub-menus
4237f47
@psychedelicious @hipsterusername
feat(ui): use sub-menu for image metadata recall
eb71cad
@psychedelicious @hipsterusername
feat(ui): add entity context menu as canvas context menu sub-menu
0eb684c
@psychedelicious @hipsterusername
feat(ui): add pull bbox to global ref image ctx menu
16f77f7
@psychedelicious @hipsterusername
fix(ui): icon menu item group spacing
9985ea4
@psychedelicious @hipsterusername
fix(ui): handle pen/touch events on submenu
f15ba0c
@psychedelicious @hipsterusername
feat(ui): add logic to convert/copy between all layer types
f1cb26b
@psychedelicious @hipsterusername
feat(ui): add context menu options for layer type convert/copy
0ebde69
@psychedelicious @hipsterusername
feat(ui): animate automask preview overlay
2e8d73e
@psychedelicious @hipsterusername
fix(ui): icon for automask save as
cd11d71
@psychedelicious @hipsterusername
chore(ui): lint
55b5d1a
@hipsterusername hipsterusername force-pushed the psyche/feat/ui/canvas-auto-mask-followups-2 branch from c955bea to 55b5d1a Compare October 24, 2024 12:36
@hipsterusername hipsterusername merged commit e6ab6e0 into main Oct 24, 2024
14 checks passed
@hipsterusername hipsterusername deleted the psyche/feat/ui/canvas-auto-mask-followups-2 branch October 24, 2024 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hipsterusername hipsterusername hipsterusername approved these changes

@blessedcoolant blessedcoolant Awaiting requested review from blessedcoolant blessedcoolant is a code owner

@maryhipp maryhipp Awaiting requested review from maryhipp maryhipp is a code owner

Assignees
No one assigned
Labels
frontend PRs that change frontend files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[enhancement]: Ability to send Auto Mask to a inpaint mask layer
2 participants
@psychedelicious @hipsterusername