Add propagate shapes action

changelog.d/20240619_102529_klakhov_propagate_shapes_simultaneously.md

@@ -0,0 +1,4 @@
+### Added
+
+- `Propagate shapes` action that allows to propagate all filtered shapes simultaneously
+  (<https://github.com/cvat-ai/cvat/pull/8044>)

cvat-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-core",
-  "version": "15.0.6",
+  "version": "15.0.7",
   "type": "module",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "src/api.ts",

cvat-core/src/annotations-actions.ts

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 CVAT.ai Corporation
+// Copyright (C) 2023-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -9,6 +9,7 @@ import { Job, Task } from './session';
 import { EventScope, ObjectType } from './enums';
 import ObjectState from './object-state';
 import { getAnnotations, getCollection } from './annotations';
+import { propagateShapes } from './object-utils';
 
 export interface SingleFrameActionInput {
     collection: Omit<SerializedCollection, 'tracks' | 'tags' | 'version'>;
@@ -28,12 +29,20 @@ export enum ActionParameterType {
     NUMBER = 'number',
 }
 
+// For SELECT values should be a list of possible options
+// For NUMBER values should be a list with [min, max, step],
+// supported special values: 'frameCount'
 type ActionParameters = Record<string, {
     type: ActionParameterType;
     values: string[];
     defaultValue: string;
 }>;
 
+export enum FrameSelectionType {
+    SEGMENT = 'segment',
+    CURRENT_FRAME = 'current_frame',
+}
+
 export default class BaseSingleFrameAction {
     /* eslint-disable @typescript-eslint/no-unused-vars */
     public async init(
@@ -58,6 +67,10 @@ export default class BaseSingleFrameAction {
     public get parameters(): ActionParameters | null {
         throw new Error('Method not implemented');
     }
+
+    public get frameSelection(): FrameSelectionType {
+        return FrameSelectionType.SEGMENT;
+    }
 }
 
 class RemoveFilteredShapes extends BaseSingleFrameAction {
@@ -82,6 +95,45 @@ class RemoveFilteredShapes extends BaseSingleFrameAction {
     }
 }
 
+class PropagateShapes extends BaseSingleFrameAction {
+    #targetFrame: number;
+
+    public async init(instance, parameters): Promise<void> {
+        this.#targetFrame = parameters['Target frame'];
+    }
+
+    public async destroy(): Promise<void> {
+        // nothing to destroy
+    }
+
+    public async run(
+        instance,
+        { collection: frameCollection, frameData: { number } },
+    ): Promise<SingleFrameActionOutput> {
+        const { shapes } = frameCollection;
+        const propagatedShapes = propagateShapes(shapes, number, this.#targetFrame);
+        return { collection: { shapes: [...shapes, ...propagatedShapes] } };
+    }
+
+    public get name(): string {
+        return 'Propagate shapes';
+    }
+
+    public get parameters(): ActionParameters | null {
+        return {
+            'Target frame': {
+                type: ActionParameterType.NUMBER,
+                values: ['0', 'frameCount', '1'],
+                defaultValue: '0',
+            },
+        };
+    }
+
+    public get frameSelection(): FrameSelectionType {
+        return FrameSelectionType.CURRENT_FRAME;
+    }
+}
+
 const registeredActions: BaseSingleFrameAction[] = [];
 
 export async function listActions(): Promise<BaseSingleFrameAction[]> {
@@ -102,6 +154,7 @@ export async function registerAction(action: BaseSingleFrameAction): Promise<voi
 }
 
 registerAction(new RemoveFilteredShapes());
+registerAction(new PropagateShapes());
 
 async function runSingleFrameChain(
     instance: Job | Task,

cvat-core/src/object-utils.ts

@@ -5,6 +5,7 @@
 import { DataError, ArgumentError } from './exceptions';
 import { Attribute } from './labels';
 import { ShapeType, AttributeType } from './enums';
+import { SerializedShape } from './server-response-types';
 
 export function checkNumberOfPoints(shapeType: ShapeType, points: number[]): void {
     if (shapeType === ShapeType.RECTANGLE) {
@@ -356,3 +357,35 @@ export function rle2Mask(rle: number[], width: number, height: number): number[]
 
     return decoded;
 }
+
+export function propagateShapes(shapes: SerializedShape[], from: number, to: number): SerializedShape[] {
+    const getCopyFromShape = (shape: SerializedShape): SerializedShape => ({
+        attributes: shape.attributes,
+        points: shape.type === 'skeleton' ? null : [...shape.points],
+        occluded: shape.occluded,
+        type: shape.type,
+        label_id: shape.label_id,
+        z_order: shape.z_order,
+        rotation: shape.rotation,
+        frame: from,
+        elements: shape.type === 'skeleton' ? shape.elements
+            .map((element: SerializedShape): SerializedShape => getCopyFromShape(element)) : [],
+        source: shape.source,
+        group: 0,
+        outside: false,
+    });
+
+    const states = [];
+    const sign = Math.sign(to - from);
+    for (let frame = from + sign; sign > 0 ? frame <= to : frame >= to; frame += sign) {
+        for (let idx = 0; idx < shapes.length; idx++) {
+            const shape = shapes[idx];
+            const copy = getCopyFromShape(shape);
+
+            copy.frame = frame;
+            copy.elements.forEach((element: SerializedShape) => { element.frame = frame; });
+            states.push(copy);
+        }
+    }
+    return states;
+}

cvat-ui/package.json

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

cvat-ui/src/components/annotation-page/annotations-actions/annotations-actions-modal.tsx

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 CVAT.ai Corporation
+// Copyright (C) 2023-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -19,7 +19,9 @@ import config from 'config';
 import { useIsMounted } from 'utils/hooks';
 import { createAction, ActionUnion } from 'utils/redux';
 import { getCVATStore } from 'cvat-store';
-import { BaseSingleFrameAction, Job, getCore } from 'cvat-core-wrapper';
+import {
+    BaseSingleFrameAction, FrameSelectionType, Job, getCore,
+} from 'cvat-core-wrapper';
 import { Canvas } from 'cvat-canvas-wrapper';
 import { fetchAnnotationsAsync, saveAnnotationsAsync } from 'actions/annotation-actions';
 import { switchAutoSave } from 'actions/settings-actions';
@@ -108,6 +110,18 @@ const reducer = (state: State, action: ActionUnion<typeof reducerActions>): Stat
     }
 
     if (action.type === ReducerActionType.SET_ACTIVE_ANNOTATIONS_ACTION) {
+        const { frameSelection } = action.payload.activeAction;
+        if (frameSelection === FrameSelectionType.CURRENT_FRAME) {
+            const storage = getCVATStore();
+            const currentFrame = storage.getState().annotation.player.frame.number;
+            return {
+                ...state,
+                frameFrom: currentFrame,
+                frameTo: currentFrame,
+                activeAction: action.payload.activeAction,
+                actionParameters: {},
+            };
+        }
         return {
             ...state,
             activeAction: action.payload.activeAction,
@@ -204,6 +218,7 @@ function ActionParameterComponent(props: Props & { onChange: (value: string) =>
     const {
         defaultValue, type, values, onChange,
     } = props;
+    const store = getCVATStore();
     const [value, setValue] = useState(defaultValue);
 
     useEffect(() => {
@@ -220,7 +235,13 @@ function ActionParameterComponent(props: Props & { onChange: (value: string) =>
         );
     }
 
-    const [min, max, step] = values.map((val) => +val);
+    const [min, max, step] = values.map((val) => {
+        if (val === 'frameCount') {
+            return store.getState().annotation.job.instance?.frameCount || 0;
+        }
+        return +val;
+    });
+
     return (
         <InputNumber
             value={+value}
@@ -277,6 +298,8 @@ function AnnotationsActionsModalContent(props: { onClose: () => void; }): JSX.El
         progress, progressMessage, frameFrom, frameTo, actionParameters, modalVisible,
     } = state;
 
+    const currentFrameAction = activeAction?.frameSelection === FrameSelectionType.CURRENT_FRAME;
+
     return (
         <Modal
             closable={false}
@@ -414,6 +437,7 @@ function AnnotationsActionsModalContent(props: { onClose: () => void; }): JSX.El
                                         value={frameFrom}
                                         min={(jobInstance as Job).startFrame}
                                         max={frameTo}
+                                        disabled={currentFrameAction}
                                         step={1}
                                         onChange={(value) => {
                                             if (typeof value === 'number') {
@@ -428,6 +452,7 @@ function AnnotationsActionsModalContent(props: { onClose: () => void; }): JSX.El
                                         value={frameTo}
                                         min={frameFrom}
                                         max={(jobInstance as Job).stopFrame}
+                                        disabled={currentFrameAction}
                                         step={1}
                                         onChange={(value) => {
                                             if (typeof value === 'number') {
@@ -440,51 +465,55 @@ function AnnotationsActionsModalContent(props: { onClose: () => void; }): JSX.El
                                 </Col>
                             </Row>
                         </Col>
-                        <Col span={24} className='cvat-action-runner-frames-predefined'>
-                            <Row>
-                                <Col span={24}>
-                                    <Text strong>Or choose one of predefined options </Text>
-                                    <hr />
-                                </Col>
-                                <Col span={24}>
-                                    <Button
-                                        onClick={() => {
-                                            const current = storage.getState().annotation.player.frame.number;
-                                            dispatch(reducerActions.updateFrameFrom(current));
-                                            dispatch(reducerActions.updateFrameTo(current));
-                                        }}
-                                    >
-                                        Current frame
-                                    </Button>
-                                    <Button
-                                        onClick={() => {
-                                            dispatch(reducerActions.updateFrameFrom(jobInstance.startFrame));
-                                            dispatch(reducerActions.updateFrameTo(jobInstance.stopFrame));
-                                        }}
-                                    >
-                                        All frames
-                                    </Button>
-                                    <Button
-                                        onClick={() => {
-                                            const current = storage.getState().annotation.player.frame.number;
-                                            dispatch(reducerActions.updateFrameFrom(current));
-                                            dispatch(reducerActions.updateFrameTo(jobInstance.stopFrame));
-                                        }}
-                                    >
-                                        From current
-                                    </Button>
-                                    <Button
-                                        onClick={() => {
-                                            const current = storage.getState().annotation.player.frame.number;
-                                            dispatch(reducerActions.updateFrameFrom(jobInstance.startFrame));
-                                            dispatch(reducerActions.updateFrameTo(current));
-                                        }}
-                                    >
-                                        Up to current
-                                    </Button>
+                        {
+                            !currentFrameAction ? (
+                                <Col span={24} className='cvat-action-runner-frames-predefined'>
+                                    <Row>
+                                        <Col span={24}>
+                                            <Text strong>Or choose one of predefined options </Text>
+                                            <hr />
+                                        </Col>
+                                        <Col span={24}>
+                                            <Button
+                                                onClick={() => {
+                                                    const current = storage.getState().annotation.player.frame.number;
+                                                    dispatch(reducerActions.updateFrameFrom(current));
+                                                    dispatch(reducerActions.updateFrameTo(current));
+                                                }}
+                                            >
+                                                Current frame
+                                            </Button>
+                                            <Button
+                                                onClick={() => {
+                                                    dispatch(reducerActions.updateFrameFrom(jobInstance.startFrame));
+                                                    dispatch(reducerActions.updateFrameTo(jobInstance.stopFrame));
+                                                }}
+                                            >
+                                                All frames
+                                            </Button>
+                                            <Button
+                                                onClick={() => {
+                                                    const current = storage.getState().annotation.player.frame.number;
+                                                    dispatch(reducerActions.updateFrameFrom(current));
+                                                    dispatch(reducerActions.updateFrameTo(jobInstance.stopFrame));
+                                                }}
+                                            >
+                                                From current
+                                            </Button>
+                                            <Button
+                                                onClick={() => {
+                                                    const current = storage.getState().annotation.player.frame.number;
+                                                    dispatch(reducerActions.updateFrameFrom(jobInstance.startFrame));
+                                                    dispatch(reducerActions.updateFrameTo(current));
+                                                }}
+                                            >
+                                                Up to current
+                                            </Button>
+                                        </Col>
+                                    </Row>
                                 </Col>
-                            </Row>
-                        </Col>
+                            ) : null
+                        }
                     </>
                 ) : null}
 

cvat-ui/src/cvat-core-wrapper.ts

@@ -1,5 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
-// Copyright (C) 2023 CVAT.ai Corporation
+// Copyright (C) 2023-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -37,7 +37,7 @@ import AnalyticsReport, { AnalyticsEntryViewType, AnalyticsEntry } from 'cvat-co
 import { Dumper } from 'cvat-core/src/annotation-formats';
 import { Event } from 'cvat-core/src/event';
 import { APIWrapperEnterOptions } from 'cvat-core/src/plugins';
-import BaseSingleFrameAction, { ActionParameterType } from 'cvat-core/src/annotations-actions';
+import BaseSingleFrameAction, { ActionParameterType, FrameSelectionType } from 'cvat-core/src/annotations-actions';
 
 const cvat: CVATCore = _cvat;
 
@@ -96,6 +96,7 @@ export {
     Event,
     FrameData,
     ActionParameterType,
+    FrameSelectionType,
 };
 
 export type {