Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove group objects #38

Merged
merged 1 commit into from
Oct 15, 2023
Merged

Remove group objects #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cvat-canvas/src/typescript/groupHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export class GroupHandlerImpl implements GroupHandler {
private bindedOnSelectUpdate: (event: MouseEvent) => void;
private bindedOnSelectStop: (event: MouseEvent) => void;
private selectionRect: SVG.Rect;
private allowSelect: boolean = false;
private startSelectionPoint: {
x: number;
y: number;
Expand Down Expand Up @@ -92,6 +93,7 @@ export class GroupHandlerImpl implements GroupHandler {
(shape: SVG.Shape): boolean => !shape.hasClass('cvat_canvas_hidden'),
);
for (const shape of shapes) {
this.allowSelect = box.xtl - box.xbr == 0 && box.ytl - box.ybr == 0;
// TODO: Doesn't work properly for groups
const bbox = shape.bbox();
const clientID = shape.attr('clientID');
Expand Down Expand Up @@ -186,6 +188,7 @@ export class GroupHandlerImpl implements GroupHandler {
}

public select(objectState: any): void {
if (!this.allowSelect) return;
const stateIndexes = this.statesToBeGroupped.map((state): number => state.clientID);
const includes = stateIndexes.indexOf(objectState.clientID);
if (includes !== -1) {
Expand Down
15 changes: 15 additions & 0 deletions ...rc/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
EyeOutlined,
LockFilled,
UnlockOutlined,
DeleteOutlined,
} from '@ant-design/icons';
import { Col, Row } from 'antd/lib/grid';

Expand All @@ -25,15 +26,28 @@ interface Props {
statesOrdering: StatesOrdering;
switchLockAllShortcut: string;
switchHiddenAllShortcut: string;
deleteAllShortcut: string;
changeStatesOrdering(value: StatesOrdering): void;
lockAllStates(): void;
unlockAllStates(): void;
collapseAllStates(): void;
deleteAllStates(): void;
expandAllStates(): void;
hideAllStates(): void;
showAllStates(): void;
}

function DeleteAllSwitcher(props: Props): JSX.Element {
const { deleteAllStates, deleteAllShortcut } = props;
return (
<Col span={2}>
<CVATTooltip title={`Delete selected ${deleteAllShortcut}`}>
<DeleteOutlined onClick={deleteAllStates} />
</CVATTooltip>
</Col>
);
}

function LockAllSwitcher(props: Props): JSX.Element {
const {
statesLocked, switchLockAllShortcut, unlockAllStates, lockAllStates,
Expand Down Expand Up @@ -92,6 +106,7 @@ function ObjectListHeader(props: Props): JSX.Element {
</>
)}
<CollapseAllSwitcher {...props} />
<DeleteAllSwitcher {...props} />
<StatesOrderingSelector statesOrdering={statesOrdering} changeStatesOrdering={changeStatesOrdering} />
</Row>
</div>
Expand Down
6 changes: 6 additions & 0 deletions cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ interface Props {
objectStates: any[];
switchLockAllShortcut: string;
switchHiddenAllShortcut: string;
deleteAllShortcut: string;
changeStatesOrdering(value: StatesOrdering): void;
lockAllStates(): void;
unlockAllStates(): void;
collapseAllStates(): void;
deleteAllStates(): void;
expandAllStates(): void;
hideAllStates(): void;
showAllStates(): void;
Expand All @@ -38,10 +40,12 @@ function ObjectListComponent(props: Props): JSX.Element {
objectStates,
switchLockAllShortcut,
switchHiddenAllShortcut,
deleteAllShortcut,
changeStatesOrdering,
lockAllStates,
unlockAllStates,
collapseAllStates,
deleteAllStates,
expandAllStates,
hideAllStates,
showAllStates,
Expand All @@ -56,11 +60,13 @@ function ObjectListComponent(props: Props): JSX.Element {
statesCollapsed={statesCollapsedAll}
statesOrdering={statesOrdering}
switchLockAllShortcut={switchLockAllShortcut}
deleteAllShortcut={deleteAllShortcut}
switchHiddenAllShortcut={switchHiddenAllShortcut}
changeStatesOrdering={changeStatesOrdering}
lockAllStates={lockAllStates}
unlockAllStates={unlockAllStates}
collapseAllStates={collapseAllStates}
deleteAllStates={deleteAllStates}
expandAllStates={expandAllStates}
hideAllStates={hideAllStates}
showAllStates={showAllStates}
Expand Down
21 changes: 21 additions & 0 deletions cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ interface DispatchToProps {
}

function mapStateToProps(state: CombinedState): StateToProps {
const { highlightedShapes } = state?.annotation?.canvas?.instance?.view?.groupHandler;
const {
annotation: {
annotations: {
Expand Down Expand Up @@ -90,6 +91,7 @@ function mapStateToProps(state: CombinedState): StateToProps {
});

return {
highlightedShapes,
statesHidden,
statesLocked,
statesCollapsedAll: collapsedAll,
Expand Down Expand Up @@ -201,6 +203,10 @@ class ObjectsListContainer extends React.PureComponent<Props, State> {
this.collapseAllStates(true);
};

private onDeleteAllStates = (): void => {
this.deleteAllStates(true);
};

private onExpandAllStates = (): void => {
this.collapseAllStates(false);
};
Expand Down Expand Up @@ -243,6 +249,14 @@ class ObjectsListContainer extends React.PureComponent<Props, State> {
collapseStates(objectStates, collapsed);
}

private deleteAllStates(force: boolean): void {
const { objectStates, removeObject, jobInstance, highlightedShapes } = this.props;
objectStates.forEach(state => {
if (highlightedShapes[state.clientID] != undefined)
removeObject(jobInstance, state, force)
});
}

public render(): JSX.Element {
const {
statesHidden,
Expand All @@ -267,6 +281,7 @@ class ObjectsListContainer extends React.PureComponent<Props, State> {
const { objectStates, sortedStatesID, statesOrdering } = this.state;

const subKeyMap = {
DELETE_ALL: keyMap.DELETE_ALL,
SWITCH_ALL_LOCK: keyMap.SWITCH_ALL_LOCK,
SWITCH_LOCK: keyMap.SWITCH_LOCK,
SWITCH_ALL_HIDDEN: keyMap.SWITCH_ALL_HIDDEN,
Expand Down Expand Up @@ -323,6 +338,10 @@ class ObjectsListContainer extends React.PureComponent<Props, State> {
MOVE_RIGHT: () => {},
ZOOM_IN: () => {},
ZOOM_OUT: () => {},
DELETE_ALL: (event: KeyboardEvent | undefined) => {
preventDefault(event);
this.deleteAllStates(true);
},
SWITCH_ALL_LOCK: (event: KeyboardEvent | undefined) => {
preventDefault(event);
this.lockAllStates(!statesLocked);
Expand Down Expand Up @@ -462,10 +481,12 @@ class ObjectsListContainer extends React.PureComponent<Props, State> {
objectStates={objectStates}
switchHiddenAllShortcut={normalizedKeyMap.SWITCH_ALL_HIDDEN}
switchLockAllShortcut={normalizedKeyMap.SWITCH_ALL_LOCK}
deleteAllShortcut={normalizedKeyMap.DELETE_ALL}
changeStatesOrdering={this.onChangeStatesOrdering}
lockAllStates={this.onLockAllStates}
unlockAllStates={this.onUnlockAllStates}
collapseAllStates={this.onCollapseAllStates}
deleteAllStates={this.onDeleteAllStates}
expandAllStates={this.onExpandAllStates}
hideAllStates={this.onHideAllStates}
showAllStates={this.onShowAllStates}
Expand Down
7 changes: 7 additions & 0 deletions cvat-ui/src/reducers/shortcuts-reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ const defaultKeyMap = ({
applicable: [DimensionType.DIM_2D, DimensionType.DIM_3D],
},

DELETE_ALL: {
name: 'Delete selected objects',
description: 'Delete all grouped objects',
sequences: ['d'],
action: 'keydown',
applicable: [DimensionType.DIM_2D, DimensionType.DIM_3D],
},
SWITCH_ALL_LOCK: {
name: 'Lock/unlock all objects',
description: 'Change locked state for all objects in the side bar',
Expand Down
Loading