Merge branch 'develop' into jeff

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,6 +4,12 @@ Copyright (C) 2020 Intel Corporation
 SPDX-License-Identifier: MIT
 -->
 
+<!-- Raised an issue to propose your change (https://github.com/opencv/cvat/issues).
+It will help avoiding duplication of efforts from multiple independent contributors.
+Discuss your ideas with maintainers to be sure that changes will be approved and merged.
+Read the [CONTRIBUTION](https://github.com/opencv/cvat/blob/develop/CONTRIBUTING.md)
+guide. -->
+
 <!-- Provide a general summary of your changes in the Title above -->
 
 ### Motivation and context
@@ -21,10 +27,7 @@ see how your change affects other areas of the code, etc. -->
 If an item isn't applicable by a reason then ~~explicitly strikethrough~~ the whole
 line. If you don't do that github will show incorrect process for the pull request.
 If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-
-- [ ] I have raised an issue to propose this change ([required](https://github.com/opencv/cvat/issues))
-- [ ] My issue has received approval from the maintainers
-- [ ] I've read the [CONTRIBUTION](https://github.com/opencv/cvat/blob/develop/CONTRIBUTING.md) guide
+- [ ] I submit my changes into the `develop` branch
 - [ ] I have added description of my changes into [CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md) file
 - [ ] I have updated the [documentation](
   https://github.com/opencv/cvat/blob/develop/README.md#documentation) accordingly

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.0.0-beta] - Unreleased
+## [1.0.0-beta.2] - Unreleased
+### Added
+- Re-Identification algorithm to merging bounding boxes automatically to the new UI (https://github.com/opencv/cvat/pull/1406)
+- Methods ``import`` and ``export`` to import/export raw annotations for Job and Task in ``cvat-core`` (https://github.com/opencv/cvat/pull/1406)
+
+### Changed
+-
+
+### Deprecated
+-
+
+### Removed
+-
+
+### Fixed
+- Auto annotation, TF annotation and Auto segmentation apps (https://github.com/opencv/cvat/pull/1409)
+- Import works with truncated images now: "OSError:broken data stream" on corrupt images (https://github.com/opencv/cvat/pull/1430)
+- Duplicating keypoints in COCO export (https://github.com/opencv/cvat/pull/1435)
+
+### Security
+-
+
+## [1.0.0-beta.1] - 2020-04-15
 ### Added
 - Special behaviour for attribute value ``__undefined__`` (invisibility, no shortcuts to be set in AAM)
 - Dialog window with some helpful information about using filters
@@ -13,17 +35,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Option to display shape text always
 - Dedicated message with clarifications when share is unmounted (https://github.com/opencv/cvat/pull/1373)
 - Ability to create one tracked point (https://github.com/opencv/cvat/pull/1383)
+- Ability to draw/edit polygons and polylines with automatic bordering feature (https://github.com/opencv/cvat/pull/1394)
 - Tutorial: instructions for CVAT over HTTPS
+- Deep extreme cut (semi-automatic segmentation) to the new UI (https://github.com/opencv/cvat/pull/1398)
 
 ### Changed
 - Increase preview size of a task till 256, 256 on the server
-- Minor style updates
-
-### Deprecated
--
-
-### Removed
--
+- Public ssh-keys are displayed in a dedicated window instead of console when create a task with a repository
+- React UI is the primary UI
 
 ### Fixed
 - New shape is added when press ``esc`` when drawing instead of cancellation
@@ -43,9 +62,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - VOC format exports Upper case labels correctly in lower case (https://github.com/opencv/cvat/pull/1379)
 - Fixed polygon exporting bug in COCO dataset (https://github.com/opencv/cvat/issues/1387)
 - Task creation from remote files (https://github.com/opencv/cvat/pull/1392)
-
-### Security
--
+- Job cannot be opened in some cases when the previous job was failed during opening (https://github.com/opencv/cvat/issues/1403)
+- Deactivated shape is still highlighted on the canvas (https://github.com/opencv/cvat/issues/1403)
+- AttributeError: 'tuple' object has no attribute 'read' in ReID algorithm (https://github.com/opencv/cvat/issues/1403)
+- Wrong semi-automatic segmentation near edges of an image (https://github.com/opencv/cvat/issues/1403)
+- Git repos paths (https://github.com/opencv/cvat/pull/1400)
 
 ## [1.0.0-alpha] - 2020-03-31
 ### Added

cvat-canvas/README.md

@@ -153,6 +153,7 @@ Standard JS events are used.
     - canvas.fit
     - canvas.dragshape => {id: number}
     - canvas.resizeshape => {id: number}
+    - canvas.contextmenu => { mouseEvent: MouseEvent, objectState: ObjectState,  pointID: number }
 ```
 
 ### WEB
@@ -196,7 +197,7 @@ Standard JS events are used.
 | dragCanvas() | +    | -     | -     | -    | -     | -    | +    | -      | -           | +           |
 | zoomCanvas() | +    | -     | -     | -    | -     | -    | -    | +      | +           | -           |
 | cancel()     | -    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
-| configure()  | +    | -     | -     | -    | -     | -    | -    | -      | -           | -           |
+| configure()  | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
 | bitmap()     | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
 | setZLayer()  | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
 

cvat-canvas/src/scss/canvas.scss

@@ -103,6 +103,24 @@ polyline.cvat_canvas_shape_splitting {
     stroke-dasharray: 5;
 }
 
+.cvat_canvas_autoborder_point {
+    opacity: 0.55;
+}
+
+.cvat_canvas_autoborder_point:hover {
+    opacity: 1;
+    fill: red;
+}
+
+.cvat_canvas_autoborder_point:active {
+    opacity: 0.55;
+    fill: red;
+}
+
+.cvat_canvas_autoborder_point_direction {
+    fill: blueviolet;
+}
+
 .svg_select_boundingRect {
     opacity: 0;
     pointer-events: none;