feat: Support invalid settings from external sources / fix: Point tool support settings are invalid

packages/lb-annotation/src/core/toolOperation/pointOperation.ts

@@ -378,6 +378,26 @@ class PointOperation extends BasicToolOperation {
     this.render();
   }
 
+  public setPointValidAndRender(id?: string) {
+    const hasValid = this.pointList.some((point) => point?.valid);
+    this.setPointList(
+      this.pointList.map((point) => {
+        if (point.id === id) {
+          return {
+            ...point,
+            valid: !point.valid,
+          };
+        }
+        if (this.selection.isIdSelected(point.id)) {
+          point.valid = !hasValid;
+        }
+        return point;
+      }),
+      true,
+    );
+    this.render();
+  }
+
   public onDragMove(e: MouseEvent) {
     if (!this.imgInfo) return;
     this.dragStatus = EDragStatus.Move;
@@ -445,6 +465,11 @@ class PointOperation extends BasicToolOperation {
         this.onTabKeyDown(e);
         break;
       }
+      case EKeyCode.F:
+        if (this.selectedIDs.length > 0) {
+          this.setPointValidAndRender(this.selectedID);
+        }
+        break;
       case EKeyCode.Z:
         this.setIsHidden(!this.isHidden);
         this.render();

packages/lb-components/src/components/pointCloudView/PointCloudContext.tsx

@@ -92,10 +92,12 @@ export interface IPointCloudContext
   selectedIDs: string[];
   setSelectedIDs: (ids?: string[] | string) => void;
   valid: boolean;
+  visibleBatchSetValid: boolean;
   setPointCloudResult: (resultList: IPointCloudBoxList) => void;
   setPointCloudSphereList: (sphereList: IPointCloudSphereList) => void;
   selectedPointCloudBox?: IPointCloudBox;
   setPointCloudValid: (valid?: boolean) => void;
+  setBatchSetValidModal: (visible: boolean) => void;
   addSelectedID: (selectedID: string) => void;
   addHighlightID: (highlightID: number) => void;
   selectedAllBoxes: () => void;
@@ -196,10 +198,12 @@ export const PointCloudContext = React.createContext<IPointCloudContext>({
   highlightIDs: [],
   setHighlightIDs: () => {},
   valid: true,
+  visibleBatchSetValid: false,
   setSelectedIDs: () => {},
   setPointCloudResult: () => {},
   setPointCloudSphereList: () => {},
   setPointCloudValid: () => {},
+  setBatchSetValidModal: () => {},
   setTopViewInstance: () => {},
   setSideViewInstance: () => {},
   setBackViewInstance: () => {},
@@ -300,6 +304,7 @@ export const PointCloudProvider: React.FC<PropsWithChildren<{}>> = ({ children }
   const [highlight2DDataList, setHighlight2DDataList] = useState<IHighlight2DData[]>([]);
   const [highlight2DLoading, setHighlight2DLoading] = useState<boolean>(false);
   const state = useAnnotatedBoxStore();
+  const [visibleBatchSetValid, setVisibleBatchSetValid] = useState<boolean>(false);
 
   const [imageSizes, setImageSizes] = useState<{
     [key: string]: ISize;
@@ -532,6 +537,10 @@ export const PointCloudProvider: React.FC<PropsWithChildren<{}>> = ({ children }
       setValid(valid === false ? false : true);
     };
 
+    const setBatchSetValidModal = (visible: boolean) => {
+      setVisibleBatchSetValid(visible);
+    };
+
     const setSelectedIDs = (selectedIDs?: string[] | string) => {
       if (selectedIDs === undefined) {
         setSelectedIDsState([]);
@@ -755,8 +764,10 @@ export const PointCloudProvider: React.FC<PropsWithChildren<{}>> = ({ children }
       addPointCloudSphere,
       setPointCloudSphereList,
       valid,
+      visibleBatchSetValid,
       selectedPointCloudBox,
       setPointCloudValid,
+      setBatchSetValidModal,
       addSelectedID,
       addHighlightID,
       selectedAllBoxes,
@@ -825,6 +836,7 @@ export const PointCloudProvider: React.FC<PropsWithChildren<{}>> = ({ children }
     };
   }, [
     valid,
+    visibleBatchSetValid,
     selectedIDs,
     pointCloudBoxList,
     pointCloudSphereList,

packages/lb-components/src/components/pointCloudView/PointCloudListener.tsx

@@ -6,7 +6,7 @@ import { useSingleBox } from './hooks/useSingleBox';
 import { useSphere } from './hooks/useSphere';
 import React, { useContext, useEffect } from 'react';
 import { cTool, CommonToolUtils, EToolName } from '@labelbee/lb-annotation';
-import { message } from 'antd';
+import { message, Modal } from 'antd';
 import { connect } from 'react-redux';
 import { a2MapStateToProps, IA2MapStateProps } from '@/store/annotation/map';
 import { ICustomToolInstance } from '@/hooks/annotation';
@@ -30,6 +30,7 @@ interface IProps extends IA2MapStateProps {
   checkMode?: boolean;
   toolInstanceRef: React.MutableRefObject<ICustomToolInstance>;
   setResourceLoading?: (loading: boolean) => void;
+  isBatchSetValid?: boolean;
 }
 
 const PointCloudListener: React.FC<IProps> = ({
@@ -40,6 +41,7 @@ const PointCloudListener: React.FC<IProps> = ({
   imgIndex,
   toolInstanceRef,
   setResourceLoading,
+  isBatchSetValid,
 }) => {
   const ptCtx = useContext(PointCloudContext);
   const {
@@ -146,7 +148,12 @@ const PointCloudListener: React.FC<IProps> = ({
         break;
 
       case 'v':
-        ptCtx.setPointCloudValid(!ptCtx.valid);
+        if (isBatchSetValid) {
+          Modal.destroyAll();
+          ptCtx.setBatchSetValidModal(!ptCtx.visibleBatchSetValid);
+        } else {
+          ptCtx.setPointCloudValid(!ptCtx.valid);
+        }
         break;
 
       case 'tab':

packages/lb-components/src/components/pointCloudView/index.tsx

@@ -40,13 +40,15 @@ import classNames from 'classnames';
 import SideAndBackOverView from './components/sideAndBackOverView';
 import { SetLoadPCDFileLoading } from '@/store/annotation/actionCreators';
 import DynamicResizer from '@/components/DynamicResizer';
+import { IBatchSetValid } from '@/views/MainView/sidebar/GeneralOperation';
 
 interface IProps extends IA2MapStateProps {
   drawLayerSlot?: DrawLayerSlot;
   checkMode?: boolean;
   intelligentFit?: boolean;
   measureVisible?: boolean;
   setResourceLoading?: (loading: boolean) => void;
+  setBatchSetValid?: (values: IBatchSetValid) => void;
 }
 
 const PointCloudView: React.FC<IProps> = (props) => {
@@ -61,6 +63,7 @@ const PointCloudView: React.FC<IProps> = (props) => {
     measureVisible,
     setResourceLoading,
     stepInfo,
+    setBatchSetValid,
   } = props;
   const ptCtx = useContext(PointCloudContext);
   const { globalPattern, setGlobalPattern, selectedIDs } = ptCtx;
@@ -179,6 +182,7 @@ const PointCloudView: React.FC<IProps> = (props) => {
         checkMode={checkMode}
         toolInstanceRef={toolInstanceRef}
         setResourceLoading={setResourceLoading}
+        isBatchSetValid={!!setBatchSetValid}
       />
       <div className={getClassName('point-cloud-layout')} onContextMenu={(e) => e.preventDefault()}>
         <div className={getClassName('point-cloud-wrapper')}>
@@ -261,6 +265,14 @@ const PointCloudView: React.FC<IProps> = (props) => {
           <AnnotatedAttributesPanelFixedRight />
         </div>
       </div>
+      {ptCtx.visibleBatchSetValid &&
+        setBatchSetValid?.({
+          valid: ptCtx.valid,
+          isModal: true,
+          visibleModal: ptCtx.visibleBatchSetValid,
+          onClose: () => ptCtx.setBatchSetValidModal(false),
+          singleSetQuestionImg: () => ptCtx.setPointCloudValid(!ptCtx.valid),
+        })}
     </>
   );
 };

packages/lb-components/src/views/MainView/index.tsx

@@ -29,11 +29,13 @@ import { LoadingOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { EPointCloudName } from '@labelbee/lb-annotation';
 import LLMMultiWheelLayout from './LLMMultiWheelLayout';
+import { IBatchSetValid } from './sidebar/GeneralOperation';
 
 interface IProps {
   path: string;
   loading: boolean;
   measureVisible?: boolean;
+  setBatchSetValid?: (values: IBatchSetValid) => void;
 }
 
 const { Sider, Content } = Layout;
@@ -59,6 +61,7 @@ const PointCloudAnnotate: React.FC<AppProps & IProps> = (props) => {
         intelligentFit={props.intelligentFit}
         measureVisible={props.measureVisible}
         setResourceLoading={props.setResourceLoading}
+        setBatchSetValid={props?.setBatchSetValid}
       />
       <ToolFooter style={props.style?.footer} mode={props.mode} footer={props?.footer} />
     </>
@@ -185,6 +188,7 @@ const MainView: React.FC<AppProps & IProps> = (props) => {
             enableColorPicker={props?.enableColorPicker}
             setSiderWidth={setSiderWidth}
             propsSiderWidth={props.style?.sider?.width}
+            setBatchSetValid={props.setBatchSetValid}
           />
         </Sider>
       </Layout>

packages/lb-components/src/views/MainView/sidebar/GeneralOperation/ActionsConfirm.tsx

@@ -2,6 +2,7 @@ import React, { useRef, useState } from 'react';
 import { Col, Popconfirm } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { prefix } from '@/constant';
+import { IBatchSetValid } from '../GeneralOperation';
 
 export interface IOperationConfig {
   name: string;
@@ -68,12 +69,40 @@ const ShowIcon = ({ isHover, info }: { isHover: string | null; info: IOperationC
   );
 };
 
-const ActionsConfirm: React.FC<{ allOperation: IOperationConfig[] }> = ({ allOperation }) => {
+const ActionsConfirm: React.FC<{
+  allOperation: IOperationConfig[];
+  setBatchSetValid?: (values: IBatchSetValid) => void;
+  valid?: boolean;
+}> = ({ allOperation, setBatchSetValid, valid }) => {
   const ref = useRef<HTMLDivElement>(null);
   const [isHover, setHover] = useState<string | null>(null);
   const { t } = useTranslation();
   const annotationLength = Math.floor(24 / allOperation.length);
 
+  const itemBox = (info: IOperationConfig) => {
+    if (info.forbidConfirm) {
+      return <ShowIcon info={info} isHover={isHover} />;
+    }
+    if (setBatchSetValid && info.key === 'setValidity') {
+      return setBatchSetValid({ valid, isHover: !!isHover, singleSetQuestionImg: info.onClick });
+    }
+    return (
+      <Popconfirm
+        title={<PopconfirmTitle info={info} />}
+        placement='topRight'
+        okText={t('Confirm')}
+        cancelText={t('Cancel')}
+        getPopupContainer={() => ref.current ?? document.body}
+        onConfirm={info.onClick}
+        overlayClassName={`${prefix}-pop-confirm`}
+      >
+        <div>
+          <ShowIcon info={info} isHover={isHover} />
+        </div>
+      </Popconfirm>
+    );
+  };
+
   return (
     <div className='generalOperation' ref={ref}>
       {allOperation.map((info, index) => (
@@ -88,23 +117,7 @@ const ActionsConfirm: React.FC<{ allOperation: IOperationConfig[] }> = ({ allOpe
               setHover(null);
             }}
           >
-            {info.forbidConfirm ? (
-              <ShowIcon info={info} isHover={isHover} />
-            ) : (
-              <Popconfirm
-                title={<PopconfirmTitle info={info} />}
-                placement='topRight'
-                okText={t('Confirm')}
-                cancelText={t('Cancel')}
-                getPopupContainer={() => ref.current ?? document.body}
-                onConfirm={info.onClick}
-                overlayClassName={`${prefix}-pop-confirm`}
-              >
-                <div>
-                  <ShowIcon info={info} isHover={isHover} />
-                </div>
-              </Popconfirm>
-            )}
+            {itemBox(info)}
           </div>
         </Col>
       ))}

packages/lb-components/src/views/MainView/sidebar/GeneralOperation/index.tsx

@@ -29,13 +29,23 @@ const mapStateToProps = (state: AppState) => {
     stepList: state.annotation.stepList,
   };
 };
+export interface IBatchSetValid {
+  isHover?: boolean;
+  valid?: boolean;
+  isModal?: boolean;
+  visibleModal?: boolean;
+  onClose?: () => void;
+  singleSetQuestionImg?: () => void;
+}
+
 interface IProps {
   toolInstance: ToolInstance;
   stepInfo: IStepInfo;
   imgList: AnnotationFileList;
   imgIndex: number;
   stepList: IStepInfo[];
   hideValidity?: boolean;
+  setBatchSetValid?: (values: IBatchSetValid) => void;
 }
 
 const GeneralOperation: React.FC<IProps> = ({ toolInstance, stepInfo, hideValidity }) => {
@@ -63,7 +73,7 @@ export const PointCloudOperation: ConnectedComponent<
     'toolInstance' | 'stepInfo' | 'imgList' | 'imgIndex' | 'stepList'
   >
 > = connect(mapStateToProps, null, null, { context: LabelBeeContext })(
-  ({ toolInstance, stepInfo, imgList, stepList, imgIndex }) => {
+  ({ toolInstance, stepInfo, imgList, stepList, imgIndex, setBatchSetValid }) => {
     const { t } = useTranslation();
     const { selectedBox } = useSingleBox();
     const operationList = useOperationList(toolInstance);
@@ -114,7 +124,12 @@ export const PointCloudOperation: ConnectedComponent<
 
     return (
       <>
-        <ActionsConfirm allOperation={allOperation} />
+        <ActionsConfirm
+          allOperation={allOperation}
+          setBatchSetValid={setBatchSetValid}
+          valid={toolInstance?.valid}
+        />
+
         <UnifyParamsModal
           id={selectedBoxInfo?.trackID}
           visible={isShowModal}

packages/lb-components/src/views/MainView/sidebar/index.tsx

@@ -8,7 +8,7 @@ import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import AnnotationText from './AnnotationText';
 import ClearIcon from './ClearIcon';
-import GeneralOperation, { PointCloudOperation } from './GeneralOperation';
+import GeneralOperation, { IBatchSetValid, PointCloudOperation } from './GeneralOperation';
 import ImgAttributeInfo from './ImgAttributeInfo';
 import SwitchAttributeList from './SwitchAttributeList';
 import TagSidebar, { expandIconFuc } from './TagSidebar';
@@ -39,6 +39,7 @@ interface IProps {
   setSiderWidth?: (width: number | undefined) => void;
   propsSiderWidth?: number | undefined;
   checkMode?: boolean;
+  setBatchSetValid?: (values: IBatchSetValid) => void;
 }
 
 export const sidebarCls = `${prefix}-sidebar`;
@@ -48,6 +49,7 @@ const Sidebar: React.FC<IProps> = ({
   setSiderWidth,
   propsSiderWidth,
   checkMode,
+  setBatchSetValid,
 }) => {
   const stepInfo = useSelector((state: AppState) =>
     StepUtils.getCurrentStepInfo(state.annotation.step, state.annotation.stepList),
@@ -138,7 +140,7 @@ const Sidebar: React.FC<IProps> = ({
 
   const pointCloudToolSidebar = <PointCloudToolSidebar enableColorPicker={enableColorPicker} />;
 
-  const pointCloudOperation = <PointCloudOperation />;
+  const pointCloudOperation = <PointCloudOperation setBatchSetValid={setBatchSetValid} />;
 
   if (sider) {
     if (typeof sider === 'function') {