CVAT UI: batch of fixes (#1705)

cvat-ai · Jun 25, 2020 · 49a7ad5 · 49a7ad5
1 parent db24f93
commit 49a7ad5
Show file tree

Hide file tree

Showing 47 changed files with 680 additions and 508 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Built-in search for labels when create an object or change a label (<https://github.com/opencv/cvat/pull/1683>)
 - Better validation of labels and attributes in raw viewer (<https://github.com/opencv/cvat/pull/1727>)
 - ClamAV antivirus integration (<https://github.com/opencv/cvat/pull/1712>)
+- Added canvas background color selector (<https://github.com/opencv/cvat/pull/1705>)
 - SCSS files linting with Stylelint tool (<https://github.com/opencv/cvat/pull/1766>)
 - Supported import and export or single boxes in MOT format (https://github.com/opencv/cvat/pull/1764)
 - [Datumaro] Added `stats` command, which shows some dataset statistics like image mean and std (https://github.com/opencv/cvat/pull/1734)
@@ -28,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Removed information about e-mail from the basic user information (<https://github.com/opencv/cvat/pull/1627>)
 - Update https install manual. Makes it easier and more robust. Includes automatic renewing of lets encrypt certificates.
+- Settings page move to the modal. (<https://github.com/opencv/cvat/pull/1705>)
 - Implemented import and export of annotations with relative image paths (<https://github.com/opencv/cvat/pull/1463>)
 - Using only single click to start editing or remove a point (<https://github.com/opencv/cvat/pull/1571>)
 
@@ -46,6 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Wrong description on register view for the username field (<https://github.com/opencv/cvat/pull/1667>)
 - Wrong resolution for resizing a shape (<https://github.com/opencv/cvat/pull/1667>)
 - React warning because of not unique keys in labels viewer (<https://github.com/opencv/cvat/pull/1727>)
+- Fixed issue tracker (<https://github.com/opencv/cvat/pull/1705>)
+- Fixed canvas fit after sidebar open/close event (<https://github.com/opencv/cvat/pull/1705>)
 - A couple of exceptions in AAM related with early object activation (<https://github.com/opencv/cvat/pull/1755>)
 - Propagation from the latest frame (<https://github.com/opencv/cvat/pull/1800>)
 - Number attribute value validation (didn't work well with floats) (<https://github.com/opencv/cvat/pull/1800>)

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": "1.2.0",
+  "version": "1.2.1",
   "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
@@ -188,7 +188,7 @@ polyline.cvat_canvas_shape_splitting {
     height: calc(100% - 10px);
     margin: 5px;
     border-radius: 5px;
-    background-color: white;
+    background-color: inherit;
     overflow: hidden;
     position: relative;
 }

diff --git a/cvat-canvas/src/typescript/canvasView.ts b/cvat-canvas/src/typescript/canvasView.ts
@@ -911,12 +911,32 @@ export class CanvasViewImpl implements CanvasView, Listener {
         if (reason === UpdateReasons.CONFIG_UPDATED) {
             const { activeElement } = this;
             this.deactivate();
+
+            if (model.configuration.displayAllText && !this.configuration.displayAllText) {
+                for (const i in this.drawnStates) {
+                    if (!(i in this.svgTexts)) {
+                        this.svgTexts[i] = this.addText(this.drawnStates[i]);
+                        this.updateTextPosition(
+                            this.svgTexts[i],
+                            this.svgShapes[i],
+                        );
+                    }
+                }
+            } else if (model.configuration.displayAllText === false
+                    && this.configuration.displayAllText) {
+                for (const i in this.drawnStates) {
+                    if (i in this.svgTexts && Number.parseInt(i, 10) !== activeElement.clientID) {
+                        this.svgTexts[i].remove();
+                        delete this.svgTexts[i];
+                    }
+                }
+            }
+
             this.configuration = model.configuration;
             this.activate(activeElement);
             this.editHandler.configurate(this.configuration);
             this.drawHandler.configurate(this.configuration);
 
-            // todo: setup text, add if doesn't exist and enabled
             // remove if exist and not enabled
             // this.setupObjects([]);
             // this.setupObjects(model.objects);
@@ -1208,6 +1228,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
             pinned: state.pinned,
             updated: state.updated,
             frame: state.frame,
+            label: state.label,
         };
     }
 

diff --git a/cvat-canvas/src/typescript/shared.ts b/cvat-canvas/src/typescript/shared.ts
@@ -48,6 +48,7 @@ export interface DrawnState {
     pinned?: boolean;
     updated: number;
     frame: number;
+    label: any;
 }
 
 // Translate point array from the canvas coordinate system