Merge pull request #314 from open-mmlab/feat/pointCloudSegment-projec…

…tion feat(pointcloud): Support displaying status on hover
open-mmlab · Sep 25, 2023 · 0d36e52 · 0d36e52
2 parents 8bf6b08 + e7a513e
commit 0d36e52
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 2 deletions.
diff --git a/packages/lb-annotation/src/core/pointCloud/index.ts b/packages/lb-annotation/src/core/pointCloud/index.ts
@@ -207,6 +207,7 @@ export class PointCloud extends EventListener {
     this.segmentOperation = new PointCloudSegmentOperation({
       dom: this.container,
       store: this.store,
+      ...this.eventBus,
     });
 
     this.pointCloudRender = new PointCloudRender({

diff --git a/packages/lb-annotation/src/core/pointCloud/segmentation.ts b/packages/lb-annotation/src/core/pointCloud/segmentation.ts
@@ -5,6 +5,7 @@
  */
 
 import { EPointCloudSegmentStatus } from '@labelbee/lb-utils';
+import EventListener from '@/core/toolOperation/eventListener';
 import LassoSelector from './selector/lassoSelector';
 import PointCloudStore, { ThreePoints } from './store';
 import CircleSelector from './selector/circleSelector';
@@ -13,6 +14,7 @@ import RectSelector from './selector/rectSelector';
 interface IProps {
   dom: HTMLElement;
   store: PointCloudStore;
+  emit: EventListener['emit'];
 }
 
 class PointCloudSegmentOperation {
@@ -32,6 +34,8 @@ class PointCloudSegmentOperation {
 
   public circleSelector: CircleSelector;
 
+  private emit: EventListener['emit'];
+
   constructor(props: IProps) {
     this.dom = props.dom;
     this.store = props.store;
@@ -47,6 +51,7 @@ class PointCloudSegmentOperation {
     this.updateSelector2Lasso = this.updateSelector2Lasso.bind(this);
     this.updateSelector2Circle = this.updateSelector2Circle.bind(this);
 
+    this.emit = props.emit;
     // this.setupRaycaster();
   }
 
@@ -149,6 +154,10 @@ class PointCloudSegmentOperation {
 
       const intersect = intersects[0];
 
+      this.emit('hoverSegmentInstance', {
+        segmentData: this.store.segmentData.get(intersect?.object?.name),
+        currentSegmentStatus: this.store.segmentStatus,
+      });
       if (intersect) {
         this.store.highlightPoints(intersect.object as ThreePoints);
       } else {

diff --git a/packages/lb-components/src/components/attributeList/index.tsx b/packages/lb-components/src/components/attributeList/index.tsx
@@ -29,6 +29,7 @@ interface IProps {
   updateColorConfig?: (value: string, color: string) => void;
   updateSize?: (size: IDefaultSize) => void;
   attributeLockChange?: (list: any) => void;
+  forbidShowLimitPopover?: boolean;
 }
 
 const AttributeList = React.forwardRef((props: IProps, ref) => {
@@ -93,7 +94,7 @@ const AttributeList = React.forwardRef((props: IProps, ref) => {
           // Determine if a scope configuration exists
           const hasLimit =
             i?.limit?.positionLimit || defaultSize || sizeRange || logicalCondition?.length > 0;
-          const showLimitPopover = isChosen && hasLimit;
+          const showLimitPopover = isChosen && hasLimit && props.forbidShowLimitPopover !== true;
 
           return (
             <Radio value={i.value} ref={radioRef} key={i.label + index}>

diff --git a/packages/lb-components/src/components/pointCloudView/PointCloudSegmentStatus.tsx b/packages/lb-components/src/components/pointCloudView/PointCloudSegmentStatus.tsx
@@ -57,10 +57,36 @@ const PointCloudSegmentStatus = (props: { config: IPointCloudConfig }) => {
         }
       };
 
+      const updateHoverData = ({
+        segmentData,
+        currentSegmentStatus,
+      }: {
+        segmentData?: IPointCloudSegmentation;
+        currentSegmentStatus: EPointCloudSegmentStatus;
+      }) => {
+        // Just run in ready.
+        if (currentSegmentStatus !== EPointCloudSegmentStatus.Ready) {
+          return;
+        }
+
+        if (!segmentData) {
+          setData({
+            segmentStatus: EPointCloudSegmentStatus.Ready,
+          });
+          return;
+        }
+        setData({
+          segmentStatus: EPointCloudSegmentStatus.Hover,
+          cacheSegData: segmentData,
+        });
+      };
+
       ptSegmentInstance?.on('syncPointCloudStatus', updateVisible);
+      ptSegmentInstance?.on('hoverSegmentInstance', updateHoverData);
 
       return () => {
         ptSegmentInstance?.unbind('syncPointCloudStatus', updateVisible);
+        ptSegmentInstance?.unbind('hoverSegmentInstance', updateHoverData);
       };
     }
   }, [ptSegmentInstance]);

diff --git a/packages/lb-components/src/views/MainView/sidebar/PointCloudToolSidebar/index.tsx b/packages/lb-components/src/views/MainView/sidebar/PointCloudToolSidebar/index.tsx
@@ -22,6 +22,7 @@ import {
   IDefaultSize,
   EPointCloudSegmentStatus,
   IPointCloudSegmentation,
+  EPointCloudPattern,
 } from '@labelbee/lb-utils';
 import AttributeList from '@/components/attributeList';
 import { useAttribute } from '@/components/pointCloudView/hooks/useAttribute';
@@ -211,6 +212,22 @@ const BoxTrackIDInput = () => {
   );
 };
 
+/**
+ * Determine if the
+ */
+const isAllowUpdateInSegment = ({
+  segmentStatus,
+  globalPattern,
+}: {
+  segmentStatus: EPointCloudSegmentStatus;
+  globalPattern: EPointCloudPattern;
+}) => {
+  return (
+    globalPattern === EPointCloudPattern.Segmentation &&
+    ![EPointCloudSegmentStatus.Edit, EPointCloudSegmentStatus.Ready].includes(segmentStatus)
+  );
+};
+
 const AttributeUpdater = ({
   attributeList,
   subAttributeList,
@@ -241,6 +258,7 @@ const AttributeUpdater = ({
   const { t } = useTranslation();
   const { defaultAttribute } = useAttribute();
   const pointCloudViews = usePointCloudViews();
+  const { isPointCloudSegmentationPattern } = useStatus();
 
   const dispatch = useDispatch();
 
@@ -298,10 +316,28 @@ const AttributeUpdater = ({
   };
 
   const setAttribute = (attribute: string) => {
+    if (
+      isAllowUpdateInSegment({
+        globalPattern: ptx.globalPattern,
+        segmentStatus: segmentData.segmentStatus,
+      })
+    ) {
+      return;
+    }
+
     toolInstance.setDefaultAttribute(attribute);
   };
 
   const setSubAttribute = (key: string, value: string) => {
+    if (
+      isAllowUpdateInSegment({
+        globalPattern: ptx.globalPattern,
+        segmentStatus: segmentData.segmentStatus,
+      })
+    ) {
+      return;
+    }
+
     toolInstance.setSubAttribute(key, value);
   };
 
@@ -313,6 +349,13 @@ const AttributeUpdater = ({
     isDefault: i?.isDefault,
   }));
 
+  const isSelected =
+    selectedBox ||
+    (segmentData.cacheSegData && segmentData.segmentStatus === EPointCloudSegmentStatus.Edit);
+
+  // Just segment pattern forbid limitPopover
+  const forbidShowLimitPopover = isPointCloudSegmentationPattern;
+
   return (
     <div>
       <div style={titleStyle}>{t('Attribute')}</div>
@@ -324,9 +367,10 @@ const AttributeUpdater = ({
         updateColorConfig={updateColorConfig}
         enableColorPicker={enableColorPicker}
         updateSize={updateSize}
+        forbidShowLimitPopover={forbidShowLimitPopover}
       />
       <Divider style={{ margin: 0 }} />
-      {(selectedBox || segmentData.cacheSegData) && (
+      {isSelected && (
         <>
           {subAttributeList.map(
             (subAttribute) =>

diff --git a/packages/lb-utils/src/constant/pointCloud.ts b/packages/lb-utils/src/constant/pointCloud.ts
@@ -45,4 +45,5 @@ export enum EPointCloudSegmentStatus {
   Ready = 'READY',
   Check = 'CHECK',
   Edit = 'EDIT',
+  Hover = "HOVER",
 }