Merge branch 'develop' into cli_new

CHANGELOG.md

@@ -30,6 +30,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Annotation uploading fails in annotation view (<https://github.com/opencv/cvat/pull/1445>)
 - UI freezes after canceling pasting with escape (<https://github.com/opencv/cvat/pull/1445>)
 - Duplicating keypoints in COCO export (https://github.com/opencv/cvat/pull/1435)
+- CVAT new UI: add arrows on a mouse cursor (<https://github.com/opencv/cvat/pull/1391>)
+- Delete point bug (in new UI) (<https://github.com/opencv/cvat/pull/1440>)
+- Fix apache startup after PC restart (https://github.com/opencv/cvat/pull/1467)
 
 ### Security
 -
@@ -53,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - React UI is the primary UI
 
 ### Fixed
+- Cleaned up memory in Auto Annotation to enable long running tasks on videos
 - New shape is added when press ``esc`` when drawing instead of cancellation
 - Dextr segmentation doesn't work.
 - `FileNotFoundError` during dump after moving format files

CONTRIBUTING.md

@@ -14,10 +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 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 curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
     ```
     Also please make sure that you have installed ffmpeg with all necessary libav* libraries and pkg-config package.
     ```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
 
@@ -56,7 +60,7 @@ for development
 
 -   Install npm packages for UI and start UI debug server (run the following command from CVAT root directory):
     ```sh
-    cd cvat-data && npm install && \
+    cd cvat-core && npm install && \
     cd ../cvat-ui && npm install && npm start
     ```
 

cvat-canvas/src/scss/canvas.scss

@@ -126,6 +126,26 @@ polyline.cvat_canvas_shape_splitting {
     pointer-events: none;
 }
 
+.svg_select_points_lb:hover, .svg_select_points_rt:hover {
+    cursor: nesw-resize;
+}
+
+.svg_select_points_lt:hover, .svg_select_points_rb:hover {
+    cursor: nwse-resize;
+}
+
+.svg_select_points_l:hover, .svg_select_points_r:hover {
+    cursor: ew-resize;
+}
+
+.svg_select_points_t:hover, .svg_select_points_b:hover {
+    cursor: ns-resize;
+}
+
+.cvat_canvas_shape_draggable:hover {
+    cursor: move;
+}
+
 #cvat_canvas_wrapper {
     width: calc(100% - 10px);
     height: calc(100% - 10px);

cvat-canvas/src/typescript/canvasView.ts

@@ -1190,6 +1190,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
             const shape = this.svgShapes[clientID];
 
             shape.removeClass('cvat_canvas_shape_activated');
+            shape.removeClass('cvat_canvas_shape_draggable');
 
             if (!drawnState.pinned) {
                 (shape as any).off('dragstart');
@@ -1281,6 +1282,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
         }
 
         if (!state.pinned) {
+            shape.addClass('cvat_canvas_shape_draggable');
             (shape as any).draggable().on('dragstart', (): void => {
                 this.mode = Mode.DRAG;
                 if (text) {

cvat-core/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "cvat-core.js",
+  "name": "cvat-core",
   "version": "1.0.0",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "babel.config.js",
@@ -34,13 +34,15 @@
   "dependencies": {
     "axios": "^0.18.0",
     "browser-or-node": "^1.2.1",
+    "cvat-data": "../cvat-data",
     "detect-browser": "^5.0.0",
     "error-stack-parser": "^2.0.2",
     "form-data": "^2.5.0",
     "jest-config": "^24.8.0",
     "js-cookie": "^2.2.0",
     "jsonpath": "^1.0.2",
     "platform": "^1.3.5",
-    "store": "^2.0.12"
+    "store": "^2.0.12",
+    "worker-loader": "^2.0.0"
   }
 }

cvat-core/src/frames.js

@@ -9,7 +9,7 @@
 */
 
 (() => {
-    const cvatData = require('../../cvat-data');
+    const cvatData = require('cvat-data');
     const PluginRegistry = require('./plugins');
     const serverProxy = require('./server-proxy');
     const { isBrowser, isNode } = require('browser-or-node');