CVAT-UI: Couple of fixes (#1892)

* Polygon interpolation fix * Fix interpolation issue * Updated changelog
cvat-ai · Jul 15, 2020 · e92014e · e92014e
1 parent cb114b5
commit e92014e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `outside` annotations should not be in exported images (<https://github.com/opencv/cvat/issues/1620>)
 - `CVAT for video format` import error with interpolation (<https://github.com/opencv/cvat/issues/1893>)
 - `Image compression` definition mismatch (<https://github.com/opencv/cvat/issues/1900>)
+- Points are dublicated during polygon interpolation sometimes (<https://github.com/opencv/cvat/pull/1892>)
+- When redraw a shape with activated autobordering, previous points are visible (<https://github.com/opencv/cvat/pull/1892>)
 
 ### Security
 -

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.0.0",
+  "version": "2.0.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/autoborderHandler.ts b/cvat-canvas/src/typescript/autoborderHandler.ts
@@ -13,14 +13,14 @@ interface TransformedShape {
 }
 
 export interface AutoborderHandler {
-    autoborder(enabled: boolean, currentShape?: SVG.Shape, ignoreCurrent?: boolean): void;
+    autoborder(enabled: boolean, currentShape?: SVG.Shape, currentID?: number): void;
     transform(geometry: Geometry): void;
     updateObjects(): void;
 }
 
 export class AutoborderHandlerImpl implements AutoborderHandler {
     private currentShape: SVG.Shape | null;
-    private ignoreCurrent: boolean;
+    private currentID?: number;
     private frameContent: SVGSVGElement;
     private enabled: boolean;
     private scale: number;
@@ -34,7 +34,7 @@ export class AutoborderHandlerImpl implements AutoborderHandler {
 
     public constructor(frameContent: SVGSVGElement) {
         this.frameContent = frameContent;
-        this.ignoreCurrent = false;
+        this.currentID = undefined;
         this.currentShape = null;
         this.enabled = false;
         this.scale = 1;
@@ -231,7 +231,8 @@ export class AutoborderHandlerImpl implements AutoborderHandler {
         this.removeMarkers();
 
         const currentClientID = this.currentShape.node.dataset.originClientId;
-        const shapes = Array.from(this.frameContent.getElementsByClassName('cvat_canvas_shape'));
+        const shapes = Array.from(this.frameContent.getElementsByClassName('cvat_canvas_shape'))
+            .filter((shape: HTMLElement): boolean => +shape.getAttribute('clientID') !== this.currentID);
         const transformedShapes = shapes.map((shape: HTMLElement): TransformedShape | null => {
             const color = shape.getAttribute('fill');
             const clientID = shape.getAttribute('clientID');
@@ -277,12 +278,12 @@ export class AutoborderHandlerImpl implements AutoborderHandler {
     public autoborder(
         enabled: boolean,
         currentShape?: SVG.Shape,
-        ignoreCurrent: boolean = false,
+        currentID?: number,
     ): void {
         if (enabled && !this.enabled && currentShape) {
             this.enabled = true;
             this.currentShape = currentShape;
-            this.ignoreCurrent = ignoreCurrent;
+            this.currentID = currentID;
             this.updateObjects();
         } else {
             this.release();

diff --git a/cvat-canvas/src/typescript/drawHandler.ts b/cvat-canvas/src/typescript/drawHandler.ts
@@ -433,7 +433,7 @@ export class DrawHandlerImpl implements DrawHandler {
 
         this.drawPolyshape();
         if (this.autobordersEnabled) {
-            this.autoborderHandler.autoborder(true, this.drawInstance, false);
+            this.autoborderHandler.autoborder(true, this.drawInstance, this.drawData.redraw);
         }
     }
 
@@ -446,7 +446,7 @@ export class DrawHandlerImpl implements DrawHandler {
 
         this.drawPolyshape();
         if (this.autobordersEnabled) {
-            this.autoborderHandler.autoborder(true, this.drawInstance, false);
+            this.autoborderHandler.autoborder(true, this.drawInstance, this.drawData.redraw);
         }
     }
 
@@ -478,7 +478,7 @@ export class DrawHandlerImpl implements DrawHandler {
 
             if (this.canceled) return;
             if ((xbr - xtl) * (ybr - ytl) >= consts.AREA_THRESHOLD) {
-                const d = { x: (xbr - xtl) * 0.1, y: (ybr - ytl)*0.1}
+                const d = { x: (xbr - xtl) * 0.1, y: (ybr - ytl) * 0.1 };
                 this.onDrawDone({
                     shapeType,
                     points: cuboidFrom4Points([xtl, ybr, xbr, ybr, xbr, ytl, xbr + d.x, ytl - d.y]),
@@ -767,7 +767,11 @@ export class DrawHandlerImpl implements DrawHandler {
             this.autobordersEnabled = configuration.autoborders;
             if (this.drawInstance) {
                 if (this.autobordersEnabled) {
-                    this.autoborderHandler.autoborder(true, this.drawInstance, false);
+                    this.autoborderHandler.autoborder(
+                        true,
+                        this.drawInstance,
+                        this.drawData.redraw,
+                    );
                 } else {
                     this.autoborderHandler.autoborder(false);
                 }

diff --git a/cvat-canvas/src/typescript/editHandler.ts b/cvat-canvas/src/typescript/editHandler.ts
@@ -130,7 +130,7 @@ export class EditHandlerImpl implements EditHandler {
 
         this.setupEditEvents();
         if (this.autobordersEnabled) {
-            this.autoborderHandler.autoborder(true, this.editLine, true);
+            this.autoborderHandler.autoborder(true, this.editLine, this.editData.state.clientID);
         }
     }
 
@@ -376,7 +376,11 @@ export class EditHandlerImpl implements EditHandler {
             this.autobordersEnabled = configuration.autoborders;
             if (this.editLine) {
                 if (this.autobordersEnabled) {
-                    this.autoborderHandler.autoborder(true, this.editLine, true);
+                    this.autoborderHandler.autoborder(
+                        true,
+                        this.editLine,
+                        this.editData.state.clientID,
+                    );
                 } else {
                     this.autoborderHandler.autoborder(false);
                 }

diff --git a/cvat-core/package.json b/cvat-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-core",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "babel.config.js",
   "scripts": {

diff --git a/cvat-core/src/annotations-objects.js b/cvat-core/src/annotations-objects.js
@@ -1629,7 +1629,7 @@
             }
 
             function matchRightLeft(leftCurve, rightCurve, leftRightMatching) {
-                const matchedRightPoints = Object.values(leftRightMatching);
+                const matchedRightPoints = Object.values(leftRightMatching).flat();
                 const unmatchedRightPoints = rightCurve.map((_, index) => index)
                     .filter((index) => !matchedRightPoints.includes(index));
                 const updatedMatching = { ...leftRightMatching };

diff --git a/cvat/apps/dataset_manager/annotation.py b/cvat/apps/dataset_manager/annotation.py
@@ -5,6 +5,7 @@
 from copy import copy, deepcopy
 
 import numpy as np
+from itertools import chain
 from scipy.optimize import linear_sum_assignment
 from shapely import geometry
 
@@ -523,7 +524,7 @@ def match_left_right(left_curve, right_curve):
                 return matching
 
             def match_right_left(left_curve, right_curve, left_right_matching):
-                matched_right_points = left_right_matching.values()
+                matched_right_points = list(chain.from_iterable(left_right_matching.values()))
                 unmatched_right_points = filter(lambda x: x not in matched_right_points, range(len(right_curve)))
                 updated_matching = deepcopy(left_right_matching)