Resolved merge conflicts

Intelligent-Systems-Laboratory · Apr 24, 2020 · 9c0d2c1 · 9c0d2c1
2 parents 1ef9631 + fd615ee
commit 9c0d2c1
Show file tree

Hide file tree

Showing 75 changed files with 1,395 additions and 324 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,39 @@
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence, they will
+# be requested for review when someone opens a pull request.
+*               @nmanovic
+
+# Order is important; the last matching pattern takes the most
+# precedence. When someone opens a pull request that only
+# modifies components below, only the list of owners and not
+# the global owner(s) will be requested for a review.
+
+# Component: Server
+/cvat/          @nmanovic
+
+# Component: CVAT UI
+/cvat-ui/       @bsekachev
+/cvat-data/     @azhavoro
+/cvat-canvas/   @bsekachev
+/cvat-core/     @bsekachev
+
+# Component: Datumaro
+/datumaro/      @zhiltsov-max
+/cvat/apps/dataset_manager/ @zhiltsov-max
+
+# Advanced components (e.g. OpenVINO)
+/components/    @azhavoro
+
+# Infrastructure
+Dockerfile*     @azhavoro
+docker-compose* @azhavoro
+.*              @azhavoro
+*.conf          @azhavoro
+*.sh            @azhavoro
+/cvat_proxy/    @azhavoro
+/tests/         @azhavoro
+/utils/         @azhavoro
+/LICENSE        @nmanovic
+/.github/       @nmanovic
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,53 @@
+<!---
+Copyright (C) 2020 Intel Corporation
+
+SPDX-License-Identifier: MIT
+-->
+
+### My actions before raising this issue
+- [ ] Read/searched [the docs](https://github.com/opencv/cvat/tree/master#documentation)
+- [ ] Searched [past issues](/issues)
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+### Expected Behaviour
+<!--- If you're describing a bug, tell us what should happen. If you're
+suggesting a change/improvement, tell us how it should work -->
+
+### Current Behaviour
+<!--- If describing a bug, tell us what happens instead of the expected
+behavior. If suggesting a change/improvement, explain the difference from
+current behavior -->
+
+### Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, or ideas how
+to implement the addition or change -->
+
+### Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to
+reproduce this bug. Include code to reproduce, if relevant -->
+1.
+1.
+1.
+1.
+
+### Context
+<!--- How has this issue affected you? What are you trying to accomplish?
+Providing context helps us come up with a solution that is most useful in
+the real world -->
+
+### Your Environment
+<!--- Include as many relevant details about the environment you experienced
+the bug in -->
+- Git hash commit (`git log -1`):
+- Docker version `docker version` (e.g. Docker 17.0.05):
+- Are you using Docker Swarm or Kubernetes?
+- Operating System and version (e.g. Linux, Windows, MacOS):
+- Code example or link to GitHub repo or gist to reproduce problem:
+- Other diagnostic information / logs:
+    <details>
+    <summary>Logs from `cvat` container</summary>
+    </details>
+
+### Next steps
+You may [join our Gitter](https://gitter.im/opencv-cvat/public) channel for community support.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,46 @@
+<!---
+Copyright (C) 2020 Intel Corporation
+
+SPDX-License-Identifier: MIT
+-->
+
+<!-- Provide a general summary of your changes in the Title above -->
+
+### Motivation and context
+<!-- Why is this change required? What problem does it solve? If it fixes an open
+issue, please link to the issue here. Describe your changes in detail, add
+screenshots. -->
+
+### How has this been tested?
+<!-- Please describe in detail how you tested your changes.
+Include details of your testing environment, and the tests you ran to
+see how your change affects other areas of the code, etc. -->
+
+### Checklist
+<!-- Go over all the following points, and put an `x` in all the boxes that apply.
+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 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
+- [ ] I have added tests to cover my changes
+- [ ] I have linked related issues ([read github docs](
+  https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
+
+### License
+
+- [ ] I submit _my code changes_ under the same [MIT License](
+  https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project.
+  Feel free to contact the maintainers if that's a concern.
+- [ ] I have updated the license header for each file (see an example below)
+
+```python
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+```
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.0-beta] - Unreleased
 ### Added
--
+- Special behaviour for attribute value ``__undefined__`` (invisibility, no shortcuts to be set in AAM)
+- Dialog window with some helpful information about using filters
+- Ability to display a bitmap in the new UI
+- Button to reset colors settings (brightness, saturation, contrast) in the new UI
+- 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)
+- Tutorial: instructions for CVAT over HTTPS
 
 ### Changed
--
+- Increase preview size of a task till 256, 256 on the server
+- Minor style updates
 
 ### Deprecated
 -
@@ -18,7 +26,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -
 
 ### Fixed
--
+- New shape is added when press ``esc`` when drawing instead of cancellation
+- Dextr segmentation doesn't work.
+- `FileNotFoundError` during dump after moving format files
+- CVAT doesn't append outside shapes when merge polyshapes in old UI
+- Layout sometimes shows double scroll bars on create task, dashboard and settings pages
+- UI fails after trying to change frame during resizing, dragging, editing
+- Hidden points (or outsided) are visible after changing a frame
+- Merge is allowed for points, but clicks on points conflict with frame dragging logic
+- Removed objects are visible for search
+- Add missed task_id and job_id fields into exception logs for the new UI (https://github.com/opencv/cvat/pull/1372)
+- UI fails when annotations saving occurs during drag/resize/edit (https://github.com/opencv/cvat/pull/1383)
+- Multiple savings when hold Ctrl+S (a lot of the same copies of events were sent with the same working time) (https://github.com/opencv/cvat/pull/1383)
+- UI doesn't have any reaction when git repos synchronization failed (https://github.com/opencv/cvat/pull/1383)
+- Bug when annotations cannot be saved after (delete - save - undo - save) (https://github.com/opencv/cvat/pull/1383)
+- 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
 -

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,6 @@
-Copyright (C) 2018 Intel Corporation
+MIT License
+
+Copyright (C) 2018-2020 Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"),
@@ -18,4 +20,3 @@ OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
 
-SPDX-License-Identifier: MIT
diff --git a/cvat-canvas/README.md b/cvat-canvas/README.md
@@ -50,6 +50,11 @@ Canvas itself handles:
         ZOOM_CANVAS = 'zoom_canvas',
     }
 
+    interface Configuration {
+        displayAllText?: boolean;
+        undefinedAttrValue?: string;
+    }
+
     interface DrawData {
         enabled: boolean;
         shapeType?: string;
@@ -83,7 +88,6 @@ Canvas itself handles:
     }
 
     interface Canvas {
-        mode(): Mode;
         html(): HTMLDivElement;
         setZLayer(zLayer: number | null): void;
         setup(frameData: any, objectStates: any[]): void;
@@ -100,10 +104,13 @@ Canvas itself handles:
         select(objectState: any): void;
 
         fitCanvas(): void;
+        bitmap(enabled: boolean): void;
         dragCanvas(enable: boolean): void;
         zoomCanvas(enable: boolean): void;
 
+        mode(): Mode;
         cancel(): void;
+        configure(configuration: Configuration): void;
     }
 ```
 
@@ -172,21 +179,25 @@ Standard JS events are used.
 
 ## API Reaction
 
-|              | IDLE | GROUPING | SPLITTING | DRAWING | MERGING | EDITING | DRAG | ZOOM |
-|--------------|------|----------|-----------|---------|---------|---------|------|------|
-| html()       | +    | +        | +         | +       | +       | +       | +    | +    |
-| setup()      | +    | +        | +         | +       | +       | -       | +    | +    |
-| activate()   | +    | -        | -         | -       | -       | -       | -    | -    |
-| rotate()     | +    | +        | +         | +       | +       | +       | +    | +    |
-| focus()      | +    | +        | +         | +       | +       | +       | +    | +    |
-| fit()        | +    | +        | +         | +       | +       | +       | +    | +    |
-| grid()       | +    | +        | +         | +       | +       | +       | +    | +    |
-| draw()       | +    | -        | -         | -       | -       | -       | -    | -    |
-| split()      | +    | -        | +         | -       | -       | -       | -    | -    |
-| group()      | +    | +        | -         | -       | -       | -       | -    | -    |
-| merge()      | +    | -        | -         | -       | +       | -       | -    | -    |
-| fitCanvas()  | +    | +        | +         | +       | +       | +       | +    | +    |
-| dragCanvas() | +    | -        | -         | -       | -       | -       | +    | -    |
-| zoomCanvas() | +    | -        | -         | -       | -       | -       | -    | +    |
-| cancel()     | -    | +        | +         | +       | +       | +       | +    | +    |
-| setZLayer()  | +    | +        | +         | +       | +       | +       | +    | +    |
+|              | IDLE | GROUP | SPLIT | DRAW | MERGE | EDIT | DRAG | RESIZE | ZOOM_CANVAS | DRAG_CANVAS |
+|--------------|------|-------|-------|------|-------|------|------|--------|-------------|-------------|
+| html()       | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
+| setup()      | +    | +     | +     | +    | +     | +/-  | +/-  | +/-    | +           | +           |
+| activate()   | +    | -     | -     | -    | -     | -    | -    | -      | -           | -           |
+| rotate()     | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
+| focus()      | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
+| fit()        | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
+| grid()       | +    | +     | +     | +    | +     | +    | +    | +      | +           | +           |
+| draw()       | +    | -     | -     | -    | -     | -    | -    | -      | -           | -           |
+| 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.
diff --git a/cvat-canvas/src/scss/canvas.scss b/cvat-canvas/src/scss/canvas.scss
@@ -152,6 +152,16 @@ polyline.cvat_canvas_shape_splitting {
     box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
 }
 
+#cvat_canvas_bitmap {
+    pointer-events: none;
+    position: absolute;
+    z-index: 4;
+    background: black;
+    width: 100%;
+    height: 100%;
+    box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
+}
+
 #cvat_canvas_grid {
     position: absolute;
     z-index: 2;

diff --git a/cvat-canvas/src/typescript/canvas.ts b/cvat-canvas/src/typescript/canvas.ts
@@ -11,6 +11,7 @@ import {
     CanvasModel,
     CanvasModelImpl,
     RectDrawingMethod,
+    Configuration,
 } from './canvasModel';
 
 import {
@@ -49,11 +50,13 @@ interface Canvas {
     select(objectState: any): void;
 
     fitCanvas(): void;
+    bitmap(enable: boolean): void;
     dragCanvas(enable: boolean): void;
     zoomCanvas(enable: boolean): void;
 
-    mode(): void;
+    mode(): Mode;
     cancel(): void;
+    configure(configuration: Configuration): void;
 }
 
 class CanvasImpl implements Canvas {
@@ -86,6 +89,10 @@ class CanvasImpl implements Canvas {
         );
     }
 
+    public bitmap(enable: boolean): void {
+        this.model.bitmap(enable);
+    }
+
     public dragCanvas(enable: boolean): void {
         this.model.dragCanvas(enable);
     }
@@ -141,11 +148,16 @@ class CanvasImpl implements Canvas {
     public cancel(): void {
         this.model.cancel();
     }
+
+    public configure(configuration: Configuration): void {
+        this.model.configure(configuration);
+    }
 }
 
 export {
     CanvasImpl as Canvas,
     CanvasVersion,
+    Configuration,
     RectDrawingMethod,
     Mode as CanvasMode,
 };
diff --git a/cvat-canvas/src/typescript/canvasController.ts b/cvat-canvas/src/typescript/canvasController.ts
@@ -36,7 +36,6 @@ export interface CanvasController {
     enableDrag(x: number, y: number): void;
     drag(x: number, y: number): void;
     disableDrag(): void;
-
     fit(): void;
 }