fix: 2D view image selection logic optimization

open-mmlab · Sep 18, 2024 · 297b9d7 · 297b9d7
1 parent 343927d
commit 297b9d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/packages/lb-annotation/src/core/toolOperation/pointCloud2DRectOperation.ts b/packages/lb-annotation/src/core/toolOperation/pointCloud2DRectOperation.ts
@@ -134,7 +134,7 @@ class PointCloud2DRectOperation extends RectOperation {
 
   public rightMouseUp(e: MouseEvent) {
     const hoverRect: (IRect & { boxID?: string }) | undefined = super.rightMouseUp(e);
-    this.emit('onRightClick', { event: e, targetId: hoverRect?.boxID });
+    this.emit('onRightClick', { event: e, targetId: hoverRect?.boxID, id: hoverRect?.id });
     return hoverRect;
   }
 }

diff --git a/packages/lb-components/src/components/pointCloud2DRectOperationView/index.tsx b/packages/lb-components/src/components/pointCloud2DRectOperationView/index.tsx
@@ -80,6 +80,8 @@ const PointCloud2DRectOperationView = (props: IPointCloud2DRectOperationViewProp
 
   const [loading, setLoading] = useState(true);
 
+  const [rightClickRectId, setRightClickRectId] = useState<string>('');
+
   const rectListInImage = useMemo(
     () => rectList?.filter((item: IPointCloudBoxRect) => item.imageName === mappingData?.path),
     [mappingData?.path, rectList],
@@ -146,7 +148,7 @@ const PointCloud2DRectOperationView = (props: IPointCloud2DRectOperationViewProp
 
   const handleRemoveRect = (rectList: IPointCloud2DRectOperationViewRect[]) => {
     if (rectList.length === 0) {
-      return
+      return;
     }
 
     if (!shouldExcludePointCloudBoxListUpdate) {
@@ -164,7 +166,7 @@ const PointCloud2DRectOperationView = (props: IPointCloud2DRectOperationViewProp
             return result;
           }
 
-          return null
+          return null;
         });
 
         return;
@@ -177,7 +179,7 @@ const PointCloud2DRectOperationView = (props: IPointCloud2DRectOperationViewProp
     if (matchedExtIdIDRect) {
       recoverSelectedIds(() => {
         // @ts-ignore
-        const { imageName, extId: boxID } = matchedExtIdIDRect
+        const { imageName, extId: boxID } = matchedExtIdIDRect;
         // NOTE maybe change selectIds
         const result = remove2DViewRectFn?.({ boxID, imageName });
 
@@ -187,7 +189,7 @@ const PointCloud2DRectOperationView = (props: IPointCloud2DRectOperationViewProp
           return result;
         }
 
-        return null
+        return null;
       });
     }
 
@@ -209,7 +211,6 @@ const PointCloud2DRectOperationView = (props: IPointCloud2DRectOperationViewProp
 
   const updateRectList = useUpdateRectList(() => {
     const rectListByBoxList = shouldExcludePointCloudBoxListUpdate ? [] : getRectListByBoxList();
-    const selectedRectID = operation.current?.selectedRectID;
 
     // Case 1: Show all ids
     // const img2dResult = [...rectListByBoxList, ...rectListInImage]
@@ -223,13 +224,16 @@ const PointCloud2DRectOperationView = (props: IPointCloud2DRectOperationViewProp
     );
 
     operation.current?.setResult(img2dResult);
-
-    if (selectedRectID) {
-      operation.current?.setSelectedRectID(selectedRectID);
+    if (rightClickRectId) {
+      operation.current?.setSelectedRectID(rightClickRectId);
+      setRightClickRectId('');
     }
   });
 
-  const onRightClick = ({targetId}: { targetId: string }) => setSelectedIDs(targetId)
+  const onRightClick = ({ targetId, id }: { targetId: string; id: string }) => {
+    setSelectedIDs(targetId);
+    setRightClickRectId(id);
+  };
 
   useEffect(() => {
     if (ref.current) {
@@ -257,7 +261,6 @@ const PointCloud2DRectOperationView = (props: IPointCloud2DRectOperationViewProp
     }
   }, []);
 
-
   useEffect(() => {
     const loadImage = async (url: string) => {
       try {