Supported type for all labels

CHANGELOG.md

@@ -70,6 +70,7 @@ non-ascii paths while adding files from "Connected file share" (issue #4428)
 - Create manifest with cvat/server docker container command (<https://github.com/opencv/cvat/pull/5172>)
 - Cannot assign a resource to a user who has an organization (<https://github.com/opencv/cvat/pull/5218>)
 - Logs and annotations are not saved when logout from a job page (<https://github.com/opencv/cvat/pull/5266>)
+- Added "type" field for all the labels, allows to reduce number of controls on annotation view (<https://github.com/opencv/cvat/pull/5273>)
 - Occluded not applied on canvas instantly for a skeleton elements (<https://github.com/opencv/cvat/pull/5259>)
 - Oriented bounding boxes broken with COCO format ss(<https://github.com/opencv/cvat/pull/5219>)
 - Fixed upload resumption in production environments

cvat-ui/package.json

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

cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx

@@ -1,14 +1,16 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
 import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons';
-import { SelectValue } from 'antd/lib/select';
 import Layout, { SiderProps } from 'antd/lib/layout';
 import Text from 'antd/lib/typography/Text';
 
+import { filterApplicableLabels } from 'utils/filter-applicable-labels';
+import { Label } from 'cvat-core-wrapper';
 import { Canvas } from 'cvat-canvas-wrapper';
 import { Canvas3d } from 'cvat-canvas3d-wrapper';
 import { LogType } from 'cvat-logger';
@@ -147,6 +149,7 @@ function AttributeAnnotationSidebar(props: StateToProps & DispatchToProps): JSX.
         activatedStateID === null || activatedIndex === -1 ? null : filteredStates[activatedIndex];
 
     const activeAttribute = activeObjectState ? labelAttrMap[activeObjectState.label.id] : null;
+    const applicableLabels = activeObjectState ? filterApplicableLabels(activeObjectState, labels) : [];
 
     if (canvasIsReady) {
         if (activeObjectState) {
@@ -308,12 +311,10 @@ function AttributeAnnotationSidebar(props: StateToProps & DispatchToProps): JSX.
                     nextObject={nextObject}
                 />
                 <ObjectBasicsEditor
-                    currentLabel={activeObjectState.label.name}
-                    labels={labels}
-                    changeLabel={(value: SelectValue): void => {
-                        const labelName = value as string;
-                        const [newLabel] = labels.filter((_label): boolean => _label.name === labelName);
-                        activeObjectState.label = newLabel;
+                    currentLabel={activeObjectState.label.id}
+                    labels={applicableLabels}
+                    changeLabel={(value: Label): void => {
+                        activeObjectState.label = value;
                         updateAnnotations([activeObjectState]);
                     }}
                 />

cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/object-basics-edtior.tsx

@@ -1,30 +1,29 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-import Select, { SelectValue } from 'antd/lib/select';
+import { Label } from 'cvat-core-wrapper';
+import LabelSelector from 'components/label-selector/label-selector';
 
 interface Props {
-    currentLabel: string;
-    labels: any[];
-    changeLabel(value: SelectValue): void;
+    currentLabel: number;
+    labels: Label[];
+    changeLabel(value: Label): void;
 }
 
 function ObjectBasicsEditor(props: Props): JSX.Element {
     const { currentLabel, labels, changeLabel } = props;
 
     return (
         <div className='cvat-attribute-annotation-sidebar-basics-editor'>
-            <Select value={currentLabel} onChange={changeLabel} style={{ width: '50%' }}>
-                {labels.map(
-                    (label: any): JSX.Element => (
-                        <Select.Option value={label.name} key={label.name}>
-                            {label.name}
-                        </Select.Option>
-                    ),
-                )}
-            </Select>
+            <LabelSelector
+                style={{ width: '50%' }}
+                labels={labels}
+                value={currentLabel}
+                onChange={changeLabel}
+            />
         </div>
     );
 }

cvat-ui/src/components/annotation-page/attribute-annotation-workspace/styles.scss

@@ -1,4 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -10,7 +11,7 @@
 
 .attribute-annotation-sidebar:not(.ant-layout-sider-collapsed) {
     background: $background-color-2;
-    padding: 5px;
+    padding: $grid-unit-size;
 
     > .ant-layout-sider-children {
         display: flex;
@@ -24,7 +25,7 @@
     align-items: center;
     justify-content: space-between;
     font-size: 18px;
-    margin-top: 10px;
+    margin-top: $grid-unit-size;
 
     > span {
         max-width: 60%;
@@ -40,13 +41,13 @@
 .cvat-attribute-annotation-sidebar-basics-editor {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: center;
     font-size: 18px;
-    margin: 10px 0;
+    margin: $grid-unit-size 0;
 }
 
 .attribute-annotations-sidebar-not-found-wrapper {
-    margin-top: 20px;
+    margin-top: $grid-unit-size * 3;
     text-align: center;
     flex-grow: 10;
 }
@@ -56,7 +57,7 @@
 }
 
 .attribute-annotation-sidebar-attr-list-wrapper {
-    margin: 10px 0 10px 10px;
+    margin: $grid-unit-size 0 $grid-unit-size $grid-unit-size;
 }
 
 .attribute-annotation-sidebar-attr-elem-wrapper {
@@ -75,5 +76,5 @@
 }
 
 .cvat-sidebar-collapse-button-spacer {
-    height: 32px;
+    height: $grid-unit-size * 4;
 }

cvat-ui/src/components/annotation-page/canvas/brush-tools.tsx

@@ -12,7 +12,8 @@ import Icon, { VerticalAlignBottomOutlined } from '@ant-design/icons';
 import InputNumber from 'antd/lib/input-number';
 import Select from 'antd/lib/select';
 
-import { getCore } from 'cvat-core-wrapper';
+import { filterApplicableForType } from 'utils/filter-applicable-labels';
+import { getCore, Label } from 'cvat-core-wrapper';
 import { Canvas, CanvasMode } from 'cvat-canvas-wrapper';
 import {
     BrushIcon, EraserIcon, PolygonMinusIcon, PolygonPlusIcon,
@@ -44,6 +45,7 @@ function BrushTools(): React.ReactPortal | null {
     const [brushForm, setBrushForm] = useState<'circle' | 'square'>('circle');
     const [[top, left], setTopLeft] = useState([0, 0]);
     const [brushSize, setBrushSize] = useState(10);
+    const [applicableLabels, setApplicableLabels] = useState<Label[]>([]);
 
     const [removeUnderlyingPixels, setRemoveUnderlyingPixels] = useState(false);
     const dragBar = useDraggable(
@@ -99,6 +101,10 @@ function BrushTools(): React.ReactPortal | null {
         }
     }, [currentTool, brushSize, brushForm, visible, defaultLabelID, editableState]);
 
+    useEffect(() => {
+        setApplicableLabels(filterApplicableForType(ShapeType.MASK, labels));
+    }, [labels]);
+
     useEffect(() => {
         const canvasContainer = window.document.getElementsByClassName('cvat-canvas-container')[0];
         if (canvasContainer) {
@@ -254,9 +260,9 @@ function BrushTools(): React.ReactPortal | null {
                 icon={<VerticalAlignBottomOutlined />}
                 onClick={() => setRemoveUnderlyingPixels(!removeUnderlyingPixels)}
             />
-            { !editableState && (
+            { !editableState && !!applicableLabels.length && (
                 <LabelSelector
-                    labels={labels}
+                    labels={applicableLabels}
                     value={defaultLabelID}
                     onChange={({ id: labelID }: { id: number }) => {
                         if (Number.isInteger(labelID)) {

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/labels-list.tsx

@@ -1,12 +1,13 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
 import React, { useCallback, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import message from 'antd/lib/message';
 
-import { CombinedState } from 'reducers';
+import { CombinedState, ObjectType } from 'reducers';
 import { rememberObject, updateAnnotationsAsync } from 'actions/annotation-actions';
 import LabelItemContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/label-item';
 import GlobalHotKeys from 'utils/mousetrap-react';
@@ -15,6 +16,8 @@ function LabelsListComponent(): JSX.Element {
     const dispatch = useDispatch();
     const labels = useSelector((state: CombinedState) => state.annotation.job.labels);
     const activatedStateID = useSelector((state: CombinedState) => state.annotation.annotations.activatedStateID);
+    const activeShapeType = useSelector((state: CombinedState) => state.annotation.drawing.activeShapeType);
+    const activeObjectType = useSelector((state: CombinedState) => state.annotation.drawing.activeObjectType);
     const states = useSelector((state: CombinedState) => state.annotation.annotations.states);
     const keyMap = useSelector((state: CombinedState) => state.shortcuts.keyMap);
 
@@ -72,14 +75,20 @@ function LabelsListComponent(): JSX.Element {
             if (Number.isInteger(labelID) && label) {
                 if (Number.isInteger(activatedStateID)) {
                     const activatedState = states.filter((state: any) => state.clientID === activatedStateID)[0];
-                    if (activatedState) {
+                    const bothAreTags = activatedState.objectType === ObjectType.TAG && label.type === ObjectType.TAG;
+                    const labelIsApplicable = label.type === 'any' || activatedState.shapeType === label.type || bothAreTags;
+                    if (activatedState && labelIsApplicable) {
                         activatedState.label = label;
                         dispatch(updateAnnotationsAsync([activatedState]));
                     }
                 } else {
-                    dispatch(rememberObject({ activeLabelID: labelID }));
-                    message.destroy();
-                    message.success(`Default label was changed to "${label.name}"`);
+                    const bothAreTags = activeObjectType === ObjectType.TAG && label.type === ObjectType.TAG;
+                    const labelIsApplicable = label.type === 'any' || activeShapeType === label.type || bothAreTags;
+                    if (labelIsApplicable) {
+                        dispatch(rememberObject({ activeLabelID: labelID }));
+                        message.destroy();
+                        message.success(`Default label has been changed to "${label.name}"`);
+                    }
                 }
             }
         },

cvat-ui/src/components/annotation-page/standard3D-workspace/controls-side-bar/controls-side-bar.tsx

@@ -1,10 +1,12 @@
 // Copyright (C) 2021-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
 import Layout from 'antd/lib/layout';
-import { ActiveControl } from 'reducers';
+import { ActiveControl, ShapeType } from 'reducers';
+import { Label } from 'cvat-core-wrapper';
 import { Canvas3d as Canvas } from 'cvat-canvas3d-wrapper';
 import MoveControl, {
     Props as MoveControlProps,
@@ -20,13 +22,14 @@ import GroupControl, {
 } from 'components/annotation-page/standard-workspace/controls-side-bar/group-control';
 import GlobalHotKeys, { KeyMap } from 'utils/mousetrap-react';
 import ControlVisibilityObserver from 'components/annotation-page/standard-workspace/controls-side-bar/control-visibility-observer';
+import { filterApplicableForType } from 'utils/filter-applicable-labels';
 
 interface Props {
     keyMap: KeyMap;
     canvasInstance: Canvas;
     activeControl: ActiveControl;
     normalizedKeyMap: Record<string, string>;
-    labels: any[];
+    labels: Label[];
     jobInstance: any;
     repeatDrawShape(): void;
     redrawShape(): void;
@@ -55,6 +58,7 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
         jobInstance,
     } = props;
 
+    const applicableLabels = filterApplicableForType(ShapeType.CUBOID, labels);
     const preventDefault = (event: KeyboardEvent | undefined): void => {
         if (event) {
             event.preventDefault();
@@ -74,7 +78,7 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
         },
     };
 
-    if (labels.length) {
+    if (applicableLabels.length) {
         handlers = {
             ...handlers,
             PASTE_SHAPE: (event: KeyboardEvent | undefined) => {
@@ -138,15 +142,15 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
             <ObservedDrawCuboidControl
                 canvasInstance={canvasInstance}
                 isDrawing={activeControl === ActiveControl.DRAW_CUBOID}
-                disabled={!labels.length}
+                disabled={!applicableLabels.length}
             />
             <ObservedGroupControl
                 switchGroupShortcut={normalizedKeyMap.SWITCH_GROUP_MODE}
                 resetGroupShortcut={normalizedKeyMap.RESET_GROUP}
                 canvasInstance={canvasInstance}
                 activeControl={activeControl}
                 groupObjects={groupObjects}
-                disabled={!labels.length}
+                disabled={!applicableLabels.length}
                 jobInstance={jobInstance}
             />
         </Layout.Sider>

cvat-ui/src/components/annotation-page/tag-annotation-workspace/tag-annotation-sidebar/shortcuts-select.tsx

@@ -1,14 +1,15 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
 import React, { useState, useEffect } from 'react';
-import { useSelector } from 'react-redux';
 import { Row, Col } from 'antd/lib/grid';
 import Text from 'antd/lib/typography/Text';
 import Select from 'antd/lib/select';
 
-import { CombinedState, DimensionType } from 'reducers';
+import { DimensionType } from 'reducers';
+import { Label } from 'cvat-core-wrapper';
 import GlobalHotKeys, { KeyMap } from 'utils/mousetrap-react';
 import { shift } from 'utils/math';
 
@@ -18,6 +19,7 @@ interface ShortcutLabelMap {
 
 type Props = {
     onShortcutPress(event: KeyboardEvent | undefined, labelID: number): void;
+    labels: Label[];
 };
 
 const defaultShortcutLabelMap = {
@@ -34,8 +36,7 @@ const defaultShortcutLabelMap = {
 } as ShortcutLabelMap;
 
 const ShortcutsSelect = (props: Props): JSX.Element => {
-    const { onShortcutPress } = props;
-    const { labels } = useSelector((state: CombinedState) => state.annotation.job);
+    const { labels, onShortcutPress } = props;
     const [shortcutLabelMap, setShortcutLabelMap] = useState(defaultShortcutLabelMap);
 
     const keyMap: KeyMap = {};
@@ -69,7 +70,7 @@ const ShortcutsSelect = (props: Props): JSX.Element => {
                 if (event) {
                     event.preventDefault();
                 }
-                onShortcutPress(event, label.id);
+                onShortcutPress(event, label.id as number);
             };
         });