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.

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

feat(app): support preview grounding annotations #147

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
2 changes: 2 additions & 0 deletions packages/app/src/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ const localeTexts = {
'dataset.detail.pagination': 'Pagination',
'dataset.detail.random': 'Random',
'dataset.detail.randomQuery': 'Random',
'dataset.detail.showGrounding': 'Show Grounding',
'dataset.detail.hideGrounding': 'Hide Grounding',

'dataset.toAnalysis.unSupportWarn':
'You should have a prediction label set with detection annotaion first',
Expand Down
2 changes: 2 additions & 0 deletions packages/app/src/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ const localeTexts = {
'dataset.toAnalysis.unSelectWarn': '请选择一个预标注集',
'dataset.onClickCopyLink.success': '复制链接成功!',
'dataset.detail.overlay': '覆盖',
'dataset.detail.showGrounding': '展示 Grounding',
'dataset.detail.hideGrounding': '隐藏 Grounding',

'dataset.filter.newDataset': '新建数据集',
'dataset.filter.public': '公共',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.dds-annotator-highlight-text .ant-tag {
margin-inline-end: 0px !important;
font-size: 14px;
cursor: pointer;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import React, { useMemo } from 'react';
import { escapeRegExp } from 'lodash';
import { Tag } from 'antd';

import './index.less';

interface IHighlight {
text: string;
color: string;
}

interface IProps {
text: string;
highlights: IHighlight[];
onHoverHighlightWord: (text: string) => void;
onLeaveHighlightWord: () => void;
}

const HighlightText: React.FC<IProps> = ({
text,
highlights,
onHoverHighlightWord,
onLeaveHighlightWord,
}) => {

const segments = useMemo(() => {
const computedSegments: React.ReactNode[] = [];
const pattern = new RegExp(
highlights.map(h => `\\b(${escapeRegExp(h.text)})\\b`).join('|'),
'g'
);

const matches = Array.from(text.matchAll(pattern));
let lastIndex = 0;

matches.forEach(match => {
const matchText = match[0];
const index = match.index ?? 0;

if (index > lastIndex) {
computedSegments.push(text.substring(lastIndex, index));
}

const highlightConfig = highlights.find(h => h.text === matchText);

if (highlightConfig) {
computedSegments.push(
<Tag
key={`${index}-${matchText}`}
color={highlightConfig.color}
bordered={false}
onMouseEnter={() => onHoverHighlightWord(matchText)}
onMouseLeave={onLeaveHighlightWord}
>
{matchText}
</Tag>
);
}

lastIndex = index + matchText.length;
});

if (lastIndex < text.length) {
computedSegments.push(text.substring(lastIndex));
}

return computedSegments;
}, [text, highlights, onHoverHighlightWord, onLeaveHighlightWord]);

return <div className={'dds-annotator-highlight-text'}>{segments}</div>;
};

export default HighlightText;
22 changes: 18 additions & 4 deletions packages/components/src/Annotator/hooks/useCanvasRender.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const useCanvasRender = ({
} else if (
theDrawData.selectedTool === EBasicToolItem.Rectangle &&
theDrawData.selectedModel[theDrawData.selectedTool] ===
EnumModelType.IVP
EnumModelType.IVP
) {
objectHooksMap[EObjectType.Rectangle].renderPrompt({
prompt,
Expand Down Expand Up @@ -213,8 +213,8 @@ const useCanvasRender = ({
const status = isFocus
? 'focus'
: isJustCreated
? 'justCreated'
: undefined;
? 'justCreated'
: undefined;
const styles = getObjectStyles(object, object.color, status);

// Change globalAlpha when creating / editing object
Expand Down Expand Up @@ -315,6 +315,20 @@ const useCanvasRender = ({
false,
);
}

// render highlight object when hover caption
if (!!drawData.highlightCategory) {
const highlights = theDrawData.objectList
.filter(obj => obj.labelId === drawData.highlightCategory!.id);

highlights.forEach((obj) => {
renderObject(
obj,
true,
false
);
});
}
};

const renderPopoverMenu = () => {
Expand All @@ -327,7 +341,7 @@ const useCanvasRender = ({
) {
const target =
drawData.objectList[editState.focusObjectIndex].keypoints?.points?.[
editState.focusEleIndex
editState.focusEleIndex
];
if (target) {
return (
Expand Down
14 changes: 13 additions & 1 deletion packages/components/src/Annotator/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@

.switch {
position: absolute;
bottom: 40px;
top: 25px;
display: flex;
align-items: center;
justify-content: center;
Expand Down Expand Up @@ -331,6 +331,18 @@
transform: rotate(180deg);
}
}

.dds-annotator-grounding-preview {
position: absolute;
bottom: 20px;
left: 50%;
transform: translate(-50%, 0);
background: rgba(0, 0, 0, 0.45);
color: #fff;
width: 70%;
padding: 10px;
border-radius: 10px;
}
}

.dds-annotator-view {
Expand Down
68 changes: 63 additions & 5 deletions packages/components/src/Annotator/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {
CloseOutlined,
EyeInvisibleOutlined,
EyeOutlined,
LeftOutlined,
RightOutlined,
ZoomInOutlined,
Expand Down Expand Up @@ -42,6 +44,9 @@ import {
} from './type';

import './index.less';
import HighlightText from './components/HighlightText';
import { useLocale } from 'dds-utils/locale';


export interface PreviewProps {
isOldMode?: boolean; // is old dataset design mode
Expand Down Expand Up @@ -70,6 +75,8 @@ const Preview: React.FC<PreviewProps> = (props) => {
displayOptionsResult,
} = props;

const { localeText } = useLocale();

const [annotations, setAnnotations] = useImmer<DrawObject[]>([]);

const [editState, setEditState] = useImmer<EditState>(
Expand Down Expand Up @@ -101,7 +108,7 @@ const Preview: React.FC<PreviewProps> = (props) => {
allowMove: editState.allowMove,
isRequiring: editState.isRequiring,
minPadding: {
top: 120,
top: 150,
left: 300,
},
cursorSize: drawData.brushSize,
Expand Down Expand Up @@ -240,12 +247,25 @@ const Preview: React.FC<PreviewProps> = (props) => {
// =================================================================================================================

const [showInfo, setShowInfo] = useState(true);
const [showGrounding, setShowGrounding] = useState(false);

const metadata = !isEmpty(list[current]?.metadata)
? list[current].metadata
: undefined;

const changeShowInfo = useCallback(() => {
setShowInfo((s) => {
return !s;
});
}, []);

const changeShowGrounding = useCallback(() => {
if (!metadata || !metadata.caption) return;
setShowGrounding((s) => {
return !s;
});
}, [metadata]);

/** Snapshot image */
const onDownload: React.MouseEventHandler<HTMLDivElement> = async (event) => {
event.preventDefault();
Expand Down Expand Up @@ -318,7 +338,7 @@ const Preview: React.FC<PreviewProps> = (props) => {
) {
const target =
drawData.objectList[editState.focusObjectIndex]?.keypoints?.points?.[
editState.focusEleIndex
editState.focusEleIndex
];
if (target) {
return (
Expand All @@ -337,9 +357,30 @@ const Preview: React.FC<PreviewProps> = (props) => {
return <></>;
}

const metadata = !isEmpty(list[current]?.metadata)
? list[current].metadata
: undefined;
const getHighlightWords = () => {
const objects = list[current].objects;
return categories
.filter((category) => objects.find((obj: any) => obj.categoryId === category.id))
.map((category) => {
return {
text: category.name,
color: getAnnotColor(category.id),
}
})
};

const highlightCategory = (name: string) => {
setDrawData((s) => {
const category = categories.find(item => item.name === name);
s.highlightCategory = category;
});
};

const clearHighlightCategory = () => {
setDrawData((s) => {
s.highlightCategory = undefined;
});
};

return (
<div className="dds-annotator dds-annotator-preview">
Expand All @@ -360,6 +401,12 @@ const Preview: React.FC<PreviewProps> = (props) => {
icon: <DownloadIcon />,
onClick: onDownload,
},
{
icon: showGrounding ? <EyeOutlined /> : <EyeInvisibleOutlined />,
onClick: changeShowGrounding,
disabled: !metadata || !metadata.caption,
title: showGrounding ? localeText('dataset.detail.hideGrounding') : localeText('dataset.detail.showGrounding'),
},
]}
rightTools={[
{
Expand Down Expand Up @@ -431,6 +478,17 @@ const Preview: React.FC<PreviewProps> = (props) => {
<DoubleRightIcon />
</div>
)}
{
showGrounding && !!metadata?.caption &&
<div className="dds-annotator-grounding-preview">
<HighlightText
text={metadata.caption}
highlights={getHighlightWords()}
onHoverHighlightWord={(text) => highlightCategory(text)}
onLeaveHighlightWord={clearHighlightCategory}
/>
</div>
}
</div>
);
};
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/Annotator/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ export interface DrawData {
isBatchEditing: boolean; // active while handle batch predictions by model
editingAttribute?: IEditingAttribute;
limitConf: number;
highlightCategory?: Category;

/** prompt actions */
prompt: IPrompt;
Expand Down Expand Up @@ -296,6 +297,7 @@ export const DEFAULT_DRAW_DATA: DrawData = {
isJustCreated: false,
creatingObject: undefined,
editingAttribute: undefined,
highlightCategory: undefined,
brushSize: 20,
pointResolution: 0.5,
prompt: {},
Expand Down
Loading