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

fix: AttributeDisplayIssue #576

Merged
merged 3 commits into from
Oct 16, 2024
Merged

fix: AttributeDisplayIssue #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7dc099
fix: AttributeDisplayIssue
Original-Recipe Sep 30, 2024
9812e57
feat: Code review
Original-Recipe Oct 15, 2024
d793e0a
fix: RenderToolName Change to optional
Original-Recipe Oct 15, 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
15 changes: 12 additions & 3 deletions packages/lb-annotation/src/core/toolOperation/ViewOperation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import RectUtils from '@/utils/tool/RectUtils';
import PolygonUtils, { IConvexHullGroupType } from '@/utils/tool/PolygonUtils';
import MathUtils from '@/utils/MathUtils';
import RenderDomClass from '@/utils/tool/RenderDomClass';
import { DEFAULT_FONT, ELineTypes, SEGMENT_NUMBER } from '@/constant/tool';
import { DEFAULT_FONT, ELineTypes, SEGMENT_NUMBER, EPointCloudName } from '@/constant/tool';
import { DEFAULT_TEXT_SHADOW, DEFAULT_TEXT_OFFSET, TEXT_ATTRIBUTE_OFFSET } from '@/constant/annotation';
import ImgUtils, { cropAndEnlarge } from '@/utils/ImgUtils';
import CanvasUtils from '@/utils/tool/CanvasUtils';
Expand All @@ -39,6 +39,7 @@ interface IViewOperationProps extends IBasicToolOperationProps {
style: IBasicStyle;
staticMode?: boolean;
annotations: TAnnotationViewData[];
renderToolName?: EPointCloudName;
}

export interface ISpecificStyle {
Expand Down Expand Up @@ -83,6 +84,8 @@ export default class ViewOperation extends BasicToolOperation {

private hiddenText?: boolean = false;

private renderToolName?: EPointCloudName = undefined;

constructor(props: IViewOperationProps) {
super({ ...props, showDefaultCursor: true });
this.style = props.style ?? { stroke: DEFAULT_STROKE_COLOR, thickness: 3 };
Expand All @@ -93,6 +96,7 @@ export default class ViewOperation extends BasicToolOperation {
container: this.container,
height: this.canvas.height,
});
this.renderToolName = props.renderToolName;
}

public clearConnectionPoints() {
Expand Down Expand Up @@ -450,8 +454,9 @@ export default class ViewOperation extends BasicToolOperation {
/**
* Separate rendering of sub attribute content
* The principle is the same as other tools for rendering sub attribute content
* Currently, only secondary attributes are being rendered in point cloud rendering
*/
public renderAttribute() {
public renderPointCloud3DRectAttribute() {
const annotationChunks = _.chunk(this.annotations, 6);
annotationChunks.forEach((annotationList) => {
const annotation = annotationList.find((item) => item.type === 'polygon');
Expand All @@ -460,6 +465,8 @@ export default class ViewOperation extends BasicToolOperation {
const { fontStyle } = this.getRenderStyle(annotation);
const polygon = annotation.annotation as IBasicPolygon;
const curPointCloudBox = this.pointCloudBoxList?.find((item: IPointCloudBox) => item.id === polygon.id);
// Without this rendered graphic, return in advance to avoid errors in the future
if (!curPointCloudBox) return;
const headerText = this.hiddenText ? '' : `${curPointCloudBox?.trackID} ${curPointCloudBox?.attribute}`;
const renderPolygon = AxisUtils.changePointListByZoom(polygon?.pointList ?? [], this.zoom, this.currentPos);

Expand Down Expand Up @@ -975,7 +982,9 @@ export default class ViewOperation extends BasicToolOperation {
});

this.renderConnectionPoints();
this.renderAttribute();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里其它工具为什么不需要渲染属性了

if (this.renderToolName && this.renderToolName === EPointCloudName.PointCloud) {
this.renderPointCloud3DRectAttribute();
}
} catch (e) {
console.error('ViewOperation Render Error', e);
}
Expand Down
5 changes: 4 additions & 1 deletion packages/lb-components/src/components/AnnotationView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import React, {
useState,
useContext,
} from 'react';
import { ViewOperation, ImgUtils } from '@labelbee/lb-annotation';
import { ViewOperation, ImgUtils, EPointCloudName } from '@labelbee/lb-annotation';
import { Spin } from 'antd/es';
import useRefCache from '@/hooks/useRefCache';
import { TAnnotationViewData, IPointCloudBoxList } from '@labelbee/lb-utils';
Expand Down Expand Up @@ -51,6 +51,7 @@ interface IProps {
onRightClick?: (e: { event: MouseEvent; targetId: string }) => void;
pointCloudBoxList?: IPointCloudBoxList;
hiddenText?: boolean;
renderToolName?: EPointCloudName.PointCloud | undefined;
}

const DEFAULT_SIZE = {
Expand Down Expand Up @@ -100,6 +101,7 @@ const AnnotationView = (props: IProps, ref: any) => {
onRightClick,
pointCloudBoxList = [],
hiddenText = false,
renderToolName,
} = props;
const size = sizeInitialized(props.size);
const [loading, setLoading] = useState(false);
Expand Down Expand Up @@ -139,6 +141,7 @@ const AnnotationView = (props: IProps, ref: any) => {
config: '{}', // TODO，暂时不需要
zoomInfo: props.zoomInfo,
staticMode: props.staticMode,
renderToolName,
});

viewOperation.current.init();
Expand Down
3 changes: 2 additions & 1 deletion packages/lb-components/src/components/pointCloudView/PointCloud2DSingleView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { useCallback, useContext, useEffect, useMemo, useRef, useState }
import AnnotationView from '@/components/AnnotationView';
import useSize from '@/hooks/useSize';
import { useSingleBox } from './hooks/useSingleBox';
import { ViewOperation } from '@labelbee/lb-annotation';
import { ViewOperation, EPointCloudName } from '@labelbee/lb-annotation';
import { IAnnotationData2dView, IAnnotationDataTemporarily } from './PointCloud2DView';
import { useHighlight } from './hooks/useHighlight';
import HighlightVisible from './components/HighlightVisible';
Expand Down Expand Up @@ -133,6 +133,7 @@ const PointCloud2DSingleView = ({
onRightClick={({ targetId }) => setSelectedIDs(targetId)}
pointCloudBoxList={pointCloudBoxList}
hiddenText={hiddenText}
renderToolName={EPointCloudName.PointCloud}
/>
) : (
<>
Expand Down
Loading