Merge branch 'develop' into zm/update-dm-0.1.8

CHANGELOG.md

@@ -5,7 +5,28 @@ 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.3.0-alpha] - Unreleased
+## [1.4.0] - Unreleased
+
+### Added
+-
+
+### Changed
+-
+
+### Deprecated
+-
+
+### Removed
+-
+
+### Fixed
+-
+
+### Security
+-
+
+
+## [1.3.0] - 3/31/2021
 
 ### Added
 
@@ -16,8 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (<https://github.com/openvinotoolkit/cvat/pull/2645>)
 - Intelligent scissors with OpenCV javascript (<https://github.com/openvinotoolkit/cvat/pull/2689>)
 - CVAT-3D: Visualize 3D point cloud spaces in 3D View, Top View Side View and Front View (<https://github.com/openvinotoolkit/cvat/pull/2768>)
-- [Inside Outside Guidence](https://github.com/shiyinzhang/Inside-Outside-Guidance) serverless
-  function for interative segmentation
+- [Inside Outside Guidance](https://github.com/shiyinzhang/Inside-Outside-Guidance) serverless
+  function for interactive segmentation
 - Pre-built [cvat_server](https://hub.docker.com/r/openvino/cvat_server) and
   [cvat_ui](https://hub.docker.com/r/openvino/cvat_ui) images were published on DockerHub (<https://github.com/openvinotoolkit/cvat/pull/2766>)
 - Project task subsets (<https://github.com/openvinotoolkit/cvat/pull/2774>)
@@ -33,7 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Annotations filters UI using react-awesome-query-builder (https://github.com/openvinotoolkit/cvat/issues/1418)
 - Storing settings in local storage to keep them between browser sessions (<https://github.com/openvinotoolkit/cvat/pull/3017>)
 - [ICDAR](https://rrc.cvc.uab.es/?ch=2) format support (<https://github.com/openvinotoolkit/cvat/pull/2866>)
-- Added switcher to maintain poylgon crop behaviour (<https://github.com/openvinotoolkit/cvat/pull/3021>
+- Added switcher to maintain polygon crop behavior (<https://github.com/openvinotoolkit/cvat/pull/3021>
 - Filters and sorting options for job list, added tooltip for tasks filters (<https://github.com/openvinotoolkit/cvat/pull/3030>)
 - Documentation on mask annotation (<https://github.com/openvinotoolkit/cvat/pull/3044>)
 
@@ -43,35 +64,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated HTTPS install README section (cleanup and described more robust deploy)
 - Logstash is improved for using with configurable elasticsearch outputs (<https://github.com/openvinotoolkit/cvat/pull/2531>)
 - Bumped nuclio version to 1.5.16 (<https://github.com/openvinotoolkit/cvat/pull/2578>)
-- All methods for interative segmentation accept negative points as well
+- All methods for interactive segmentation accept negative points as well
 - Persistent queue added to logstash (<https://github.com/openvinotoolkit/cvat/pull/2744>)
-- Improved maintanance of popups visibility (<https://github.com/openvinotoolkit/cvat/pull/2809>)
+- Improved maintenance of popups visibility (<https://github.com/openvinotoolkit/cvat/pull/2809>)
 - Image visualizations settings on canvas for faster access (<https://github.com/openvinotoolkit/cvat/pull/2872>)
 - Better scale management of left panel when screen is too small (<https://github.com/openvinotoolkit/cvat/pull/2880>)
 - Improved error messages for annotation import (<https://github.com/openvinotoolkit/cvat/pull/2935>)
 - Using manifest support instead video meta information and dummy chunks (<https://github.com/openvinotoolkit/cvat/pull/2763>)
 
-### Deprecated
-
--
-
-### Removed
-
--
-
 ### Fixed
 
 - More robust execution of nuclio GPU functions by limiting the GPU memory consumption per worker (<https://github.com/openvinotoolkit/cvat/pull/2714>)
 - Kibana startup initialization (<https://github.com/openvinotoolkit/cvat/pull/2659>)
 - The cursor jumps to the end of the line when renaming a task (<https://github.com/openvinotoolkit/cvat/pull/2669>)
 - SSLCertVerificationError when remote source is used (<https://github.com/openvinotoolkit/cvat/pull/2683>)
 - Fixed filters select overflow (<https://github.com/openvinotoolkit/cvat/pull/2614>)
-- Fixed tasks in project autoannotation (<https://github.com/openvinotoolkit/cvat/pull/2725>)
+- Fixed tasks in project auto annotation (<https://github.com/openvinotoolkit/cvat/pull/2725>)
 - Cuboids are missed in annotations statistics (<https://github.com/openvinotoolkit/cvat/pull/2704>)
 - The list of files attached to the task is not displayed (<https://github.com/openvinotoolkit/cvat/pul
 - A couple of css-related issues (top bar disappear, wrong arrow position on collapse elements) (<https://github.com/openvinotoolkit/cvat/pull/2736>)
 - Issue with point region doesn't work in Firefox (<https://github.com/openvinotoolkit/cvat/pull/2727>)
-- Fixed cuboid perpective change (<https://github.com/openvinotoolkit/cvat/pull/2733>)
+- Fixed cuboid perspective change (<https://github.com/openvinotoolkit/cvat/pull/2733>)
 - Annotation page popups (ai tools, drawing) reset state after detecting, tracking, drawing (<https://github.com/openvinotoolkit/cvat/pull/2780>)
 - Polygon editing using trailing point (<https://github.com/openvinotoolkit/cvat/pull/2808>)
 - Updated the path to python for DL models inside automatic annotation documentation (<https://github.com/openvinotoolkit/cvat/pull/2847>)
@@ -88,10 +101,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Crop a polygon if its points are outside the bounds of the image (<https://github.com/openvinotoolkit/cvat/pull/3025>)
 - Export of instance masks with holes (<https://github.com/openvinotoolkit/cvat/pull/3044>)
 
-### Security
-
--
-
 ## [1.2.0] - 2021-01-08
 
 ### Fixed

cvat-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {

cvat-ui/src/components/annotation-page/top-bar/filters-modal.tsx

@@ -251,7 +251,7 @@ export default function FiltersModalComponent(props: Props): JSX.Element {
 
     return (
         <Modal
-            className='cvat-filters-modal'
+            className={visible ? 'cvat-filters-modal cvat-filters-modal-visible' : 'cvat-filters-modal'}
             visible={visible}
             closable={false}
             width={800}

cvat-ui/src/components/header/settings-modal/settings-modal.tsx

@@ -45,7 +45,9 @@ const SettingsModal = (props: SettingsModalProps): JSX.Element => {
     useEffect(() => {
         try {
             const newSettings: any = {};
-            const loadedSettings = JSON.parse(localStorage.getItem('clientSettings') as string);
+            const settingsString = localStorage.getItem('clientSettings') as string;
+            if (!settingsString) return;
+            const loadedSettings = JSON.parse(settingsString);
             for (const [sectionKey, section] of Object.entries(settings)) {
                 for (const [key, value] of Object.entries(section)) {
                     let settedValue = value;

cvat/__init__.py

@@ -4,6 +4,6 @@
 
 from cvat.utils.version import get_version
 
-VERSION = (1, 3, 0, 'alpha', 0)
+VERSION = (1, 4, 0, 'alpha', 0)
 
 __version__ = get_version(VERSION)

cvat/apps/documentation/user_guide.md

@@ -677,11 +677,31 @@ In addition the workspace also has the following functions:
 
   ![](static/documentation/images/image140.jpg)
 
+- `Image settings panel` -  used to set up the grid and set up image brightness contrast saturation.
+
+  - Show `Grid`, change grid size, choose color and transparency:
+
+    ![](static/documentation/images/image068_mapillary_vistas.jpg)
+
+  - Adjust `Brightness`/`Contrast`/`Saturation` of too exposed or too
+  dark images using `F3` — color settings (changes displaying settings and not the
+  image itself).
+
+  Shortcuts:
+
+  - `Shift+B+=`/`Shift+B+-` for brightness.
+  - `Shift+C+=`/`Shift+C+-` for contrast.
+  - `Shift+S+=`/`Shift+S+-` for saturation.
+
+    ![](static/documentation/images/image164_mapillary_vistas.jpg)
+
+  - `Reset color settings` to default values.
+
 ---
 
 ### Settings
 
-To open the settings open the user menu in the header and select the settings item or press `F3`.
+To open the settings open the user menu in the header and select the settings item or press `F2`.
 
 ![](static/documentation/images/image067.jpg)
 
@@ -692,26 +712,9 @@ In tab `Player` you can:
 - Control step of `C` and `V` shortcuts.
 - Control speed of `Space`/`Play` button.
 - Select canvas background color. You can choose a background color or enter manually (in RGB or HEX format).
-- Show `Grid`, change grid size, choose color and transparency:
-
-  ![](static/documentation/images/image068_mapillary_vistas.jpg)
-
-- Show every image in full size or zoomed out like previous
+- `Reset zoom` Show every image in full size or zoomed out like previous
   (it is enabled by default for interpolation mode and disabled for annotation mode).
 - `Rotate all images` checkbox — switch the rotation of all frames or an individual frame.
-- Adjust `Brightness`/`Contrast`/`Saturation` of too exposed or too
-  dark images using `F3` — color settings (changes displaying settings and not the
-  image itself).
-
-Shortcuts:
-
-- `Shift+B+=`/`Shift+B+-` for brightness.
-- `Shift+C+=`/`Shift+C+-` for contrast.
-- `Shift+S+=`/`Shift+S+-` for saturation.
-
-  ![](static/documentation/images/image164_mapillary_vistas.jpg)
-
-- `Reset color settings` to default values.
 
 ---
 
@@ -729,9 +732,12 @@ In tab `Workspace` you can:
 
 - `Automatic bordering` - enable automatic bordering for polygons and polylines during drawing/editing.
   For more information To find out more, go to the section [annotation with polygons](#Annotation-with-polygons).
+
+- `Intelligent polygon cropping` - activates intelligent cropping when editing the polygon (read more in the section [edit polygon](#edit-polygon)
+
 - `Attribute annotation mode (AAM) zoom margin` input box — defines margins (in px)
   for shape in the attribute annotation mode.
-- Press ` Go back` or `F3` to return to the annotation.
+- Click `Save` to save settings (settings will be saved on the server and will not change after the page is refreshed). Click `Cancel`  or press `F2` to return to the annotation.
 
 ---
 
@@ -1259,10 +1265,18 @@ If you need to annotate small objects, increase `Image Quality` to
 
 ### Edit polygon
 
-To edit a polygon you have to click with pressed `Shift`, it will open the polygon editor.
+To edit a polygon you have to click on it while holding `Shift`, it will open the polygon editor.
+
+- In the editor you can create new points or delete part of a polygon by closing the line on another point.
+- When `Intelligent polygon cropping` option is activated in the settings, СVAT considers two criteria to decide which part of a polygon should be cut off during automatic editing.
+  - The first criteria is a number of cut points.
+  - The second criteria is a length of a cut curve.
+
+  If both criteria recommend to cut the same part, algorithm works automatically, and if not, a user has to make the decision.
+  If you want to choose manually which part of a polygon should be cut off, disable `Intelligent polygon cropping` in the settings. In this case after closing the polygon, you can select the part of the polygon you want to leave.
+
+  ![](static/documentation/images/image209.jpg)
 
-- There you can create new points or delete part of a polygon closing the line on another point.
-- After closing the polygon, you can select the part of the polygon that you want to leave.
 - You can press `Esc` to cancel editing.
 
   ![](static/documentation/images/gif007_mapillary_vistas.gif)

cvat/requirements/development.txt

@@ -1,5 +1,5 @@
 -r base.txt
-pylint==2.6.0
+pylint==2.7.0
 pylint-django==2.3.0
 pylint-plugin-utils==0.6
 rope==0.17.0

package.json

@@ -46,7 +46,7 @@
     "instrument": "nyc instrument cvat-ui cvat-ui_cov && nyc instrument cvat-canvas cvat-canvas_cov && nyc instrument cvat-data cvat-data_cov && nyc instrument cvat-core cvat-core_cov",
     "cp": "cp -r cvat-ui_cov/* cvat-ui && cp -r cvat-canvas_cov/* cvat-canvas && cp -r cvat-data_cov/* cvat-data && cp -r cvat-core_cov/* cvat-core",
     "rm": "rm -rf cvat-ui_cov cvat-canvas_cov cvat-data_cov cvat-core_cov",
-    "prepare": "husky install && npx husky add .husky/pre-commit \"npx lint-staged\"",
+    "prepare": "husky install && rm .husky/pre-commit; npx husky add .husky/pre-commit \"npx lint-staged\"",
     "precommit:cvat-data": "cd cvat-ui && eslint --fix",
     "precommit:cvat-core": "cd cvat-ui && eslint --fix",
     "precommit:cvat-canvas": "cd cvat-ui && eslint --fix",