Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

Commit

Permalink
Persist image filters across jobs (cvat-ai#6953)
Browse files Browse the repository at this point in the history
<!-- 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. -->

### 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! -->
- [ ] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] 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

- [ ] 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.
  • Loading branch information
klakhov authored and mikhail-treskin committed Oct 25, 2023
1 parent a179f60 commit b3d9b23
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 2 deletions.
4 changes: 4 additions & 0 deletions changelog.d/20231006_155231_persist_image_filters.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Fixed

- Persist image filters across jobs
(<https://github.com/opencv/cvat/pull/6953>)
2 changes: 1 addition & 1 deletion cvat-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-ui",
"version": "1.57.2",
"version": "1.57.3",
"description": "CVAT single-page application",
"main": "src/index.tsx",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export default function GammaFilter(): JSX.Element {
useEffect(() => {
if (filters.length === 0) {
setGamma(1);
} else if (gammaFilter) {
setGamma((gammaFilter.modifier as GammaCorrection).gamma);
}
}, [filters]);

Expand Down
6 changes: 5 additions & 1 deletion cvat-ui/src/reducers/settings-reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,10 @@ export default (state = defaultState, action: AnyAction): SettingsState => {
case BoundariesActionTypes.RESET_AFTER_ERROR:
case AnnotationActionTypes.GET_JOB_SUCCESS: {
const { job } = action.payload;
const filters = [...state.imageFilters];
filters.forEach((imageFilter) => {
imageFilter.modifier.currentProcessedImage = null;
});

return {
...state,
Expand All @@ -477,7 +481,7 @@ export default (state = defaultState, action: AnyAction): SettingsState => {
} :
{}),
},
imageFilters: [],
imageFilters: filters,
};
}
case AnnotationActionTypes.INTERACT_WITH_CANVAS: {
Expand Down
14 changes: 14 additions & 0 deletions cvat-ui/src/utils/fabric-wrapper/gamma-correciton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export interface GammaFilterOptions {
}

export default class GammaCorrection extends FabricFilter {
#gamma: number[];

constructor(options: GammaFilterOptions) {
super();

Expand All @@ -22,5 +24,17 @@ export default class GammaCorrection extends FabricFilter {
this.filter = new fabric.Image.filters.Gamma({
gamma,
});
this.#gamma = gamma;
}

public configure(options: object): void {
super.configure(options);

const { gamma: newGamma } = options as GammaFilterOptions;
this.#gamma = newGamma;
}

get gamma(): number {
return this.#gamma[0];
}
}

0 comments on commit b3d9b23

Please sign in to comment.