Added the feature to Remove annotation objects in a specified range of frames

cvat-ui/src/actions/annotation-actions.ts

@@ -167,6 +167,10 @@ export enum AnnotationActionTypes {
     UPLOAD_JOB_ANNOTATIONS_FAILED = 'UPLOAD_JOB_ANNOTATIONS_FAILED',
     REMOVE_JOB_ANNOTATIONS_SUCCESS = 'REMOVE_JOB_ANNOTATIONS_SUCCESS',
     REMOVE_JOB_ANNOTATIONS_FAILED = 'REMOVE_JOB_ANNOTATIONS_FAILED',
+    REMOVE_ANNOTATIONS_INRANGE_SUCCESS = 'REMOVE_ANNOTATIONS_INRANGE_SUCCESS',
+    REMOVE_ANNOTATIONS_INRANGE_FAILED = 'REMOVE_ANNOTATIONS_INRANGE_FAILED',
+    REMOVE_ANNOTATIONS_INRANGE = 'REMOVE_ANNOTATIONS_INRANGE',
+    CHANGE_REMOVE_ANNOTATIONS_RANGE = 'CHANGE_REMOVE_ANNOTATIONS_RANGE',
     UPDATE_CANVAS_CONTEXT_MENU = 'UPDATE_CANVAS_CONTEXT_MENU',
     UNDO_ACTION_SUCCESS = 'UNDO_ACTION_SUCCESS',
     UNDO_ACTION_FAILED = 'UNDO_ACTION_FAILED',
@@ -504,6 +508,62 @@ export function changePropagateFrames(frames: number): AnyAction {
     };
 }
 
