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.

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

Do not adjust opacity level each frame if there are masks #8149

Merged
merged 8 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog.d/20240711_094827_boris_do_not_reset_opacity.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Changed

- Do not reset opacity level each time frame switched if there are masks on the frame
(<https://github.com/cvat-ai/cvat/pull/8149>)
7 changes: 4 additions & 3 deletions cvat-canvas/src/typescript/canvasView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2576,7 +2576,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
}

if (drawnState.shapeType === 'mask') {
shape.attr('opacity', `${this.configuration.shapeOpacity}`);
shape.attr('opacity', `${Math.sqrt(this.configuration.shapeOpacity)}`);
} else {
shape.attr('fill-opacity', `${this.configuration.shapeOpacity}`);
}
Expand Down Expand Up @@ -2666,7 +2666,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
}

if (state.shapeType === 'mask') {
shape.attr('opacity', `${this.configuration.selectedShapeOpacity}`);
shape.attr('opacity', `${Math.sqrt(this.configuration.selectedShapeOpacity)}`);
} else {
shape.attr('fill-opacity', `${this.configuration.selectedShapeOpacity}`);
}
Expand Down Expand Up @@ -3169,7 +3169,8 @@ export class CanvasViewImpl implements CanvasView, Listener {
id: `cvat_canvas_shape_${state.clientID}`,
'shape-rendering': 'geometricprecision',
'data-z-order': state.zOrder,
opacity: colorization['fill-opacity'],
// apply sqrt function to colorization to enhance displaying the mask on the canvas
opacity: Math.sqrt(colorization['fill-opacity']),
stroke: colorization.stroke,
}).addClass('cvat_canvas_shape');
image.move(this.geometry.offset + left, this.geometry.offset + top);
Expand Down
5 changes: 2 additions & 3 deletions cvat-ui/src/actions/annotation-actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,6 @@ export function getJobAsync({

const {
settings: {
workspace: { showAllInterpolationTracks },
player: { showDeletedFrames },
},
} = state;
Expand Down Expand Up @@ -939,7 +938,8 @@ export function getJobAsync({
// do nothing, user will be notified when data request is done
}

const states = await job.annotations.get(frameNumber, showAllInterpolationTracks, filters);
await job.annotations.clear({ reload: true });

const issues = await job.issues();
const colors = [...cvat.enums.colors];

Expand Down Expand Up @@ -974,7 +974,6 @@ export function getJobAsync({
groundTruthInstance: gtJob || null,
groundTruthJobFramesMeta,
issues,
states,
conflicts,
frameNumber,
frameFilename: frameData.filename,
Expand Down
29 changes: 2 additions & 27 deletions cvat-ui/src/reducers/settings-reducer.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
// Copyright (C) 2020-2022 Intel Corporation
// Copyright (C) 2023 CVAT.ai Corporation
// Copyright (C) 2023-2024 CVAT.ai Corporation
//
// SPDX-License-Identifier: MIT

import { AnyAction } from 'redux';

import { BoundariesActionTypes } from 'actions/boundaries-actions';
import { AuthActionTypes } from 'actions/auth-actions';
import { SettingsActionTypes } from 'actions/settings-actions';
import { AnnotationActionTypes } from 'actions/annotation-actions';
import {
SettingsState, GridColor, FrameSpeed, ColorBy,
} from 'reducers';
import { clampOpacity } from 'utils/clamp-opacity';

const defaultState: SettingsState = {
shapes: {
Expand Down Expand Up @@ -438,38 +436,15 @@ export default (state = defaultState, action: AnyAction): SettingsState => {
imageFilters: [],
};
}
case AnnotationActionTypes.FETCH_ANNOTATIONS_SUCCESS:
case AnnotationActionTypes.CHANGE_FRAME_SUCCESS: {
const { states } = action.payload;
const { shapes } = state;
const [clampedOpacity, clampedSelectedOpacity] = clampOpacity(states, shapes);
return {
...state,
shapes: {
...state.shapes,
opacity: clampedOpacity,
selectedOpacity: clampedSelectedOpacity,
},
};
}
case BoundariesActionTypes.RESET_AFTER_ERROR:
case AnnotationActionTypes.GET_JOB_SUCCESS: {
const { job, states } = action.payload;
const { shapes } = state;
const filters = [...state.imageFilters];
filters.forEach((imageFilter) => {
imageFilter.modifier.currentProcessedImage = null;
});

const [clampedOpacity, clampedSelectedOpacity] = clampOpacity(states, shapes, job);

return {
...state,
shapes: {
...defaultState.shapes,
opacity: clampedOpacity,
selectedOpacity: clampedSelectedOpacity,
},

imageFilters: filters,
};
}
Expand Down
36 changes: 0 additions & 36 deletions cvat-ui/src/utils/clamp-opacity.ts

This file was deleted.

2 changes: 1 addition & 1 deletion tests/cypress/e2e/actions_objects/regression_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ context('Regression tests', () => {
taskID = response.taskID;
[jobID] = response.jobIDs;

cy.headlessCreateObject([rectanglePayload], jobID);
cy.headlessCreateObjects([rectanglePayload], jobID);
cy.visit(`/tasks/${taskID}/jobs/${jobID}`);
});
});
Expand Down
134 changes: 0 additions & 134 deletions tests/cypress/e2e/issues_prs/issue_7176_opacity_reset.js

This file was deleted.

2 changes: 1 addition & 1 deletion tests/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Cypress.Commands.add('headlessLogin', (username = Cypress.env('user'), password
});
});

Cypress.Commands.add('headlessCreateObject', (objects, jobID) => {
Cypress.Commands.add('headlessCreateObjects', (objects, jobID) => {
cy.window().then(async ($win) => {
const job = (await $win.cvat.jobs.get({ jobID }))[0];
await job.annotations.clear({ reload: true });
Expand Down
Loading