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

Add gamma correction filter #6771

Merged
merged 44 commits into from
Sep 6, 2023
Merged

Add gamma correction filter #6771

merged 44 commits into from
Sep 6, 2023

Conversation

klakhov
Copy link
Contributor

@klakhov klakhov commented Aug 30, 2023 •
edited
Loading

Motivation and context

Adds gamma correction filter
debounced

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have added a description of my changes into the CHANGELOG file
  • [ ] 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.

@klakhov klakhov added the ui/ux label Aug 30, 2023
@klakhov klakhov requested a review from bsekachev August 30, 2023 06:51
@klakhov klakhov requested a review from nmanovic as a code owner August 30, 2023 06:51
@klakhov klakhov removed the request for review from nmanovic August 30, 2023 06:51
@klakhov klakhov marked this pull request as draft August 30, 2023 06:51
@klakhov klakhov requested review from nmanovic and removed request for nmanovic August 30, 2023 06:52
@klakhov klakhov changed the title [WIP] Add gamma correction filter Add gamma correction filter Aug 31, 2023
@klakhov klakhov marked this pull request as ready for review August 31, 2023 12:25
@bsekachev
Copy link
Member

I am not sure it works as expected together with hist equalization.
Image didn't change when I increase the gamma level:

Peek 2023-09-05 14-54

@klakhov
Copy link
Contributor Author

klakhov commented Sep 5, 2023

@bsekachev
Fixed filters combination

@bsekachev
Copy link
Member

@klakhov
Just discovered unexpected behaviour. When change gamma level in one task, then open another one and see that in opened task gamma level is already applied. But slider is 1.

Peek 2023-09-06 10-25

But this behavior is not stable, I do not know exactly what is a reason.

Also one more comment is about debouncing. I think it is better to put debounce on image processing function. In current implementation it is on the function that changes state and visually it looks even more laggy. Can we do that? This is up to you, but I believe the interface must work smoothly.

@klakhov
Copy link
Contributor Author

klakhov commented Sep 6, 2023 •
edited
Loading

@bsekachev

@klakhov Just discovered unexpected behaviour. When change gamma level in one task, then open another one and see that in opened task gamma level is already applied. But slider is 1.

Fixed that, I belive it was because image filters have not been reset after opening new job

Also one more comment is about debouncing. I think it is better to put debounce on image processing function. In current implementation it is on the function that changes state and visually it looks even more laggy. Can we do that? This is up to you, but I believe the interface must work smoothly.

Applied that, consider:

  • without update debounce:
    gamma-old
  • with update debounce
    debounced

@klakhov klakhov merged commit 7a2bde2 into develop Sep 6, 2023
30 of 31 checks passed
@klakhov klakhov deleted the kl/gamma-correction branch September 6, 2023 11:44
@bsekachev bsekachev restored the kl/gamma-correction branch September 6, 2023 11:48
bsekachev added a commit that referenced this pull request Sep 6, 2023
@bsekachev
Revert "Add gamma correction filter (#6771)"
8171906 
This reverts commit 7a2bde2.
@bsekachev bsekachev mentioned this pull request Sep 6, 2023
Merged
bsekachev added a commit that referenced this pull request Sep 6, 2023
@bsekachev
Revert "Add gamma correction filter" (#6818)
84ac0c2 
Reverts #6771

Failed tests
@azhavoro azhavoro mentioned this pull request Sep 6, 2023
Merged
nmanovic added a commit that referenced this pull request Sep 6, 2023
@nmanovic
Release v2.6.2
7721b26 
### Added

- Gamma correcton filter (<#6771>)
- Introduced the feature to hide or show objects in review mode (<#6808>)

### Changed

- \[Helm\] Database migrations are now executed as a separate job,
  rather than in the server pod, to mitigate the risk of data
  corruption when using multiple server replicas
  (<#6780>)
- Clicking multiple times on icons in the left
  sidebar now toggles the corresponding popovers open and closed
  (<#6817>)
- Transitioned to using KeyDB with FLASH for data
  chunk caching, replacing diskcache (<#6773>)

### Removed

- Removed outdated use of hostnames when accessing Git, OpenCV, or analytics via the UI (<#6799>)
- Removed the Feedback/Share component (<#6805>)

### Fixed

- Resolved the issue of the canvas zooming while scrolling
  through the comments list in an issue (<#6758>)
- Addressed the bug that allowed for multiple issue
  creations upon initial submission (<#6758>)
- Fixed the issue of running deep learning models on
  non-JPEG compressed TIFF images (<#6789>)
- Adjusted padding on the tasks, projects, and models pages (<#6778>)
- Corrected hotkey handlers to avoid overriding default behavior when modal windows are open
  (<#6800>)
- Resolved the need to move the mouse to activate
  brush or eraser effects; a single click is now sufficient (<#6800>)
- Fixed a memory leak issue in the logging system (<#6804>)
- Addressed a race condition that occurred during the initial creation of `secret_key.py`
  (<#6775>)
- Eliminated duplicate log entries generated by the CVAT server
  (<#6766>)
@klakhov klakhov mentioned this pull request Sep 8, 2023
Merged
3 tasks
klakhov added a commit that referenced this pull request Sep 8, 2023
@klakhov
Add test for gamma correction filter (#6833)
8a4ec5d 
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
Test for #6771

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
Added cypress test

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- ~~[ ] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file~~
- ~~[ ] I have updated the documentation accordingly~~
- [x] I have added tests to cover my changes
- ~~[ ] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))~~
- ~~[ ] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))~~

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Oct 25, 2023
@klakhov @bsekachev @mikhail-treskin
Add gamma correction filter (cvat-ai#6771)
66e4361 
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
Adds gamma correction filter

![debounced](https://github.com/opencv/cvat/assets/50956430/c1748100-355c-4dd7-a0fc-b994dc42e8de)

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file
- ~~[ ] I have updated the documentation accordingly~~
- ~~[ ] I have added tests to cover my changes~~
- [x] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [x] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.

---------

Co-authored-by: Boris Sekachev <boris.sekachev@yandex.ru>
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Oct 25, 2023
@bsekachev @mikhail-treskin
Revert "Add gamma correction filter" (cvat-ai#6818)
0d95ba4 
Reverts cvat-ai#6771

Failed tests
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Oct 25, 2023
@klakhov @mikhail-treskin
Add test for gamma correction filter (cvat-ai#6833)
830c0e4 
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
Test for cvat-ai#6771

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
Added cypress test

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- ~~[ ] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file~~
- ~~[ ] I have updated the documentation accordingly~~
- [x] I have added tests to cover my changes
- ~~[ ] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))~~
- ~~[ ] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))~~

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsekachev bsekachev bsekachev approved these changes

Assignees
No one assigned
Labels
ui/ux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@klakhov @bsekachev