Fixed: a mask becomes visible even if hidden after changing opacity l…

…evel (cvat-ai#7060)
retailnext · Oct 25, 2023 · c19ea38 · c19ea38
1 parent c6682ff
commit c19ea38
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/changelog.d/20231025_101044_boris_keypoints.md b/changelog.d/20231025_101044_boris_keypoints.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- A mask becomes visible even if hidden after changing opacity level
+  (<https://github.com/opencv/cvat/pull/7060>)
diff --git a/cvat-canvas/package.json b/cvat-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "2.18.0",
+  "version": "2.18.1",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {

diff --git a/cvat-canvas/src/typescript/canvasView.ts b/cvat-canvas/src/typescript/canvasView.ts
@@ -2921,6 +2921,18 @@ export class CanvasViewImpl implements CanvasView, Listener {
             }),
         );
 
+        if (state.occluded) {
+            image.addClass('cvat_canvas_shape_occluded');
+        }
+
+        if (state.hidden || state.outside || this.isInnerHidden(state.clientID)) {
+            image.addClass('cvat_canvas_hidden');
+        }
+
+        if (state.isGroundTruth) {
+            image.addClass('cvat_canvas_ground_truth');
+        }
+
         return image;
     }
 

diff --git a/tests/cypress/e2e/features/masks_basics.js b/tests/cypress/e2e/features/masks_basics.js
@@ -133,6 +133,27 @@ context('Manipulations with masks', { scrollBehavior: false }, () => {
             cy.get('#cvat_canvas_shape_2').should('exist').and('be.visible');
         });
 
+        it('Check hidden mask still invisible after changing frame/opacity', () => {
+            cy.startMaskDrawing();
+            cy.drawMask(drawingActions);
+            cy.finishMaskDrawing();
+
+            cy.get('#cvat-objects-sidebar-state-item-1').within(() => {
+                cy.get('.cvat-object-item-button-hidden')
+                    .should('exist').and('be.visible').click();
+                cy.get('.cvat-object-item-button-hidden')
+                    .should('have.class', 'cvat-object-item-button-hidden-enabled');
+            });
+
+            cy.goCheckFrameNumber(serverFiles.length - 1);
+            cy.goCheckFrameNumber(0);
+
+            cy.get('.cvat-appearance-opacity-slider').click('right');
+            cy.get('.cvat-appearance-opacity-slider').click('center');
+            cy.get('#cvat_canvas_shape_1')
+                .should('exist').and('have.class', 'cvat_canvas_hidden').and('not.be.visible');
+        });
+
         it('Editing a drawn mask', () => {
             cy.startMaskDrawing();
             cy.drawMask(drawingActions);