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

Jump to bottom

[GSoC'24] Keyboard Shortcut Customization: Merge and Group handler fix #8378

Merged
merged 4 commits into from
Aug 31, 2024
Merged

[GSoC'24] Keyboard Shortcut Customization: Merge and Group handler fix #8378

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ad548e
fix: handler overlap
tahamukhtar20 Aug 30, 2024
383f401
fix: split track control
tahamukhtar20 Aug 30, 2024
0e4d308
fix: reduce duplication
tahamukhtar20 Aug 30, 2024
036370c
Revert "fix: reduce duplication"
tahamukhtar20 Aug 30, 2024
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
Prev Previous commit
Next Next commit
fix: reduce duplication
  • Loading branch information
@tahamukhtar20
tahamukhtar20 committed Aug 30, 2024
commit 0e4d308634d4bf5c1873f805ac8258803f4918c5
74 changes: 25 additions & 49 deletions ...src/components/annotation-page/standard-workspace/controls-side-bar/controls-side-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { LabelType } from 'cvat-core-wrapper';
import { ShortcutScope } from 'utils/enums';
import { registerComponentShortcuts } from 'actions/shortcuts-actions';
import { subKeyMap } from 'utils/component-subkeymap';
import { initializeDynamicIconProps } from 'components/annotation-page/standard3D-workspace/controls-side-bar/controls-side-bar';
import ControlVisibilityObserver, { ExtraControlsControl } from './control-visibility-observer';
import RotateControl, { Props as RotateControlProps } from './rotate-control';
import CursorControl, { Props as CursorControlProps } from './cursor-control';
Expand Down Expand Up @@ -185,57 +186,32 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
}
};

const dynamicMergeIconProps =
activeControl === ActiveControl.MERGE ?
{
className: 'cvat-merge-control cvat-active-canvas-control',
onClick: (): void => {
canvasInstance.merge({ enabled: false });
updateActiveControl(ActiveControl.CURSOR);
},
} :
{
className: 'cvat-merge-control',
onClick: (): void => {
canvasInstance.cancel();
canvasInstance.merge({ enabled: true });
updateActiveControl(ActiveControl.MERGE);
},
};
const dynamicMergeIconProps = initializeDynamicIconProps(
canvasInstance,
ActiveControl.MERGE,
activeControl,
'merge',
'merge',
updateActiveControl,
);

const dynamicGroupIconProps =
activeControl === ActiveControl.GROUP ?
{
className: 'cvat-group-control cvat-active-canvas-control',
onClick: (): void => {
canvasInstance.group({ enabled: false });
updateActiveControl(ActiveControl.CURSOR);
},
} :
{
className: 'cvat-group-control',
onClick: (): void => {
canvasInstance.cancel();
canvasInstance.group({ enabled: true });
updateActiveControl(ActiveControl.GROUP);
},
};
const dynamicGroupIconProps = initializeDynamicIconProps(
canvasInstance,
ActiveControl.GROUP,
activeControl,
'group',
'group',
updateActiveControl,
);

const dynamicTrackIconProps = activeControl === ActiveControl.SPLIT ?
{
className: 'cvat-split-track-control cvat-active-canvas-control',
onClick: (): void => {
canvasInstance.split({ enabled: false });
},
} :
{
className: 'cvat-split-track-control',
onClick: (): void => {
canvasInstance.cancel();
canvasInstance.split({ enabled: true });
updateActiveControl(ActiveControl.SPLIT);
},
};
const dynamicTrackIconProps = initializeDynamicIconProps(
canvasInstance,
ActiveControl.SPLIT,
activeControl,
'split',
'split-track',
updateActiveControl,
);

