From 6023def2adaf74c66e18e761e085ce085d8030be Mon Sep 17 00:00:00 2001 From: ChenX Date: Wed, 31 Mar 2021 09:40:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E6=8E=92=E9=92=BB=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=B9=B2=E6=B6=89=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/CheckHoles.ts | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/Add-on/CheckHoles.ts b/src/Add-on/CheckHoles.ts index 5be197665..c96a3c73b 100644 --- a/src/Add-on/CheckHoles.ts +++ b/src/Add-on/CheckHoles.ts @@ -1,14 +1,16 @@ -import { Command } from "../Editor/CommandMachine"; import { app } from "../ApplicationServices/Application"; +import { Intent } from "../Common/Toaster"; +import { CylinderHole, GangDrillType } from "../DatabaseServices/3DSolid/CylinderHole"; +import { Hole } from "../DatabaseServices/3DSolid/Hole"; import { Board } from "../DatabaseServices/Entity/Board"; -import { PromptStatus } from "../Editor/PromptResult"; import { ObjectId } from "../DatabaseServices/ObjectId"; -import { DrawDrillingTool } from "./DrawDrilling/DrawDrillingTool"; -import { ICollsionBrs, CollsionModal } from "./DrawDrilling/CollisionModal"; -import { ModalPosition } from "../UI/Components/Modal/ModalInterface"; -import { Hole } from "../DatabaseServices/3DSolid/Hole"; -import { CylinderHole, GangDrillType } from "../DatabaseServices/3DSolid/CylinderHole"; +import { Command } from "../Editor/CommandMachine"; +import { PromptStatus } from "../Editor/PromptResult"; import { Box3Ext } from "../Geometry/Box"; +import { ModalPosition } from "../UI/Components/Modal/ModalInterface"; +import { AppToaster } from "../UI/Components/Toaster"; +import { CollsionModal, ICollsionBrs } from "./DrawDrilling/CollisionModal"; +import { DrawDrillingTool } from "./DrawDrilling/DrawDrillingTool"; export class CheckHoles implements Command { @@ -134,7 +136,14 @@ export class CheckHoles implements Command } } - app.Editor.ModalManage.RenderModeless(CollsionModal, { faces: res }, { position: ModalPosition.Right, canMinimize: false }); + if (res.length) + app.Editor.ModalManage.RenderModeless(CollsionModal, { faces: res }, { position: ModalPosition.Right, canMinimize: false }); + else + AppToaster.show({ + message: "排钻没有干涉!", + timeout: 5000, + intent: Intent.SUCCESS, + }); } }