Merge pull request #526 from sharefe-demo/feat_alpha/opt-pointcloud-r…

…esult-json fix: optimize the 2d connnection relative
open-mmlab · Jul 23, 2024 · 3f6b518 · 3f6b518
2 parents 7c51a55 + 29207ff
commit 3f6b518
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/lb-annotation/src/core/toolOperation/pointCloud2DRectOperation.ts b/packages/lb-annotation/src/core/toolOperation/pointCloud2DRectOperation.ts
@@ -66,11 +66,20 @@ class PointCloud2DRectOperation extends RectOperation {
     return true;
   }
 
+  private getComputedDrawingRect(rect: IPointCloud2DRectOperationViewRect & IRect) {
+    const keyOfExtId = 'extId';
+    // Is it 3d's projected or disconnected 3d's projected rect
+    // @ts-ignore
+    const shouldNotDashedLine = rect?.boxID || rect?.[keyOfExtId];
+
+    return shouldNotDashedLine ? rect : { ...rect, lineDash: [3] };
+  }
+
   public renderDrawingRect(rect: IPointCloud2DRectOperationViewRect & IRect, zoom = this.zoom, isZoom = false) {
-    // 是否使用强制默认值，如： lineDash: [3]
-    const shouldNotUseForceValue = rect?.boxID || rect?.lineDash;
+    const targetRect = this.getComputedDrawingRect(rect);
+    // window.console.log('[@DrawingRect] Rect: ', targetRect, ', Origin Rect: ', rect);
 
-    super.renderDrawingRect(shouldNotUseForceValue ? rect : { ...rect, lineDash: [3] }, zoom, isZoom);
+    super.renderDrawingRect(targetRect, zoom, isZoom);
   }
 }
 

diff --git a/packages/lb-components/src/components/pointCloudView/PointCloudContext.tsx b/packages/lb-components/src/components/pointCloudView/PointCloudContext.tsx
@@ -385,7 +385,6 @@ export const PointCloudProvider: React.FC<PropsWithChildren<{}>> = ({ children }
               attribute: attribute,
               order: trackID,
               extId: id,
-              lineDash: [],
             };
           }