Added ability to delete frames (cvat-ai#10)

Co-authored-by: Dmitry Kalinin <[email protected]> Co-authored-by: Nikita Manovich <[email protected]> Co-authored-by: Boris Sekachev <[email protected]>
arafat877 · Jun 6, 2022 · f960da9 · f960da9
1 parent ff30b77
commit f960da9
Show file tree

Hide file tree

Showing 115 changed files with 21,762 additions and 38,415 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -136,7 +136,7 @@ jobs:
           -c 'coverage run -a manage.py test cvat/apps utils/cli -k 'tasks_id' -k 'lambda' -k 'share' && mv .coverage ${CONTAINER_COVERAGE_DATA_DIR}'
 
           docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash \
-          -c 'cd cvat-data && npm ci && cd ../cvat-core && npm ci && npm run test && mv ./reports/coverage/lcov.info ${CONTAINER_COVERAGE_DATA_DIR} && chmod a+rwx ${CONTAINER_COVERAGE_DATA_DIR}/lcov.info'
+          -c 'cd cvat-data && npm ci --ignore-scripts && cd ../cvat-core && npm ci --ignore-scripts && npm run test && mv ./reports/coverage/lcov.info ${CONTAINER_COVERAGE_DATA_DIR} && chmod a+rwx ${CONTAINER_COVERAGE_DATA_DIR}/lcov.info'
       - name: Uploading code coverage results as an artifact
         if: github.ref == 'refs/heads/develop'
         uses: actions/upload-artifact@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Advanced filtration and sorting for a list of tasks/projects/cloudstorages (<https://github.com/openvinotoolkit/cvat/pull/4403>)
 - Project dataset importing via chunk uploads (<https://github.com/openvinotoolkit/cvat/pull/4485>)
 - Support paginated list for job commits (<https://github.com/openvinotoolkit/cvat/pull/4482>)
+- Added ability to delete frames from a job (<https://github.com/openvinotoolkit/cvat/pull/4194>)
 
 ### Changed
 - Added missing geos dependency into Dockerfile (<https://github.com/openvinotoolkit/cvat/pull/4451>)

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -30,6 +30,7 @@ RUN gem install coveralls-lcov
 COPY utils ${HOME}/utils
 COPY cvat-core ${HOME}/cvat-core
 COPY cvat-data ${HOME}/cvat-data
+COPY package*.json ${HOME}/
 COPY tests ${HOME}/tests
 
 COPY .coveragerc .

diff --git a/SECURITY.md b/SECURITY.md
@@ -23,7 +23,7 @@ Please provide as much information as possible, including:
 - Information on known exploits
 - A member of the Intel Product Security Team will review your e-mail and contact you to
   collaborate on resolving the issue.
-  
+
 For more information on how Intel works to resolve security issues, see:
 [Vulnerability handling guidelines](<https://www.intel.com/content/www/us/en/security-center/vulnerability-handling-guidelines.html>)
 

diff --git a/cvat-canvas/README.md b/cvat-canvas/README.md
@@ -62,8 +62,19 @@ Canvas itself handles:
     }
 
     interface Configuration {
-        displayAllText?: boolean;
-        undefinedAttrValue?: string;
+      smoothImage?: boolean;
+      autoborders?: boolean;
+      displayAllText?: boolean;
+      textFontSize?: number;
+      textPosition?: 'auto' | 'center';
+      textContent?: string;
+      undefinedAttrValue?: string;
+      showProjections?: boolean;
+      forceDisableEditing?: boolean;
+      intelligentPolygonCrop?: boolean;
+      forceFrameUpdate?: boolean;
+      creationOpacity?: number;
+      CSSImageFilter?: string;
     }
 
     interface DrawData {

diff --git a/cvat-canvas/package-lock.json b/cvat-canvas/package-lock.json
diff --git a/cvat-canvas/package.json b/cvat-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "2.13.2",
+  "version": "2.14.0",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {

diff --git a/cvat-canvas/src/scss/canvas.scss b/cvat-canvas/src/scss/canvas.scss
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2020-2022 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -237,6 +237,10 @@ polyline.cvat_canvas_shape_splitting {
     -ms-interpolation-mode: nearest-neighbor;   /* IE8+           */
 }
 
+.cvat_canvas_removed_image {
+    filter: saturate(0) brightness(1.2) contrast(0.75) !important;
+}
+
 #cvat_canvas_wrapper {
     width: calc(100% - 10px);
     height: calc(100% - 10px);

diff --git a/cvat-canvas/src/typescript/canvasModel.ts b/cvat-canvas/src/typescript/canvasModel.ts
@@ -65,6 +65,7 @@ export interface Configuration {
     intelligentPolygonCrop?: boolean;
     forceFrameUpdate?: boolean;
     creationOpacity?: number;
+    CSSImageFilter?: string;
 }
 
 export interface DrawData {
@@ -171,6 +172,7 @@ export enum Mode {
 
 export interface CanvasModel {
     readonly imageBitmap: boolean;
+    readonly imageIsDeleted: boolean;
     readonly image: Image | null;
     readonly issueRegions: Record<number, { hidden: boolean; points: number[] }>;
     readonly objects: any[];
@@ -230,6 +232,7 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
         imageID: number | null;
         imageOffset: number;
         imageSize: Size;
+        imageIsDeleted: boolean;
         focusData: FocusData;
         gridSize: Size;
         left: number;
@@ -277,6 +280,7 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
                 height: 0,
                 width: 0,
             },
+            imageIsDeleted: false,
             focusData: {
                 clientID: 0,
                 padding: 0,
@@ -406,7 +410,10 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
                 throw Error(`Canvas is busy. Action: ${this.data.mode}`);
             }
         }
-        if (frameData.number === this.data.imageID && !this.data.configuration.forceFrameUpdate) {
+        if (frameData.number === this.data.imageID &&
+            frameData.deleted === this.data.imageIsDeleted &&
+            !this.data.configuration.forceFrameUpdate
+        ) {
             this.data.zLayer = zLayer;
             this.data.objects = objectStates;
             this.notify(UpdateReasons.OBJECTS_UPDATED);
@@ -431,6 +438,10 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
                 };
 
                 this.data.image = data;
+                this.data.imageIsDeleted = frameData.deleted;
+                if (this.data.imageIsDeleted) {
+                    this.data.angle = 0;
+                }
                 this.notify(UpdateReasons.IMAGE_CHANGED);
                 this.data.zLayer = zLayer;
                 this.data.objects = objectStates;
@@ -476,7 +487,7 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
     }
 
     public rotate(rotationAngle: number): void {
-        if (this.data.angle !== rotationAngle) {
+        if (this.data.angle !== rotationAngle && !this.data.imageIsDeleted) {
             this.data.angle = (360 + Math.floor(rotationAngle / 90) * 90) % 360;
             this.fit();
         }
@@ -695,6 +706,10 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
             this.data.configuration.creationOpacity = configuration.creationOpacity;
         }
 
+        if (typeof configuration.CSSImageFilter === 'string') {
+            this.data.configuration.CSSImageFilter = configuration.CSSImageFilter;
+        }
+
         this.notify(UpdateReasons.CONFIG_UPDATED);
     }
 
@@ -753,6 +768,10 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
         return this.data.imageBitmap;
     }
 
+    public get imageIsDeleted(): boolean {
+        return this.data.imageIsDeleted;
+    }
+
     public get image(): Image | null {
         return this.data.image;
     }