+
+//To remove annotation objects present in given range of frames
+export function removeAnnotationsinRangeAsync(sessionInstance: any, startFrame: number, endFrame: number, force: boolean): ThunkAction{
+    return async (dispatch: ActionCreator<Dispatch>): Promise<void> => {
+        const { filters, showAllInterpolationTracks } = receiveAnnotationsParameters();
+        try {
+
+            for(let frame = startFrame; frame<=endFrame; frame++){
+                await dispatch(changeFrameAsync(frame));
+
+                const states = await sessionInstance.annotations.get(frame, showAllInterpolationTracks, filters );
+
+                states.forEach(async (state: any) => {
+                    await   dispatch(removeObjectAsync(sessionInstance,state,force));
+                });
+            }
+
+            dispatch({
+                type: AnnotationActionTypes.REMOVE_ANNOTATIONS_INRANGE_SUCCESS,
+                payload: {
+                    startFrame,
+                    endFrame,
+                },
+            });
+
+        }catch(error){
+            dispatch({
+                type: AnnotationActionTypes.REMOVE_ANNOTATIONS_INRANGE_FAILED,
+                payload: {
+                    error,
+                },
+            });
+        }
+    }
+}
+
+
+export function removeAnnotationsinRange(sessionInstance: any | null): AnyAction {
+    return {
+        type: AnnotationActionTypes.REMOVE_ANNOTATIONS_INRANGE,
+        payload: {
+            sessionInstance,
+        },
+    };
+}
+
+export function changeRemoveAnnotationRange(startFrame: number, endFrame: number): AnyAction {
+    return {
+        type: AnnotationActionTypes.CHANGE_REMOVE_ANNOTATIONS_RANGE,
+        payload: {
+            startFrame,
+            endFrame,
+        },
+    };
+}
+
 export function removeObjectAsync(sessionInstance: any, objectState: any, force: boolean): ThunkAction {
     return async (dispatch: ActionCreator<Dispatch>): Promise<void> => {
         try {

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

@@ -5,13 +5,16 @@
 import React from 'react';
 import Menu from 'antd/lib/menu';
 import Modal from 'antd/lib/modal';
+import Button from 'antd/lib/button';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { MenuInfo } from 'rc-menu/lib/interface';
 
 import ExportDatasetModal from 'components/export-dataset/export-dataset-modal';
 import LoadSubmenu from 'components/actions-menu/load-submenu';
 import { DimensionType } from '../../../reducers/interfaces';
 
+import RemoveAnnotationsRangeContainer from 'containers/annotation-page/top-bar/remove-range-confirm';
+
 interface Props {
     taskMode: string;
     loaders: any[];
@@ -20,6 +23,7 @@ interface Props {
     isReviewer: boolean;
     jobInstance: any;
     onClickMenu(params: MenuInfo, file?: File): void;
+    removeRange(): void;
     setForceExitAnnotationFlag(forceExit: boolean): void;
     saveAnnotations(jobInstance: any, afterSave?: () => void): void;
 }
@@ -42,6 +46,7 @@ export default function AnnotationMenuComponent(props: Props): JSX.Element {
         isReviewer,
         jobInstance,
         onClickMenu,
+        removeRange,
         setForceExitAnnotationFlag,
         saveAnnotations,
     } = props;
@@ -106,21 +111,42 @@ export default function AnnotationMenuComponent(props: Props): JSX.Element {
             } else {
                 onClickMenu(copyParams);
             }
-        } else if (copyParams.key === Actions.REMOVE_ANNO) {
+         } else if (copyParams.key === Actions.REMOVE_ANNO) {
             Modal.confirm({
-                title: 'All the annotations will be removed',
+                title: 'Remove Annotations',
                 content:
-                    'You are going to remove all the annotations from the client. ' +
+                    'Select whether to remove all annotations from the job or remove within a range' + '\n' +
                     'It will stay on the server till you save the job. Continue?',
                 className: 'cvat-modal-confirm-remove-annotation',
                 onOk: () => {
-                    onClickMenu(copyParams);
+                    Modal.confirm({
+                        title: 'All the annotations will be removed',
+                        content:
+                            'You are going to remove all the annotations from the client. ' +
+                            'It will stay on the server till you save the job. Continue?',
+                        className: 'cvat-modal-confirm-remove-annotation',
+                        onOk: () => {
+                            onClickMenu(copyParams);
+                        },
+                        okButtonProps: {
+                            type: 'primary',
+                            danger: true,
+                        },
+                        okText: 'Delete',
+                    });
                 },
                 okButtonProps: {
                     type: 'primary',
-                    danger: true,
+                    danger: true
+                },
+                okText: 'Remove All',
+                onCancel: () => {
+                    removeRange();
+                },
+                cancelText: "Select Range",
+                cancelButtonProps: {
+                    type: 'primary',
                 },
-                okText: 'Delete',
             });
         } else if ([Actions.REQUEST_REVIEW].includes(copyParams.key as Actions)) {
             checkUnsavedChanges(copyParams);
@@ -178,6 +204,7 @@ export default function AnnotationMenuComponent(props: Props): JSX.Element {
             )}
             {jobStatus === 'completed' && <Menu.Item key={Actions.RENEW_JOB}>Renew the job</Menu.Item>}
             <ExportDatasetModal />
+            <RemoveAnnotationsRangeContainer/>
         </Menu>
     );
 }

cvat-ui/src/components/annotation-page/top-bar/remove-range-confirm.tsx

@@ -0,0 +1,83 @@
+// Copyright (C) 2020-2021 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+import React from 'react';
+
+import Modal from 'antd/lib/modal';
+import InputNumber from 'antd/lib/input-number';
+import Text from 'antd/lib/typography/Text';
+import { clamp } from 'utils/math';
+
+interface Props {
+    visible: boolean;
+    startFrame: number;
+    endFrame: number;
+    frameNumber: number;
+    stopFrame: number;
+    removeinRange(): void;
+    cancel(): void;
+    changeRemoveAnnotationsRange(startFrame: number, endFrame: number): void;
+}
+
+export default function RemoveRangeConfirmComponent(props: Props): JSX.Element {
+    const {
+        visible,
+        startFrame,
+        endFrame,
+        frameNumber,
+        stopFrame,
+        removeinRange,
+        changeRemoveAnnotationsRange,
+        cancel,
+    } = props;
+
+    const minStartFrames = 0;
+
+    const minEndFrames = Math.max(startFrame,0);
+
+    return (
+        <Modal
+            okType='primary'
+            okText='Yes'
+            cancelText='Cancel'
+            onOk={removeinRange}
+            onCancel={cancel}
+            title='Confirm to remove annotations in range'
+            visible={visible}
+        >
+            <div className='cvat-propagate-confirm'>
+                <Text>Do you want to remove the annotations on</Text>
+                <InputNumber
+                    className='cvat-propagate-confirm-object-on-frames'
+                    size='small'
+                    min={minStartFrames}
+                    max={stopFrame}
+                    value={startFrame}
+                    onChange={(value: number | undefined | string) => {
+                        if (typeof value !== 'undefined') {
+                            value=Math.floor(clamp(+value, 0, stopFrame-1));
+                            changeRemoveAnnotationsRange(value,endFrame);
+                        }
+                    }}
+                />
+                {startFrame > 1 ? <Text> frames </Text> : <Text> frame </Text>}
+                <Text>up to the </Text>
+                <InputNumber
+                    className='cvat-propagate-confirm-object-up-to-frame'
+                    size='small'
+                    min={minEndFrames}
+                    max={stopFrame}
+                    value={endFrame}
+                    onChange={(value: number | undefined | string) => {
+                        if (typeof value !== 'undefined') {
+                            value=Math.floor(clamp(+value, 1, stopFrame));
+                            changeRemoveAnnotationsRange(startFrame,value);
+                        }
+                    }}
+                />
+                <Text>frame</Text>
+            </div>
+        </Modal>
+    );
+}

cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx

@@ -18,6 +18,7 @@ import {
     switchRequestReviewDialog as switchRequestReviewDialogAction,
     switchSubmitReviewDialog as switchSubmitReviewDialogAction,
     setForceExitAnnotationFlag as setForceExitAnnotationFlagAction,
+    removeAnnotationsinRange as removeAnnotationsinRangeAction,
 } from 'actions/annotation-actions';
 import { exportActions } from 'actions/export-actions';
 
@@ -32,6 +33,7 @@ interface DispatchToProps {
     loadAnnotations(job: any, loader: any, file: File): void;
     showExportModal(task: any): void;
     removeAnnotations(sessionInstance: any): void;
+    removeAnnotationsinRange(sessionInstance: any): void;
     switchRequestReviewDialog(visible: boolean): void;
     switchSubmitReviewDialog(visible: boolean): void;
     setForceExitAnnotationFlag(forceExit: boolean): void;
@@ -74,6 +76,9 @@ function mapDispatchToProps(dispatch: any): DispatchToProps {
         removeAnnotations(sessionInstance: any): void {
             dispatch(removeAnnotationsAsync(sessionInstance));
         },
+        removeAnnotationsinRange(sessionInstance: any){
+            dispatch(removeAnnotationsinRangeAction(sessionInstance));
+        },
         switchRequestReviewDialog(visible: boolean): void {
             dispatch(switchRequestReviewDialogAction(visible));
         },
@@ -103,6 +108,7 @@ function AnnotationMenuContainer(props: Props): JSX.Element {
         loadActivity,
         loadAnnotations,
         showExportModal,
+        removeAnnotationsinRange,
         removeAnnotations,
         switchRequestReviewDialog,
         switchSubmitReviewDialog,
@@ -111,6 +117,10 @@ function AnnotationMenuContainer(props: Props): JSX.Element {
         updateJob,
     } = props;
 
+    const removeRange= (): void => {
+        removeAnnotationsinRange(jobInstance);
+    }
+
     const onClickMenu = (params: MenuInfo, file?: File): void => {
         if (params.keyPath.length > 1) {
             const [additionalKey, action] = params.keyPath;
@@ -154,6 +164,7 @@ function AnnotationMenuContainer(props: Props): JSX.Element {
             dumpers={dumpers}
             loadActivity={loadActivity}
             onClickMenu={onClickMenu}
+            removeRange={removeRange}
             setForceExitAnnotationFlag={setForceExitAnnotationFlag}
             saveAnnotations={saveAnnotations}
             jobInstance={jobInstance}