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

Fix automatic tag annotation support #7839

Merged
merged 10 commits into from
May 30, 2024
Merged

Fix automatic tag annotation support #7839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e4a6637
Add ObjectType property to DetectedShape interface in lambda-manager.ts
omerferhatt May 2, 2024
bb7ae62
Update object type in ToolsControlComponent
omerferhatt May 2, 2024
841323d
Merge branch 'develop' into feature/semi-auto-tag-annotation
omerferhatt May 2, 2024
8c64230
CHANGELOG added
omerferhatt May 28, 2024
f5a4251
Merge branch 'develop' into feature/semi-auto-tag-annotation
omerferhatt May 28, 2024
d8e2450
Update changelog.d/20240528_180958_omer.sarioglu_semi_auto_tag_annota…
omerferhatt May 28, 2024
4925b43
Typo-fix in changelog entry
omerferhatt May 28, 2024
d6a3f4e
Reworked approach
bsekachev May 30, 2024
dd63956
Updated changelog
bsekachev May 30, 2024
4fbd31c
Merge branch 'develop' into feature/semi-auto-tag-annotation
bsekachev May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog.d/20240528_180958_omer.sarioglu_semi_auto_tag_annotation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Fixed

- A classifier model can not be used on annotation view (unknown object shape error)
(<https://github.com/cvat-ai/cvat/pull/7839>)
4 changes: 2 additions & 2 deletions cvat-core/src/lambda-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (C) 2019-2022 Intel Corporation
// Copyright (C) 2022-2023 CVAT.ai Corporation
// Copyright (C) 2022-2024 CVAT.ai Corporation
//
// SPDX-License-Identifier: MIT

Expand All @@ -21,7 +21,7 @@ export interface InteractorResults {
}

export interface DetectedShape {
type: ShapeType;
type: ShapeType | 'tag';
rotation?: number;
attributes: { name: string; value: string }[];
label: string;
Expand Down
10 changes: 10 additions & 0 deletions ...-ui/src/components/annotation-page/standard-workspace/controls-side-bar/tools-control.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,16 @@ export class ToolsControlComponent extends React.PureComponent<Props, State> {

if (!jobLabel) return null;

if (data.type === 'tag') {
return new core.classes.ObjectState({
frame,
label: jobLabel,
attributes: loadAttributes(data.attributes, jobLabel),
objectType: ObjectType.TAG,
source: core.enums.Source.AUTO,
});
}

const objectData = {
label: jobLabel,
objectType: ObjectType.SHAPE,
Expand Down