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.

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

Added new tools to join masks together and to slice a polygon/mask into two parts #7084

Merged
merged 96 commits into from
Nov 14, 2023
Merged

Added new tools to join masks together and to slice a polygon/mask into two parts #7084

merged 96 commits into from
Nov 14, 2023

Conversation

bsekachev
Copy link
Member

@bsekachev bsekachev commented Oct 31, 2023 •
edited
Loading

Motivation and context

Resolved #690
Resolved #774
Resolved #5006
Resolved #6964

How to join?

  • Join tool in the controls sidebar, or J shortcut
    image

  • Follow instructions. To finish, click the button/shortcut again.
    demo 1

How to slice?
Slice icon in the controls sidebar, or Alt+J shortcut:
image
One more way is to slice from shape context menu:
image

Follow instructions.
demo

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have created a changelog fragment
  • I have updated the documentation accordingly
  • I have added tests to cover my changes
  • I have linked related issues (see GitHub docs)
  • I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

bsekachev and others added 30 commits October 31, 2023 10:50
@bsekachev
Added controls
c51b03a
@bsekachev
Removed unused field
fb78358
@bsekachev
Updated canvas
50dd9ed
@bsekachev
Added fake pipeline
b68330e
@bsekachev
Some code refactoring
1f5768c
@bsekachev
A little bit more refactored code
f3f39f2
@bsekachev
Fixed shortcut
f1042eb
@bsekachev
Almost done join
180e51b
@bsekachev
Fixed join algorithm
b535000
@bsekachev
Minor refactoring
469ae9b
@bsekachev
tmp
6dc541c
@bsekachev
..
2794598
@bsekachev
Written basic slice code in ui & canvas parts
4784e8a
@bsekachev
Additional refactoring
5b960b9
@bsekachev
tmp
2bd5436
@bsekachev
Fixed algorithm
564a3e8
@bsekachev
Added slice method to core, linked to ui
61c7168
@bsekachev
tmp
68c2ed5
@mdacoca @bsekachev
Documentation retouch: cloud storages and mot data format (#7071)
686428c 
- Added videos to Cloud Storages
- Updated wording in Cloud Storages
- Updated data format for MOT Import
@nmanovic @snyk-bot @bsekachev
[Snyk] Security upgrade urllib3 from 1.26.17 to 1.26.18 (#7027)
a3723b4 
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
@Marishka17 @azhavoro @bsekachev
[AWS S3] Use local session (#7067)
d0abe15 
Try to fix the issue described in cart 322
```
File \"/opt/venv/lib/python3.10/site-packages/botocore/session.py\", line 941, in get_component\n del self._deferred[name]\nKeyError: 'endpoint_resolver'\n","status_code":500
``` 
Generally, this approach increases the time of creating clients but it
does not affect us much because we create a client once or twice times
for some operations (cloud storage creating, task creating with cloud
storage data, retrieving a chunk, etc)

![image](https://github.com/opencv/cvat/assets/49038720/5adb4434-4d05-4882-b70c-ea760852b367)


https://boto3.amazonaws.com/v1/documentation/api/latest/guide/resources.html#multithreading-or-multiprocessing-with-resources

https://boto3.amazonaws.com/v1/documentation/api/latest/guide/session.html#multithreading-or-multiprocessing-with-sessions

Co-authored-by: Andrey Zhavoronkov <andrey@cvat.ai>
@klakhov @bsekachev
Compress changeFrame events (#7048)
3700dd6 
We have too many event records of `changeFrame` and `zoomImage` events.
They are not really informative. This pr compresses `changeFrame` events
and increases ignore events timeouts
 
Co-authored-by: Andrey Zhavoronkov <andrey@cvat.ai>
@Marishka17 @bsekachev
REST API tests for default bucket prefix (#7079)
04146e1 
This PR contains REST API tests for #6943
@azhavoro @Marishka17 @bsekachev
Chunk preparation optimization (#7081)
376a5ba 
This PR speeds up the preparation of chunks by: 
1. loading images once instead of twice in each writer,
2. as well as by allowing simultaneous preparation of more than 1 chunk
using multithreading.
This allows to reduce the time for preparation of chunks for 4895 images
from 0:04:36 to 0:01:20 in case of preparation of 3 chunks in parallel
and 0:02:46 in case of 1 chunk in my environment.

Co-authored-by: Maria Khrustaleva <maya17grd@gmail.com>
@klakhov @bsekachev
Fixed user email auto verification on accepting organization invitati…
c299816 
…on (#7073)

There is a couple of UX bugs in invite user to organization feature.
This pr fixes:
- Email is auto-verified after accepting invitation
- Stuff can view unaccepted invitations
- Stuff can edit unaccepted memberships
- User email is now used as username
@cvat-bot @bsekachev
Prepare release v2.8.1
7287088
@cvat-bot @bsekachev
Update develop after v2.8.1
0f862d4
@bsekachev
Fixed opencv runtime initialization
5a6e352
@bsekachev
Update changelog.d/20231106_112434_boris_fixed_opencv_runtime_init.md
8be4c6e
@bsekachev
Enhanced fix
5056ada
@codecov Codecov
Copy link

codecov bot commented Nov 8, 2023 •
edited
Loading

Codecov Report

Merging #7084 (ef80e93) into develop (c87cb3b) will decrease coverage by 1.19%.
Report is 1 commits behind head on develop.
The diff coverage is 34.80%.

@@             Coverage Diff             @@
##           develop    #7084      +/-   ##
===========================================
- Coverage    82.58%   81.39%   -1.19%     
===========================================
  Files          362      364       +2     
  Lines        39264    39904     +640     
  Branches      3578     3699     +121     
===========================================
+ Hits         32426    32480      +54     
- Misses        6838     7424     +586
Components Coverage Δ
cvat-ui 75.46% <34.80%> (-2.30%) ⬇️
cvat-server 86.94% <ø> (-0.01%) ⬇️

@klakhov
Copy link
Contributor

klakhov commented Nov 10, 2023

  • Just noticed (maybe unrelated to the patch) using N shortcut with masks makes my cursor strangely jump over the canvas
    new-mask-random
  • As far as I remember on the demo we had brigher borders + lines for slicing, does the color depend on label color? I cant really see black border on black background. Maybe we should use dynamic color something like label color with a bit more brightess
    image

@bsekachev
Copy link
Member Author

bsekachev commented Nov 10, 2023 •
edited
Loading

@klakhov

As far as I remember on the demo we had brigher borders + lines for slicing, does the color depend on label color? I cant really see black border on black background. Maybe we should use dynamic color something like label color with a bit more brightess

Enable outlined colors option. By default border is black. It may have any color you setup.
image

@bsekachev
Copy link
Member Author

@klakhov

Just noticed (maybe unrelated to the patch) using N shortcut with masks makes my cursor strangely jump over the canvas

The same on develop

@bsekachev bsekachev merged commit 401989d into develop Nov 14, 2023
34 checks passed
@bsekachev bsekachev deleted the bs/join_slice branch November 20, 2023 08:11
This was referenced Nov 22, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@klakhov klakhov klakhov approved these changes

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

@mdacoca mdacoca Awaiting requested review from mdacoca

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
7 participants
@bsekachev @AHansoe @klakhov @mdacoca @nmanovic @Marishka17 @azhavoro