Merge branch 'develop' into develop

cvat-ai · Sep 2, 2020 · 6441503 · 6441503
2 parents eef7451 + 51ff630
commit 6441503
Show file tree

Hide file tree

Showing 98 changed files with 3,023 additions and 702 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ cache:
     - ~/.cache
 
 addons:
+  firefox: "latest"
   apt:
     packages:
     - libgconf-2-4
@@ -43,7 +44,8 @@ script:
   - docker exec -it cvat bash -ic "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell"
   # Install Cypress and run tests
   - cd ./tests && npm install
-  - $(npm bin)/cypress run --headless --browser chrome && cd ..
+  - $(npm bin)/cypress run --headless --browser chrome
+  - $(npm bin)/cypress run --headless --browser firefox && cd ..
 
 after_success:
   # https://coveralls-python.readthedocs.io/en/latest/usage/multilang.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,29 @@ 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.1.0] - Unreleased
+## [1.2.0] - Unreleased
+### Added
+- Added password reset functionality (<https://github.com/opencv/cvat/pull/2058>)
+- Ability to work with data on the fly (https://github.com/opencv/cvat/pull/2007)
+- Annotation in process outline color wheel (<https://github.com/opencv/cvat/pull/2084>)
+
+### Changed
+- UI models (like DEXTR) were redesigned to be more interactive (<https://github.com/opencv/cvat/pull/2054>)
+- Used Ubuntu:20.04 as a base image for CVAT Dockerfile (<https://github.com/opencv/cvat/pull/2101>)
+
+### Deprecated
+-
+
+### Removed
+-
+
+### Fixed
+- Fixed multiple errors which arises when polygon is of length 5 or less (<https://github.com/opencv/cvat/pull/2100>)
+
+### Security
+-
+
+## [1.1.0] - 2020-08-31
 ### Added
 - Siammask tracker as DL serverless function (<https://github.com/opencv/cvat/pull/1988>)
 - [Datumaro] Added model info and source info commands (<https://github.com/opencv/cvat/pull/1973>)
@@ -19,22 +41,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Shape coordinates are rounded to 2 digits in dumped annotations (<https://github.com/opencv/cvat/pull/1970>)
 - COCO format does not produce polygon points for bbox annotations (<https://github.com/opencv/cvat/pull/1953>)
 
-### Deprecated
--
-
-### Removed
--
-
 ### Fixed
 - Issue loading openvino models for semi-automatic and automatic annotation (<https://github.com/opencv/cvat/pull/1996>)
 - Basic functions of CVAT works without activated nuclio dashboard
 - Fixed a case in which exported masks could have wrong color order (<https://github.com/opencv/cvat/issues/2032>)
 - Fixed error with creating task with labels with the same name (<https://github.com/opencv/cvat/pull/2031>)
 - Django RQ dashboard view (<https://github.com/opencv/cvat/pull/2069>)
-- Fixed multiple errors which arises when polygon is of length 5 or less (<https://github.com/opencv/cvat/pull/2100>)
-
-### Security
--
+- Object's details menu settings (<https://github.com/opencv/cvat/pull/2084>)
 
 ## [1.1.0-beta] - 2020-08-03
 ### Added

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -14,25 +14,14 @@ Next steps should work on clear Ubuntu 18.04.
 
 -   Install necessary dependencies:
     ```sh
-    sudo apt-get update && sudo apt-get --no-install-recommends install -y ffmpeg build-essential curl redis-server python3-dev python3-pip python3-venv python3-tk libldap2-dev libsasl2-dev
+    sudo apt-get update && sudo apt-get --no-install-recommends install -y build-essential curl redis-server python3-dev python3-pip python3-venv python3-tk libldap2-dev libsasl2-dev pkg-config libavformat-dev libavcodec-dev libavdevice-dev libavutil-dev libswscale-dev libswresample-dev libavfilter-dev
     ```
-    Also please make sure that you have installed ffmpeg with all necessary libav* libraries and pkg-config package.
+    Please make sure you have installed FFmpeg libraries (libav*) version 4.0 or higher.
     ```sh
     # Node and npm (you can use default versions of these packages from apt (8.*, 3.*), but we would recommend to use newer versions)
     curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
     sudo apt-get install -y nodejs
 
-    # General dependencies
-    sudo apt-get install -y pkg-config
-
-    # Library components
-    sudo apt-get install -y \
-        libavformat-dev libavcodec-dev libavdevice-dev \
-        libavutil-dev libswscale-dev libswresample-dev libavfilter-dev
-    ```
-    See [PyAV Dependencies installation guide](http://docs.mikeboers.com/pyav/develop/overview/installation.html#dependencies)
-    for details.
-
 -   Install [Visual Studio Code](https://code.visualstudio.com/docs/setup/linux#_debian-and-ubuntu-based-distributions)
 for development
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 ARG http_proxy
 ARG https_proxy
@@ -23,8 +23,6 @@ ENV DJANGO_CONFIGURATION=${DJANGO_CONFIGURATION}
 RUN apt-get update && \
     apt-get --no-install-recommends install -yq \
         software-properties-common && \
-    add-apt-repository ppa:mc3man/xerus-media -y && \
-    add-apt-repository ppa:mc3man/gstffmpeg-keep -y && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
         apache2 \
@@ -33,15 +31,13 @@ RUN apt-get update && \
         build-essential \
         libapache2-mod-xsendfile \
         supervisor \
-        ffmpeg \
-        gstreamer0.10-ffmpeg \
-        libavcodec-dev \
-        libavdevice-dev \
-        libavfilter-dev \
-        libavformat-dev \
-        libavutil-dev \
-        libswresample-dev \
-        libswscale-dev \
+        libavcodec-dev=7:4.2.4-1ubuntu0.1 \
+        libavdevice-dev=7:4.2.4-1ubuntu0.1 \
+        libavfilter-dev=7:4.2.4-1ubuntu0.1 \
+        libavformat-dev=7:4.2.4-1ubuntu0.1 \
+        libavutil-dev=7:4.2.4-1ubuntu0.1 \
+        libswresample-dev=7:4.2.4-1ubuntu0.1 \
+        libswscale-dev=7:4.2.4-1ubuntu0.1 \
         libldap2-dev \
         libsasl2-dev \
         pkg-config \
@@ -50,16 +46,13 @@ RUN apt-get update && \
         tzdata \
         p7zip-full \
         git \
+        git-lfs \
         ssh \
         poppler-utils \
         curl && \
-    curl https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
-    apt-get --no-install-recommends install -y git-lfs && git lfs install && \
-    python3 -m pip install --no-cache-dir -U pip==20.0.1 setuptools>=49.1.0 wheel==0.35.1 && \
+    python3 -m pip install --no-cache-dir -U pip==20.0.1 setuptools==49.6.0 wheel==0.35.1 && \
     ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \
     dpkg-reconfigure -f noninteractive tzdata && \
-    add-apt-repository --remove ppa:mc3man/gstffmpeg-keep -y && \
-    add-apt-repository --remove ppa:mc3man/xerus-media -y && \
     rm -rf /var/lib/apt/lists/* && \
     echo 'application/wasm wasm' >> /etc/mime.types
 

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -3,17 +3,20 @@ FROM cvat/server
 ENV DJANGO_CONFIGURATION=testing
 USER root
 
-RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
-    echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list && \
-    curl https://deb.nodesource.com/setup_12.x | bash - && \
-    apt-get update && \
+RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
+        gpg-agent \
         apt-utils \
         build-essential \
+        python3-dev \
+        ruby \ 
+        && \
+    curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list && \
+    curl https://deb.nodesource.com/setup_12.x | bash - && \
+    DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
         google-chrome-stable \
         nodejs \
-        python3-dev \
-        ruby \
         && \
     rm -rf /var/lib/apt/lists/*;
 

diff --git a/cvat-canvas/README.md b/cvat-canvas/README.md
@@ -46,6 +46,7 @@ Canvas itself handles:
         IDLE = 'idle',
         DRAG = 'drag',
         RESIZE = 'resize',
+        INTERACT = 'interact',
         DRAW = 'draw',
         EDIT = 'edit',
         MERGE = 'merge',
@@ -70,6 +71,11 @@ Canvas itself handles:
         crosshair?: boolean;
     }
 
+    interface InteractionData {
+        shapeType: string;
+        minVertices?: number;
+    }
+
     interface GroupData {
         enabled: boolean;
         resetGroup?: boolean;
@@ -83,6 +89,12 @@ Canvas itself handles:
         enabled: boolean;
     }
 
+    interface InteractionResult {
+        points: number[];
+        shapeType: string;
+        button: number;
+    };
+
     interface DrawnData {
         shapeType: string;
         points: number[];
@@ -104,6 +116,7 @@ Canvas itself handles:
         grid(stepX: number, stepY: number): void;
 
         draw(drawData: DrawData): void;
+        interact(interactionData: InteractionData): void;
         group(groupData: GroupData): void;
         split(splitData: SplitData): void;
         merge(mergeData: MergeData): void;
@@ -146,6 +159,7 @@ Standard JS events are used.
     - canvas.moved => {states: ObjectState[], x: number, y: number}
     - canvas.find => {states: ObjectState[], x: number, y: number}
     - canvas.drawn => {state: DrawnData}
+    - canvas.interacted => {shapes: InteractionResult[]}
     - canvas.editstart
     - canvas.edited => {state: ObjectState, points: number[]}
     - canvas.splitted => {state: ObjectState}
@@ -187,25 +201,26 @@ Standard JS events are used.
 
 ## API Reaction
 
-|              | IDLE | GROUP | SPLIT | DRAW | MERGE | EDIT | DRAG | RESIZE | ZOOM_CANVAS | DRAG_CANVAS |
-|--------------|------|-------|-------|------|-------|------|------|--------|-------------|-------------|
-| setup()      | +    | +     | +     | +/-  | +     | +/-  | +/-  | +/-    | +           | +           |
-| activate()   | +    | -     | -     | -    | -     | -    | -    | -      | -           | -           |
-| rotate()     | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| focus()      | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| fit()        | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| grid()       | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| draw()       | +    | -     | -     | -    | -     | -    | -    | -      | -           | -           |
-| split()      | +    | -     | +     | -    | -     | -    | -    | -      | -           | -           |
-| group()      | +    | +     | -     | -    | -     | -    | -    | -      | -           | -           |
-| merge()      | +    | -     | -     | -    | +     | -    | -    | -      | -           | -           |
-| fitCanvas()  | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| dragCanvas() | +    | -     | -     | -    | -     | -    | +    | -      | -           | +           |
-| zoomCanvas() | +    | -     | -     | -    | -     | -    | -    | +      | +           | -           |
-| cancel()     | -    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| configure()  | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| bitmap()     | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| setZLayer()  | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
+|              | IDLE | GROUP | SPLIT | DRAW | MERGE | EDIT | DRAG | RESIZE | ZOOM_CANVAS | DRAG_CANVAS | INTERACT |
+|--------------|------|-------|-------|------|-------|------|------|--------|-------------|-------------|----------|
+| setup()      | +    | +     | +     | +/-  | +     | +/-  | +/-  | +/-    | +           | +           | +        |
+| activate()   | +    | -     | -     | -    | -     | -    | -    | -      | -           | -           | -        |
+| rotate()     | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
+| focus()      | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
+| fit()        | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
+| grid()       | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
+| draw()       | +    | -     | -     | +    | -     | -    | -    | -      | -           | -           | -        |
+| interact()   | +    | -     | -     | -    | -     | -    | -    | -      | -           | -           | +        |
+| split()      | +    | -     | +     | -    | -     | -    | -    | -      | -           | -           | -        |
+| group()      | +    | +     | -     | -    | -     | -    | -    | -      | -           | -           | -        |
+| merge()      | +    | -     | -     | -    | +     | -    | -    | -      | -           | -           | -        |
+| fitCanvas()  | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
+| dragCanvas() | +    | -     | -     | -    | -     | -    | +    | -      | -           | +           | -        |
+| zoomCanvas() | +    | -     | -     | -    | -     | -    | -    | +      | +           | -           | -        |
+| cancel()     | -    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
+| configure()  | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
+| bitmap()     | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
+| setZLayer()  | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           | +        |
 
 You can call setup() during editing, dragging, and resizing only to update objects, not to change a frame.
 You can change frame during draw only when you do not redraw an existing object

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.2",
+  "version": "2.1.0",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {

diff --git a/cvat-canvas/src/typescript/canvas.ts b/cvat-canvas/src/typescript/canvas.ts
@@ -8,26 +8,17 @@ import {
     MergeData,
     SplitData,
     GroupData,
+    InteractionData,
+    InteractionResult,
     CanvasModel,
     CanvasModelImpl,
     RectDrawingMethod,
     CuboidDrawingMethod,
     Configuration,
 } from './canvasModel';
-
-import {
-    Master,
-} from './master';
-
-import {
-    CanvasController,
-    CanvasControllerImpl,
-} from './canvasController';
-
-import {
-    CanvasView,
-    CanvasViewImpl,
-} from './canvasView';
+import { Master } from './master';
+import { CanvasController, CanvasControllerImpl } from './canvasController';
+import { CanvasView, CanvasViewImpl } from './canvasView';
 
 import '../scss/canvas.scss';
 import pjson from '../../package.json';
@@ -43,6 +34,7 @@ interface Canvas {
     fit(): void;
     grid(stepX: number, stepY: number): void;
 
+    interact(interactionData: InteractionData): void;
     draw(drawData: DrawData): void;
     group(groupData: GroupData): void;
     split(splitData: SplitData): void;
@@ -118,6 +110,10 @@ class CanvasImpl implements Canvas {
         this.model.grid(stepX, stepY);
     }
 
+    public interact(interactionData: InteractionData): void {
+        this.model.interact(interactionData);
+    }
+
     public draw(drawData: DrawData): void {
         this.model.draw(drawData);
     }
@@ -162,4 +158,6 @@ export {
     RectDrawingMethod,
     CuboidDrawingMethod,
     Mode as CanvasMode,
+    InteractionData,
+    InteractionResult,
 };
diff --git a/cvat-canvas/src/typescript/canvasController.ts b/cvat-canvas/src/typescript/canvasController.ts
@@ -13,6 +13,7 @@ import {
     SplitData,
     GroupData,
     Mode,
+    InteractionData,
 } from './canvasModel';
 
 export interface CanvasController {
@@ -21,6 +22,7 @@ export interface CanvasController {
     readonly focusData: FocusData;
     readonly activeElement: ActiveElement;
     readonly drawData: DrawData;
+    readonly interactionData: InteractionData;
     readonly mergeData: MergeData;
     readonly splitData: SplitData;
     readonly groupData: GroupData;
@@ -30,6 +32,7 @@ export interface CanvasController {
 
     zoom(x: number, y: number, direction: number): void;
     draw(drawData: DrawData): void;
+    interact(interactionData: InteractionData): void;
     merge(mergeData: MergeData): void;
     split(splitData: SplitData): void;
     group(groupData: GroupData): void;
@@ -84,6 +87,10 @@ export class CanvasControllerImpl implements CanvasController {
         this.model.draw(drawData);
     }
 
+    public interact(interactionData: InteractionData): void {
+        this.model.interact(interactionData);
+    }
+
     public merge(mergeData: MergeData): void {
         this.model.merge(mergeData);
     }
@@ -124,6 +131,10 @@ export class CanvasControllerImpl implements CanvasController {
         return this.model.drawData;
     }
 
+    public get interactionData(): InteractionData {
+        return this.model.interactionData;
+    }
+
     public get mergeData(): MergeData {
         return this.model.mergeData;
     }