Merge branch 'develop' into zm/dm-mot-format

cvat-ai · Mar 18, 2020 · 51550ac · 51550ac
2 parents 6875c79 + 731b896
commit 51550ac
Show file tree

Hide file tree

Showing 52 changed files with 2,067 additions and 577 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,32 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.0.alpha] - 2020-02-XX
+## [1.0.0-beta] - Unreleased
+### Added
+-
+
+### Changed
+- VOC task export now does not use official label map by default, but takes one
+  from the source task to avoid primary-class and class part name
+  clashing ([#1275](https://github.com/opencv/cvat/issues/1275))
+
+### Deprecated
+-
+
+### Removed
+-
+
+### Fixed
+- File names in LabelMe format export are no longer truncated ([#1259](https://github.com/opencv/cvat/issues/1259))
+- `occluded` and `z_order` annotation attributes are now correctly passed to Datumaro ([#1271](https://github.com/opencv/cvat/pull/1271))
+- Annotation-less tasks now can be exported as empty datasets in COCO ([#1277](https://github.com/opencv/cvat/issues/1277))
+- Frame name matching for video annotations import -
+  allowed `frame_XXXXXX[.ext]` format ([#1274](https://github.com/opencv/cvat/pull/1274))
+
+### Security
+- Bump acorn from 6.3.0 to 6.4.1 in /cvat-ui ([#1270](https://github.com/opencv/cvat/pull/1270))
+
+## [0.6.0] - 2020-03-15
 ### Added
 - Server only support for projects. Extend REST API v1 (/api/v1/projects*)
 - Ability to get basic information about users without admin permissions ([#750](https://github.com/opencv/cvat/issues/750))
@@ -28,12 +53,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Yolov3 interpretation script fix and changes to mapping.json
 - YOLO format support ([#1151](https://github.com/opencv/cvat/pull/1151))
 
-### Deprecated
--
-
-### Removed
--
-
 ### Fixed
 - Exception in Git plugin [#826](https://github.com/opencv/cvat/issues/826)
 - Label ids in TFrecord format now start from 1 [#866](https://github.com/opencv/cvat/issues/866)
@@ -42,8 +61,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Output labels for VOC format can be specified with Datumaro [#942](https://github.com/opencv/cvat/issues/942)
 - Annotations can be filtered before dumping with Datumaro [#994](https://github.com/opencv/cvat/issues/994)
 
-### Security
--
+## [0.5.2] - 2019-12-15
+### Fixed
+- Frozen version of scikit-image==0.15 in requirements.txt because next releases don't support Python 3.5
 
 ## [0.5.1] - 2019-10-17
 ### Added

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -15,7 +15,7 @@ Next steps should work on clear Ubuntu 18.04.
 - Install necessary dependencies:
 
 ```sh
-$ sudo apt-get update && apt-get --no-install-recommends install -y nodejs npm curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
+$ sudo apt-get update && sudo apt-get --no-install-recommends install -y ffmpeg build-essential nodejs npm curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
 ```
 
 -   Install [Visual Studio Code](https://code.visualstudio.com/docs/setup/linux#_debian-and-ubuntu-based-distributions)
@@ -28,7 +28,7 @@ git clone https://github.com/opencv/cvat
 cd cvat && mkdir logs keys
 python3 -m venv .env
 . .env/bin/activate
-pip install -U pip wheel
+pip install -U pip wheel setuptools
 pip install -r cvat/requirements/development.txt
 pip install -r datumaro/requirements.txt
 python manage.py migrate

diff --git a/cvat-canvas/package-lock.json b/cvat-canvas/package-lock.json
diff --git a/cvat-canvas/src/typescript/canvasView.ts b/cvat-canvas/src/typescript/canvasView.ts
@@ -264,9 +264,10 @@ export class CanvasViewImpl implements CanvasView, Listener {
             y + height / 2,
         ]);
 
+        const canvasOffset = this.canvas.getBoundingClientRect();
         const [cx, cy] = [
-            this.canvas.clientWidth / 2 + this.canvas.offsetLeft,
-            this.canvas.clientHeight / 2 + this.canvas.offsetTop,
+            this.canvas.clientWidth / 2 + canvasOffset.left,
+            this.canvas.clientHeight / 2 + canvasOffset.top,
         ];
 
         const dragged = {
@@ -725,7 +726,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
             if (object) {
                 const bbox: SVG.BBox = object.bbox();
                 this.onFocusRegion(bbox.x - padding, bbox.y - padding,
-                    bbox.width + padding, bbox.height + padding);
+                    bbox.width + padding * 2, bbox.height + padding * 2);
             }
         } else if (reason === UpdateReasons.SHAPE_ACTIVATED) {
             this.activate(this.controller.activeElement);
@@ -1014,7 +1015,26 @@ export class CanvasViewImpl implements CanvasView, Listener {
         this.content.prepend(...sorted.map((pair): SVGElement => pair[0]));
     }
 
-    private deactivate(): void {
+    private deactivateAttribute(): void {
+        const { clientID, attributeID } = this.activeElement;
+        if (clientID !== null && attributeID !== null) {
+            const text = this.svgTexts[clientID];
+            if (text) {
+                const [span] = text.node
+                    .querySelectorAll(`[attrID="${attributeID}"]`) as any as SVGTSpanElement[];
+                if (span) {
+                    span.style.fill = '';
+                }
+            }
+
+            this.activeElement = {
+                ...this.activeElement,
+                attributeID: null,
+            };
+        }
+    }
+
+    private deactivateShape(): void {
         if (this.activeElement.clientID !== null) {
             const { clientID } = this.activeElement;
             const drawnState = this.drawnStates[clientID];
@@ -1047,29 +1067,34 @@ export class CanvasViewImpl implements CanvasView, Listener {
             this.sortObjects();
 
             this.activeElement = {
+                ...this.activeElement,
                 clientID: null,
-                attributeID: null,
             };
         }
     }
 
-    private activate(activeElement: ActiveElement): void {
-        // Check if other element have been already activated
-        if (this.activeElement.clientID !== null) {
-            // Check if it is the same element
-            if (this.activeElement.clientID === activeElement.clientID) {
-                return;
-            }
+    private deactivate(): void {
+        this.deactivateAttribute();
+        this.deactivateShape();
+    }
 
-            // Deactivate previous element
-            this.deactivate();
-        }
+    private activateAttribute(clientID: number, attributeID: number): void {
+        const text = this.svgTexts[clientID];
+        if (text) {
+            const [span] = text.node
+                .querySelectorAll(`[attrID="${attributeID}"]`) as any as SVGTSpanElement[];
+            if (span) {
+                span.style.fill = 'red';
+            }
 
-        const { clientID } = activeElement;
-        if (clientID === null) {
-            return;
+            this.activeElement = {
+                ...this.activeElement,
+                attributeID,
+            };
         }
+    }
 
+    private activateShape(clientID: number): void {
         const [state] = this.controller.objects
             .filter((_state: any): boolean => _state.clientID === clientID);
 
@@ -1082,8 +1107,8 @@ export class CanvasViewImpl implements CanvasView, Listener {
             return;
         }
 
-        this.activeElement = { ...activeElement };
         const shape = this.svgShapes[clientID];
+
         let text = this.svgTexts[clientID];
         if (!text) {
             text = this.addText(state);
@@ -1188,6 +1213,11 @@ export class CanvasViewImpl implements CanvasView, Listener {
             }
         });
 
+        this.activeElement = {
+            ...this.activeElement,
+            clientID,
+        };
+
         this.canvas.dispatchEvent(new CustomEvent('canvas.activated', {
             bubbles: false,
             cancelable: true,
@@ -1197,6 +1227,30 @@ export class CanvasViewImpl implements CanvasView, Listener {
         }));
     }
 
+    private activate(activeElement: ActiveElement): void {
+        // Check if another element have been already activated
+        if (this.activeElement.clientID !== null) {
+            if (this.activeElement.clientID !== activeElement.clientID) {
+                // Deactivate previous shape and attribute
+                this.deactivate();
+            } else if (this.activeElement.attributeID !== activeElement.attributeID) {
+                this.deactivateAttribute();
+            }
+        }
+
+        const { clientID, attributeID } = activeElement;
+        if (clientID !== null && this.activeElement.clientID !== clientID) {
+            this.activateShape(clientID);
+        }
+
+        if (clientID !== null
+            && attributeID !== null
+            && this.activeElement.attributeID !== attributeID
+        ) {
+            this.activateAttribute(clientID, attributeID);
+        }
+    }
+
     // Update text position after corresponding box has been moved, resized, etc.
     private updateTextPosition(text: SVG.Text, shape: SVG.Shape): void {
         let box = (shape.node as any).getBBox();

diff --git a/cvat-core/src/annotations-collection.js b/cvat-core/src/annotations-collection.js
@@ -802,17 +802,19 @@
             let minimumState = null;
             for (const state of objectStates) {
                 checkObjectType('object state', state, null, ObjectState);
-                if (state.outside || state.hidden) continue;
+                if (state.outside || state.hidden || state.objectType === ObjectType.TAG) {
+                    continue;
+                }
 
                 const object = this.objects[state.clientID];
                 if (typeof (object) === 'undefined') {
                     throw new ArgumentError(
                         'The object has not been saved yet. Call annotations.put([state]) before',
                     );
                 }
-
                 const distance = object.constructor.distance(state.points, x, y);
-                if (distance !== null && (minimumDistance === null || distance < minimumDistance)) {
+                if (distance !== null && (minimumDistance === null
+                    || distance < minimumDistance)) {
                     minimumDistance = distance;
                     minimumState = state;
                 }

diff --git a/cvat-core/src/annotations-filter.js b/cvat-core/src/annotations-filter.js
@@ -8,7 +8,10 @@
 */
 
 const jsonpath = require('jsonpath');
-const { AttributeType } = require('./enums');
+const {
+    AttributeType,
+    ObjectType,
+} = require('./enums');
 const { ArgumentError } = require('./exceptions');
 
 
@@ -165,18 +168,21 @@ class AnnotationsFilter {
             let xbr = Number.MIN_SAFE_INTEGER;
             let ytl = Number.MAX_SAFE_INTEGER;
             let ybr = Number.MIN_SAFE_INTEGER;
+            let [width, height] = [null, null];
+
+            if (state.objectType !== ObjectType.TAG) {
+                state.points.forEach((coord, idx) => {
+                    if (idx % 2) { // y
+                        ytl = Math.min(ytl, coord);
+                        ybr = Math.max(ybr, coord);
+                    } else { // x
+                        xtl = Math.min(xtl, coord);
+                        xbr = Math.max(xbr, coord);
+                    }
+                });
+                [width, height] = [xbr - xtl, ybr - ytl];
+            }
 
-            state.points.forEach((coord, idx) => {
-                if (idx % 2) { // y
-                    ytl = Math.min(ytl, coord);
-                    ybr = Math.max(ybr, coord);
-                } else { // x
-                    xtl = Math.min(xtl, coord);
-                    xbr = Math.max(xbr, coord);
-                }
-            });
-
-            const [width, height] = [xbr - xtl, ybr - ytl];
             const attributes = {};
             Object.keys(state.attributes).reduce((acc, key) => {
                 const attr = labelAttributes[key];

diff --git a/cvat-core/src/annotations-objects.js b/cvat-core/src/annotations-objects.js
@@ -1139,6 +1139,7 @@
                 attributes: { ...this.attributes },
                 label: this.label,
                 group: this.groupObject,
+                color: this.color,
                 updated: this.updated,
                 frame,
             };
@@ -1171,6 +1172,10 @@
                 this._saveLock(data.lock);
             }
 
+            if (updated.color) {
+                this._saveColor(data.color);
+            }
+
             this.updateTimestamp(updated);
             updated.reset();
 

diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json