let handlers: Partial<Record<keyof typeof componentShortcuts, (event?: KeyboardEvent) => void>> = {
CLOCKWISE_ROTATION_STANDARD_CONTROLS: (event: KeyboardEvent | undefined) => {
Expand Down
106 changes: 56 additions & 50 deletions ...c/components/annotation-page/standard3D-workspace/controls-side-bar/controls-side-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import React from 'react';
import Layout from 'antd/lib/layout';
import { ActiveControl } from 'reducers';
import { Label, LabelType } from 'cvat-core-wrapper';
import { Canvas3d as Canvas } from 'cvat-canvas3d-wrapper';
import { Canvas3d } from 'cvat-canvas3d-wrapper';
import { Canvas } from 'cvat-canvas-wrapper';
import MoveControl, {
Props as MoveControlProps,
} from 'components/annotation-page/standard-workspace/controls-side-bar/move-control';
Expand Down Expand Up @@ -102,6 +103,36 @@ const ObservedGroupControl = ControlVisibilityObserver<GroupControlProps>(GroupC
const ObservedMergeControl = ControlVisibilityObserver<MergeControlProps>(MergeControl);
const ObservedSplitControl = ControlVisibilityObserver<SplitControlProps>(SplitControl);

export const initializeDynamicIconProps = (
canvasInstance: Canvas | Canvas3d,
controlType: ActiveControl,
activeControl: ActiveControl,
canvasAction: 'merge' | 'group' | 'split',
className: string,
updateActiveControl: (activeControl: ActiveControl) => void,
): any => {
const isActive = activeControl === controlType;
const baseClassName = `cvat-${className}-control`;
return isActive ?
{
className: `${baseClassName} cvat-active-canvas-control`,
onClick: (): void => {
canvasInstance[canvasAction]({ enabled: false });
if (canvasAction !== 'split') {
updateActiveControl(ActiveControl.CURSOR);
}
},
} :
{
className: baseClassName,
onClick: (): void => {
canvasInstance.cancel();
canvasInstance[canvasAction]({ enabled: true });
updateActiveControl(controlType);
},
};
};

export default function ControlsSideBarComponent(props: Props): JSX.Element {
const {
canvasInstance,
Expand Down Expand Up @@ -138,57 +169,32 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
}
};

const dynamicMergeIconProps =
activeControl === ActiveControl.MERGE ?
{
className: 'cvat-merge-control cvat-active-canvas-control',
onClick: (): void => {
canvasInstance.merge({ enabled: false });
updateActiveControl(ActiveControl.CURSOR);
},
} :
{
className: 'cvat-merge-control',
onClick: (): void => {
canvasInstance.cancel();
canvasInstance.merge({ enabled: true });
updateActiveControl(ActiveControl.MERGE);
},
};
const dynamicMergeIconProps = initializeDynamicIconProps(
canvasInstance,
ActiveControl.MERGE,
activeControl,
'merge',
'merge',
updateActiveControl,
);

const dynamicGroupIconProps =
activeControl === ActiveControl.GROUP ?
{
className: 'cvat-group-control cvat-active-canvas-control',
onClick: (): void => {
canvasInstance.group({ enabled: false });
updateActiveControl(ActiveControl.CURSOR);
},
} :
{
className: 'cvat-group-control',
onClick: (): void => {
canvasInstance.cancel();
canvasInstance.group({ enabled: true });
updateActiveControl(ActiveControl.GROUP);
},
};
const dynamicGroupIconProps = initializeDynamicIconProps(
canvasInstance,
ActiveControl.GROUP,
activeControl,
'group',
'group',
updateActiveControl,
);

const dynamicTrackIconProps = activeControl === ActiveControl.SPLIT ?
{
className: 'cvat-split-track-control cvat-active-canvas-control',
onClick: (): void => {
canvasInstance.split({ enabled: false });
},
} :
{
className: 'cvat-split-track-control',
onClick: (): void => {
canvasInstance.cancel();
canvasInstance.split({ enabled: true });
updateActiveControl(ActiveControl.SPLIT);
},
};
const dynamicTrackIconProps = initializeDynamicIconProps(
canvasInstance,
ActiveControl.SPLIT,
activeControl,
'split',
'split-track',
updateActiveControl,
);

let handlers: any = {
SWITCH_GROUP_MODE_STANDARD_3D_CONTROLS: (event: KeyboardEvent | undefined): void => {
Expand Down