From 3a2cc7f530f62e15edb6ca372ac204c269d53f94 Mon Sep 17 00:00:00 2001 From: Zoe <33168975+ZoeLeee@users.noreply.github.com> Date: Tue, 7 Aug 2018 21:36:39 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix=20#ILWC9=20=E6=9C=89=E9=81=AE?= =?UTF-8?q?=E7=BD=A9=E5=B1=82=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E7=82=B9=E5=87=BB=E7=94=BB=E5=B8=83=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=A8=A1=E6=80=81=E6=A1=86=E7=84=A6=E7=82=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/UI/Components/Modal/ModalsManage.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/UI/Components/Modal/ModalsManage.tsx b/src/UI/Components/Modal/ModalsManage.tsx index 7dc133bd1..fe89264fb 100644 --- a/src/UI/Components/Modal/ModalsManage.tsx +++ b/src/UI/Components/Modal/ModalsManage.tsx @@ -69,12 +69,6 @@ export class ModalManage { this.m_ModalContainer.addEventListener('keydown', e => this.OnKeyDown(e)); - let canvas = document.getElementById("Webgl"); - canvas.addEventListener("click", () => - { - this.m_ModalContainer.focus(); - this.m_ModalContainer.blur(); - }); this.m_ModalContainer.addEventListener("click", (e: MouseEvent) => { let el = (e.target as HTMLElement); From b93891d47256f23a343d399c5bca502ed7783b35 Mon Sep 17 00:00:00 2001 From: Zoe <33168975+ZoeLeee@users.noreply.github.com> Date: Tue, 7 Aug 2018 22:29:25 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix=20#ILWU6=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9D=BF=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=A1=86=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=A1=B6=E5=BA=95=E6=9D=BF=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawBoard/DrawTopBottomBoard.ts | 9 +-- src/UI/Components/Board/BoardCommon.tsx | 69 +++++++++++-------- src/UI/Components/Board/BoardModal.tsx | 4 +- .../Components/Board/TopBottomBoardModal.tsx | 2 +- src/UI/Components/Modal/ModalsManage.tsx | 10 +-- 5 files changed, 49 insertions(+), 45 deletions(-) diff --git a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts index c2e9abea7..f254b30a7 100644 --- a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts +++ b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts @@ -63,20 +63,20 @@ export class DrawTopBottomBoard implements Command let length: number; let thickness = parseFloat(opt.thickness); let offset = parseFloat(opt.offset); - + let forwardDistance = parseFloat(opt.forwardDistance); let rot = spaceParse.SpaceOCS; + let leftExt = parseFloat(opt.leftExt); + let rightExt = parseFloat(opt.rightExt); if (opt.isWrapSide) { length = spaceParse.TotalLength; basePt = wrapPt; - isTop && basePt.add(new Vector3(0, 0, thickness)); } else { length = spaceParse.SpaceLength; basePt = noWrapPt; - !isTop && basePt.add(new Vector3(0, 0, thickness)); basePt.add(new Vector3(0, 0, offset * (isTop ? -1 : 1))); if (!isTop) { @@ -86,8 +86,9 @@ export class DrawTopBottomBoard implements Command app.m_Database.ModelSpace.Append(footBoard); } } + basePt.add(new Vector3(rightExt, -forwardDistance, thickness)); - board = Board.CreateBoard(length, spaceParse.SpaceWidth - parseFloat(opt.forwardDistance) + parseFloat(opt.behindDistance), thickness, BoardType.Layer) + board = Board.CreateBoard(length + leftExt + rightExt, spaceParse.SpaceWidth + forwardDistance + parseFloat(opt.behindDistance), thickness, BoardType.Layer) board.ApplyMatrix(MoveMatrix(basePt)); board.ApplyMatrix(rot); app.m_Database.ModelSpace.Append(board); diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx index 4a93f5269..c22a87457 100644 --- a/src/UI/Components/Board/BoardCommon.tsx +++ b/src/UI/Components/Board/BoardCommon.tsx @@ -74,37 +74,46 @@ export const SetBoardDataBlock = observer(({ pars, opt, className, isInline = fa ); export const TBBoardDataBlock = observer(({ pars, opt, istop }: { pars: Map, opt: TBBoardOption, istop: boolean }) => -
-
{istop ? "顶板" : "底板"}
- opt.isDraw = !opt.isDraw} - /> - opt.isWrapSide = e.currentTarget.value === "1"} - selectedValue={opt.isWrapSide ? "1" : "0"} - > - - - -
- { - Array.from(pars.keys()).map(k => - - ) - } +{ + if (!istop) + { + pars.set("footThickness", "地脚厚") + } + return ( +
+
{istop ? "顶板" : "底板"}
+ opt.isDraw = !opt.isDraw} + /> + opt.isWrapSide = e.currentTarget.value === "1"} + selectedValue={opt.isWrapSide ? "1" : "0"} + > + + + +
+ { + Array.from(pars.keys()).map(k => + + ) + } +
-
+ ) +} + ); export const BoardModel = () => diff --git a/src/UI/Components/Board/BoardModal.tsx b/src/UI/Components/Board/BoardModal.tsx index 4b2491295..769a89e42 100644 --- a/src/UI/Components/Board/BoardModal.tsx +++ b/src/UI/Components/Board/BoardModal.tsx @@ -247,14 +247,16 @@ export class BoardModal extends React.Component { diff --git a/src/UI/Components/Board/TopBottomBoardModal.tsx b/src/UI/Components/Board/TopBottomBoardModal.tsx index 0be0f32a5..2a77c28b4 100644 --- a/src/UI/Components/Board/TopBottomBoardModal.tsx +++ b/src/UI/Components/Board/TopBottomBoardModal.tsx @@ -11,7 +11,7 @@ export const TopBottomBoardModal = let pars = new Map([ ["thickness", "板厚"], ["forwardDistance", "前距"], ["behindDistance", "后距"], ["leftExt", "左延伸"], ["rightExt", "右延伸"], - ["offset", "偏移"], ["footThickness", "地脚厚"] + ["offset", "偏移"] ]); return (
diff --git a/src/UI/Components/Modal/ModalsManage.tsx b/src/UI/Components/Modal/ModalsManage.tsx index fe89264fb..402befac9 100644 --- a/src/UI/Components/Modal/ModalsManage.tsx +++ b/src/UI/Components/Modal/ModalsManage.tsx @@ -69,21 +69,13 @@ export class ModalManage { this.m_ModalContainer.addEventListener('keydown', e => this.OnKeyDown(e)); - this.m_ModalContainer.addEventListener("click", (e: MouseEvent) => - { - let el = (e.target as HTMLElement); - if (el.nodeName !== "INPUT" && el.nodeName !== "SELECT") - { - this.m_ModalContainer.focus(); - } - }); this.m_ModalContainer.addEventListener('focus', () => { this.m_Masking.style.display = "block"; }, true); - this.m_ModalContainer.addEventListener('blur', () => + this.m_ModalContainer.addEventListener('blur', (e) => { if (!this.m_IsModal) this.m_Masking.style.display = "none"; From 4a7fe21345885ff54a8063127bc51042b315a2ba Mon Sep 17 00:00:00 2001 From: Zoe <33168975+ZoeLeee@users.noreply.github.com> Date: Tue, 7 Aug 2018 22:34:28 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=88=A0=E5=B9=B2=E5=87=80=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/UI/Components/Modal/ModalsManage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/Components/Modal/ModalsManage.tsx b/src/UI/Components/Modal/ModalsManage.tsx index 402befac9..df055c1e3 100644 --- a/src/UI/Components/Modal/ModalsManage.tsx +++ b/src/UI/Components/Modal/ModalsManage.tsx @@ -75,7 +75,7 @@ export class ModalManage this.m_Masking.style.display = "block"; }, true); - this.m_ModalContainer.addEventListener('blur', (e) => + this.m_ModalContainer.addEventListener('blur', () => { if (!this.m_IsModal) this.m_Masking.style.display = "none"; From 209437a622d9da9bd38de1f7a1e9eb954f10e923 Mon Sep 17 00:00:00 2001 From: ChenX Date: Wed, 8 Aug 2018 10:04:22 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix=20=E5=81=8F=E7=A7=BB=E5=B0=8F?= =?UTF-8?q?=E4=BA=8E=E7=AD=89=E4=BA=8E0=E6=97=B6=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E7=BB=98=E5=88=B6=E5=9C=B0=E8=84=9A.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawBoard/DrawTopBottomBoard.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts index f254b30a7..cd5ff56ea 100644 --- a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts +++ b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts @@ -23,7 +23,7 @@ export class DrawTopBottomBoard implements Command let boardCus = exSsRes.SelectSet.SelectEntityList.filter(en => en instanceof Board) as Board[]; - if (boardCus.length >= 2) + if (boardCus.length >= 2) { let spaceParse = new SurroundSpaceParse(boardCus); @@ -48,17 +48,16 @@ export class DrawTopBottomBoard implements Command } else { - app.m_Editor.m_CommandStore.Prompt("选择板无效") + app.m_Editor.Prompt("选择板无效"); } } else { - app.m_Editor.m_CommandStore.Prompt("不是选择2块板或者板类型不正确") + app.m_Editor.Prompt("不是选择2块板或者板类型不正确"); } } buildTBBoard(spaceParse: SurroundSpaceParse, opt: TBBoardOption, wrapPt: Vector3, noWrapPt: Vector3, isTop = false) { - let board: Board; let basePt: Vector3; let length: number; let thickness = parseFloat(opt.thickness); @@ -78,7 +77,7 @@ export class DrawTopBottomBoard implements Command length = spaceParse.SpaceLength; basePt = noWrapPt; basePt.add(new Vector3(0, 0, offset * (isTop ? -1 : 1))); - if (!isTop) + if (!isTop && offset > 0) { let footBoard = Board.CreateBoard(offset, spaceParse.SpaceLength, parseFloat(opt.footThickness), BoardType.Behind); footBoard.ApplyMatrix(MoveMatrix(spaceParse.BaseFootPoint)); @@ -88,7 +87,7 @@ export class DrawTopBottomBoard implements Command } basePt.add(new Vector3(rightExt, -forwardDistance, thickness)); - board = Board.CreateBoard(length + leftExt + rightExt, spaceParse.SpaceWidth + forwardDistance + parseFloat(opt.behindDistance), thickness, BoardType.Layer) + let board = Board.CreateBoard(length + leftExt + rightExt, spaceParse.SpaceWidth + forwardDistance + parseFloat(opt.behindDistance), thickness, BoardType.Layer) board.ApplyMatrix(MoveMatrix(basePt)); board.ApplyMatrix(rot); app.m_Database.ModelSpace.Append(board); From 7e497519e6314dd57e182d1678f58d7de9fd3def Mon Sep 17 00:00:00 2001 From: Zoe Date: Wed, 8 Aug 2018 12:00:29 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix=20#ILWU6=20=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9D=BF=E4=BB=B6=E7=BB=98=E5=88=B6=E5=92=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E4=B8=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawBoard/DrawBehindBoard.ts | 13 ++++++--- src/Add-on/DrawBoard/DrawLayerBoard.ts | 20 ++++++++++--- src/Add-on/DrawBoard/DrawLeftRightBoard.ts | 3 ++ src/Add-on/DrawBoard/DrawVerticalBoard.ts | 14 ++++++++-- src/UI/Components/Board/BoardCommon.tsx | 28 +++++++++---------- .../Components/Board/TopBottomBoardModal.tsx | 2 +- 6 files changed, 54 insertions(+), 26 deletions(-) diff --git a/src/Add-on/DrawBoard/DrawBehindBoard.ts b/src/Add-on/DrawBoard/DrawBehindBoard.ts index 81bc98344..01dd6a8fc 100644 --- a/src/Add-on/DrawBoard/DrawBehindBoard.ts +++ b/src/Add-on/DrawBoard/DrawBehindBoard.ts @@ -47,17 +47,22 @@ export class DrawBehindBoard extends DrawBoardTool let thickness = parseFloat(opt.thickness); let board = Board.CreateBoard(height, size.x, thickness, BoardType.Behind); - + //等分单层空间大小 + let singleSize = (size.y - (thickness * count)) / (count + 1); //构建板件 for (let i = 1; i <= count; i++) { let b = board.Clone() as Board; if (relPos === BrRelativePos.Front) - b.ApplyMatrix(MoveMatrix(newBox.min.clone().add(new Vector3(0, spaceSize * i, 0)))); + b.ApplyMatrix(MoveMatrix(newBox.min.clone().add(new Vector3(0, spaceSize * i + (i - 1) * thickness, 0)))); else if (relPos === BrRelativePos.Back) - b.ApplyMatrix(MoveMatrix(newBox.min.clone().add(new Vector3(0, size.y - spaceSize * i - thickness, 0)))); + b.ApplyMatrix(MoveMatrix(newBox.min.clone().add( + new Vector3(0, size.y - spaceSize * i - i * thickness, 0) + ))); else - b.ApplyMatrix(MoveMatrix(newBox.min.clone().add(new Vector3(0, size.y / (count + 1) * i - thickness / 2, 0)))); + b.ApplyMatrix(MoveMatrix(newBox.min.clone().add( + new Vector3(0, singleSize * i + (i - 1) * thickness, 0) + ))); b.ApplyMatrix(ro); app.m_Database.ModelSpace.Append(b); diff --git a/src/Add-on/DrawBoard/DrawLayerBoard.ts b/src/Add-on/DrawBoard/DrawLayerBoard.ts index cde60b424..23bcda434 100644 --- a/src/Add-on/DrawBoard/DrawLayerBoard.ts +++ b/src/Add-on/DrawBoard/DrawLayerBoard.ts @@ -28,16 +28,28 @@ export class DrawLayerBoard extends DrawBoardTool let board = Board.CreateBoard(size.x - leftShrink - rightShrink, width, thickness, BoardType.Layer); + //等分单层空间大小 + let singleSize = (size.z - (thickness * count)) / (count + 1); + for (let i = 1; i <= count; i++) { let b = board.Clone() as Board; if (type === BrRelativePos.Top) - b.ApplyMatrix(MoveMatrix(box.min.clone().add(new Vector3(size.x - leftShrink, frontShrink, size.z - spaceSize * i)))); + b.ApplyMatrix(MoveMatrix(box.min.clone().add( + new Vector3(size.x - leftShrink, frontShrink, size.z - spaceSize * i - (i - 1) * thickness) + ))); else if (type === BrRelativePos.Bottom) - b.ApplyMatrix(MoveMatrix(box.min.clone().add(new Vector3(size.x - leftShrink, frontShrink, spaceSize * i)))); + b.ApplyMatrix( + MoveMatrix(box.min.clone().add( + new Vector3(size.x - leftShrink, frontShrink, (spaceSize + thickness) * i) + ))); else - b.ApplyMatrix(MoveMatrix(box.min.clone().add(new Vector3(size.x - leftShrink, frontShrink, size.z / (count + 1) * i + thickness / 2)))); - + { + b.ApplyMatrix( + MoveMatrix(box.min.clone().add( + new Vector3(size.x - leftShrink, frontShrink, (singleSize + thickness) * i)) + )); + } b.ApplyMatrix(ro); app.m_Database.ModelSpace.Append(b); } diff --git a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts index 0d873fb3b..c5665fa98 100644 --- a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts +++ b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts @@ -45,6 +45,9 @@ export class DrawLeftRight implements Command if (ptRes.Status === PromptStatus.OK) { + let vec = ptRes.Value.clone().sub(leftBoard.Position); + leftBoard.ApplyMatrix(MoveMatrix(vec)); + rightBoard.ApplyMatrix(MoveMatrix(vec)) app.m_Database.ModelSpace.Append(leftBoard); app.m_Database.ModelSpace.Append(rightBoard); } diff --git a/src/Add-on/DrawBoard/DrawVerticalBoard.ts b/src/Add-on/DrawBoard/DrawVerticalBoard.ts index 330275f2a..4883e70da 100644 --- a/src/Add-on/DrawBoard/DrawVerticalBoard.ts +++ b/src/Add-on/DrawBoard/DrawVerticalBoard.ts @@ -29,16 +29,24 @@ export class DrawVerticalBoard extends DrawBoardTool let thickness = parseFloat(opt.thickness); let board = Board.CreateBoard(length, width, thickness, BoardType.Vertical); + //等分单层空间大小 + let singleSize = (size.x - (thickness * count)) / (count + 1); for (let i = 1; i <= count; i++) { let b = board.Clone() as Board; if (type === BrRelativePos.Left) - b.ApplyMatrix(MoveMatrix(box.min.clone().add(new Vector3(spaceSize * i, frontShrink, bottomShink)))); + b.ApplyMatrix(MoveMatrix(box.min.clone().add( + new Vector3((spaceSize + thickness) * i, frontShrink, bottomShink) + ))); else if (type === BrRelativePos.Right) - b.ApplyMatrix(MoveMatrix(box.min.clone().add(new Vector3(size.x - spaceSize * i, frontShrink, bottomShink)))); + b.ApplyMatrix(MoveMatrix(box.min.clone().add( + new Vector3(size.x - spaceSize * i - (i - 1) * thickness, frontShrink, bottomShink) + ))); else - b.ApplyMatrix(MoveMatrix(box.min.clone().add(new Vector3(size.x / (count + 1) * i + thickness / 2, frontShrink, bottomShink)))); + b.ApplyMatrix(MoveMatrix(box.min.clone().add( + new Vector3((singleSize + thickness) * i, frontShrink, bottomShink) + ))); b.ApplyMatrix(ro); app.m_Database.ModelSpace.Append(b); diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx index c22a87457..2d1200380 100644 --- a/src/UI/Components/Board/BoardCommon.tsx +++ b/src/UI/Components/Board/BoardCommon.tsx @@ -75,10 +75,6 @@ export const SetBoardDataBlock = observer(({ pars, opt, className, isInline = fa ); export const TBBoardDataBlock = observer(({ pars, opt, istop }: { pars: Map, opt: TBBoardOption, istop: boolean }) => { - if (!istop) - { - pars.set("footThickness", "地脚厚") - } return (
{istop ? "顶板" : "底板"}
@@ -98,16 +94,20 @@ export const TBBoardDataBlock = observer(({ pars, opt, istop }: { pars: Map { Array.from(pars.keys()).map(k => - - ) + { + if (k !== "footThickness" || (k === "footThickness" && !istop)) + return ( + + ) + }) }
diff --git a/src/UI/Components/Board/TopBottomBoardModal.tsx b/src/UI/Components/Board/TopBottomBoardModal.tsx index 2a77c28b4..0be0f32a5 100644 --- a/src/UI/Components/Board/TopBottomBoardModal.tsx +++ b/src/UI/Components/Board/TopBottomBoardModal.tsx @@ -11,7 +11,7 @@ export const TopBottomBoardModal = let pars = new Map([ ["thickness", "板厚"], ["forwardDistance", "前距"], ["behindDistance", "后距"], ["leftExt", "左延伸"], ["rightExt", "右延伸"], - ["offset", "偏移"] + ["offset", "偏移"], ["footThickness", "地脚厚"] ]); return (
From 62e59b7d355092a82b940ca79612f49f4d9f057c Mon Sep 17 00:00:00 2001 From: Zoe Date: Wed, 8 Aug 2018 14:28:50 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B6=E5=BA=95?= =?UTF-8?q?=E6=9D=BF=E7=BB=98=E5=88=B6=E9=94=99=E8=AF=AF,=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawBoard/DrawTopBottomBoard.ts | 9 +- src/UI/Components/Board/BehindBoardModal.tsx | 16 +- src/UI/Components/Board/BoardCommon.tsx | 292 ++++++++++-------- src/UI/Components/Board/LayerBoardModal.tsx | 8 +- .../Components/Board/VerticalBoardModal.tsx | 4 +- 5 files changed, 177 insertions(+), 152 deletions(-) diff --git a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts index cd5ff56ea..eda1d995d 100644 --- a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts +++ b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts @@ -71,11 +71,17 @@ export class DrawTopBottomBoard implements Command { length = spaceParse.TotalLength; basePt = wrapPt; + + //如果是包侧,则如果是顶面则需上移一个厚度 + isTop && basePt.add(new Vector3(0, 0, thickness)); } else { length = spaceParse.SpaceLength; basePt = noWrapPt; + + //如果是侧包,底面需上移一个厚度 + !isTop && basePt.add(new Vector3(0, 0, thickness)); basePt.add(new Vector3(0, 0, offset * (isTop ? -1 : 1))); if (!isTop && offset > 0) { @@ -85,7 +91,8 @@ export class DrawTopBottomBoard implements Command app.m_Database.ModelSpace.Append(footBoard); } } - basePt.add(new Vector3(rightExt, -forwardDistance, thickness)); + //移动右缩和前距的距离 + basePt.add(new Vector3(rightExt, -forwardDistance)); let board = Board.CreateBoard(length + leftExt + rightExt, spaceParse.SpaceWidth + forwardDistance + parseFloat(opt.behindDistance), thickness, BoardType.Layer) board.ApplyMatrix(MoveMatrix(basePt)); diff --git a/src/UI/Components/Board/BehindBoardModal.tsx b/src/UI/Components/Board/BehindBoardModal.tsx index 535b4206a..b7983f262 100644 --- a/src/UI/Components/Board/BehindBoardModal.tsx +++ b/src/UI/Components/Board/BehindBoardModal.tsx @@ -69,14 +69,14 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
@@ -89,13 +89,13 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
板件尺寸
- +
- + - +
- +
diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx index 2d1200380..526d49ff1 100644 --- a/src/UI/Components/Board/BoardCommon.tsx +++ b/src/UI/Components/Board/BoardCommon.tsx @@ -4,117 +4,134 @@ import * as React from 'react'; import { BoardOption, BrRelativePos, TBBoardOption } from '../../Store/BoardInterface'; import { BoardStore } from '../../Store/BoardStore'; +interface ISetItemOption +{ + optKey: string; + title: string; + option: BoardOption; + isDisabled?: boolean; +} +interface ISetBlockOption +{ + pars: Map, + opt: BoardOption + className?: string, + isInline?: boolean, +} //设置板件数据组件 -export const SetBoardDataItem = observer(({ k, opt, title, isDisabled = false }: { k: string, title: string, isDisabled?: boolean, opt: BoardOption }) => -
- - {title}: +export const SetBoardDataItem = observer( + ({ optKey, option, title, isDisabled = false }: ISetItemOption) => +
+ + {title}: - - { - if (!BoardStore.IsVailOption(k, e.target.value)) - { - e.target.className += " bp3-intent-danger" - } - else + { - e.target.className = "bp3-input" - } - opt[k] = e.target.value; - }} - /> -
+ if (!BoardStore.IsVailOption(optKey, e.target.value)) + { + e.target.className += " bp3-intent-danger" + } + else + { + e.target.className = "bp3-input" + } + option[optKey] = e.target.value; + }} + /> +
); //设置板件数据组件 -export const SetBoardDataItem2 = observer(({ k, opt, title }: { k: string, title: string, opt: BoardOption }) => - ); -export const SetBoardDataBlock = observer(({ pars, opt, className, isInline = false }: { pars: Map, className?: string, isInline?: boolean, opt: BoardOption }) => -
+export const SetBoardDataBlock = observer( + ({ pars, opt, className, isInline = false }: ISetBlockOption) => +
+ { + Array.from(pars.keys()).map(k => + isInline ? + : + ) + } +
+); +export const TBBoardDataBlock = + observer( + ({ pars, opt, istop }: { pars: Map, opt: TBBoardOption, istop: boolean }) => { - Array.from(pars.keys()).map(k => - isInline ? - : +
{istop ? "顶板" : "底板"}
+ opt.isDraw = !opt.isDraw} /> + opt.isWrapSide = e.currentTarget.value === "1"} + selectedValue={opt.isWrapSide ? "1" : "0"} + > + + + +
+ { + Array.from(pars.keys()).map(k => + { + if (k !== "footThickness" || (k === "footThickness" && !istop)) + return ( + + ) + }) + } +
+
) - } -
-); -export const TBBoardDataBlock = observer(({ pars, opt, istop }: { pars: Map, opt: TBBoardOption, istop: boolean }) => -{ - return ( -
-
{istop ? "顶板" : "底板"}
- opt.isDraw = !opt.isDraw} - /> - opt.isWrapSide = e.currentTarget.value === "1"} - selectedValue={opt.isWrapSide ? "1" : "0"} - > - - - -
- { - Array.from(pars.keys()).map(k => - { - if (k !== "footThickness" || (k === "footThickness" && !istop)) - return ( - - ) - }) - } -
-
- ) -} - -); + }); export const BoardModel = () => { @@ -126,45 +143,46 @@ export const BoardModel = () => ) } -export const BoardConfigBlock = observer(({ opt, opt1 }: { opt: BoardOption, opt1: Map }) => -{ - let pars = new Map( - [["spaceSize", "空间"], ["count", "板数"], ["thickness", "板厚"]]); - return ( -
-
配置板块
- - { - let value = e.currentTarget.value as BrRelativePos; - opt.boardRelative = value; - }} - selectedValue={opt.boardRelative} - > - { - Array.from(opt1.keys()).map((k, i) => - - ) - } - - -
- { - Array.from(pars.keys()).map(k => - - ) - } +export const BoardConfigBlock = observer( + ({ opt, opt1 }: { opt: BoardOption, opt1: Map }) => + { + let pars = new Map( + [["spaceSize", "空间"], ["count", "板数"], ["thickness", "板厚"]]); + return ( +
+
配置板块
+ + { + let value = e.currentTarget.value as BrRelativePos; + opt.boardRelative = value; + }} + selectedValue={opt.boardRelative} + > + { + Array.from(opt1.keys()).map((k, i) => + + ) + } + + +
+ { + Array.from(pars.keys()).map(k => + + ) + } +
-
- ) -}); + ) + }); export const BoardInfo = (props: { store?: any }) => { diff --git a/src/UI/Components/Board/LayerBoardModal.tsx b/src/UI/Components/Board/LayerBoardModal.tsx index ab662e053..72b4809e8 100644 --- a/src/UI/Components/Board/LayerBoardModal.tsx +++ b/src/UI/Components/Board/LayerBoardModal.tsx @@ -48,8 +48,8 @@ export const LayerBoardModal = Array.from(scalePars.keys()).map(k => @@ -75,8 +75,8 @@ export const LayerBoardModal = Array.from(nailPars1.keys()).map(k => diff --git a/src/UI/Components/Board/VerticalBoardModal.tsx b/src/UI/Components/Board/VerticalBoardModal.tsx index bc97f068c..bdead32e7 100644 --- a/src/UI/Components/Board/VerticalBoardModal.tsx +++ b/src/UI/Components/Board/VerticalBoardModal.tsx @@ -36,8 +36,8 @@ export const VerticalBoardModal = Array.from(scalePars.keys()).map(k => Date: Wed, 8 Aug 2018 15:34:57 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/UI/Components/Board/BoardModal.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/UI/Components/Board/BoardModal.tsx b/src/UI/Components/Board/BoardModal.tsx index 769a89e42..08be6ce67 100644 --- a/src/UI/Components/Board/BoardModal.tsx +++ b/src/UI/Components/Board/BoardModal.tsx @@ -16,6 +16,7 @@ import { VerticalBoardModal } from './VerticalBoardModal'; import * as xaop from 'xaop'; import { app } from '../../../ApplicationServices/Application'; import { ModalState } from '../Modal/ModalsManage'; +import { arrayLast } from '../../../Common/ArrayExt'; export enum BoardModalType { @@ -176,11 +177,12 @@ export class BoardModal extends React.Component || new Map(); + let brDataMap: Map = await dbstore.Get(StoreName.ConfigData, type) || new Map(); this.setState({ configs: brDataMap }); let confNames = Array.from(brDataMap.keys()); - //如果没保存过配置,添加一个默认 + + //如果没保存过配置,添加一个默认,否则显示最后保存得配置和配置名称 if (confNames.length === 0) { this.setState({ configName: "默认" }); @@ -188,7 +190,7 @@ export class BoardModal extends React.Component Date: Wed, 8 Aug 2018 16:27:43 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E9=A1=B6=E5=BA=95=E6=9D=BF=E5=9C=A8?= =?UTF-8?q?=E4=BE=A7=E5=8C=85x=E6=97=B6,=E5=B7=A6=E5=8F=B3=E5=BB=B6?= =?UTF-8?q?=E4=BC=B8=E5=BA=94=E8=AF=A5=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawBoard/DrawTopBottomBoard.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts index eda1d995d..39a15e556 100644 --- a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts +++ b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts @@ -79,7 +79,9 @@ export class DrawTopBottomBoard implements Command { length = spaceParse.SpaceLength; basePt = noWrapPt; - + //侧包时左右延伸无效 + leftExt = 0; + rightExt = 0; //如果是侧包,底面需上移一个厚度 !isTop && basePt.add(new Vector3(0, 0, thickness)); basePt.add(new Vector3(0, 0, offset * (isTop ? -1 : 1))); From 585e93eea67672a36d6c0405718aee822fce39cf Mon Sep 17 00:00:00 2001 From: Zoe Date: Wed, 8 Aug 2018 16:54:29 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=BF=E4=BB=B6?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=A4=B1=E8=B4=A5=E6=97=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawBoard/DrawBoardTool.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Add-on/DrawBoard/DrawBoardTool.ts b/src/Add-on/DrawBoard/DrawBoardTool.ts index 74bcca36c..ebbce04e2 100644 --- a/src/Add-on/DrawBoard/DrawBoardTool.ts +++ b/src/Add-on/DrawBoard/DrawBoardTool.ts @@ -76,7 +76,7 @@ export abstract class DrawBoardTool implements Command if (spaceParse.Spaces.length === 0) { - app.m_Editor.m_CommandStore.Prompt("生成b板件失败,没分析出有效空间"); + app.m_Editor.m_CommandStore.Prompt("生成板件失败,没分析出有效空间"); continue; } @@ -158,7 +158,7 @@ export abstract class DrawBoardTool implements Command if (spaceParse.Spaces.length === 0) { - app.m_Editor.m_CommandStore.Prompt("生成层板失败"); + app.m_Editor.m_CommandStore.Prompt("生成板件失败"); return; } let mat = spaceParse.SpaceOCS; @@ -188,7 +188,7 @@ export abstract class DrawBoardTool implements Command if (spaceParse.Spaces.length === 0) { - app.m_Editor.m_CommandStore.Prompt("生成层板失败"); + app.m_Editor.m_CommandStore.Prompt("生成板件失败"); return; } let ro = new Matrix4().extractRotation(spaceParse.SpaceOCS); From 12a7e3a200dfdfd14b31e32ddc8455153df32d9c Mon Sep 17 00:00:00 2001 From: cx Date: Fri, 10 Aug 2018 21:28:33 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/Array.ts | 2 +- src/Add-on/Divide.ts | 6 +- src/Add-on/DrawBoard/DrawBehindBoard.ts | 2 +- src/Add-on/DrawBoard/DrawBoardTool.ts | 12 +-- src/Add-on/DrawDim/DrawAlignedDimension.ts | 6 +- src/Add-on/DrawEllipse.ts | 2 +- src/Add-on/DrawGripStretch.ts | 98 +++++++++++----------- src/Add-on/DrawSpline.ts | 4 +- src/Add-on/Explode.ts | 2 +- src/Add-on/Fillet.ts | 6 +- src/Add-on/OffsetX.ts | 2 +- src/Add-on/PasteClip.ts | 2 +- src/Add-on/RevPl.ts | 2 +- src/Add-on/Rotate.ts | 4 +- src/Add-on/Sweep.ts | 4 +- src/Add-on/testEntity/test.ts | 2 +- src/Common/Utils.ts | 2 +- src/Editor/CommandMachine.ts | 8 +- src/Editor/GetPointServices.ts | 4 +- src/Editor/SnapDragServices.ts | 2 +- 20 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/Add-on/Array.ts b/src/Add-on/Array.ts index 6617c3676..c1dbfa83e 100644 --- a/src/Add-on/Array.ts +++ b/src/Add-on/Array.ts @@ -50,7 +50,7 @@ export class Command_Array implements Command } else if (keyWord.StringResult == "2P") { - app.m_Editor.m_CommandStore.Prompt("请选择中心点:"); + app.m_Editor.Prompt("请选择中心点:"); let ptRes = await app.m_Editor.GetPoint(); if (ptRes.Status != PromptStatus.OK) { return; } diff --git a/src/Add-on/Divide.ts b/src/Add-on/Divide.ts index 941469dbd..e55581b92 100644 --- a/src/Add-on/Divide.ts +++ b/src/Add-on/Divide.ts @@ -50,7 +50,7 @@ export class CMD_Divide implements Command let divCount = numRes.Value; if (divCount === 0) { - app.m_Editor.m_CommandStore.Prompt("您不能等分0"); + app.m_Editor.Prompt("您不能等分0"); return; } if (enRes.Entity instanceof Curve) @@ -78,7 +78,7 @@ export class CMD_Divide implements Command let divLen = numRes.Value; if (divLen === 0) { - app.m_Editor.m_CommandStore.Prompt("分段长度不能为0"); + app.m_Editor.Prompt("分段长度不能为0"); return; } if (enRes.Entity instanceof Curve) @@ -87,7 +87,7 @@ export class CMD_Divide implements Command let len = cu.Length; if (divLen > len) { - app.m_Editor.m_CommandStore.Prompt("分段长度不能超过对象长度"); + app.m_Editor.Prompt("分段长度不能超过对象长度"); return; } let divCount = len / divLen; diff --git a/src/Add-on/DrawBoard/DrawBehindBoard.ts b/src/Add-on/DrawBoard/DrawBehindBoard.ts index 01dd6a8fc..58682e38e 100644 --- a/src/Add-on/DrawBoard/DrawBehindBoard.ts +++ b/src/Add-on/DrawBoard/DrawBehindBoard.ts @@ -52,7 +52,7 @@ export class DrawBehindBoard extends DrawBoardTool //构建板件 for (let i = 1; i <= count; i++) { - let b = board.Clone() as Board; + let b = board.Clone(); if (relPos === BrRelativePos.Front) b.ApplyMatrix(MoveMatrix(newBox.min.clone().add(new Vector3(0, spaceSize * i + (i - 1) * thickness, 0)))); else if (relPos === BrRelativePos.Back) diff --git a/src/Add-on/DrawBoard/DrawBoardTool.ts b/src/Add-on/DrawBoard/DrawBoardTool.ts index ebbce04e2..9d69fb673 100644 --- a/src/Add-on/DrawBoard/DrawBoardTool.ts +++ b/src/Add-on/DrawBoard/DrawBoardTool.ts @@ -76,7 +76,7 @@ export abstract class DrawBoardTool implements Command if (spaceParse.Spaces.length === 0) { - app.m_Editor.m_CommandStore.Prompt("生成板件失败,没分析出有效空间"); + app.m_Editor.Prompt("生成板件失败,没分析出有效空间"); continue; } @@ -111,7 +111,7 @@ export abstract class DrawBoardTool implements Command } else { - app.m_Editor.m_CommandStore.Prompt("请选择有效的板件,或者周围没有效板件"); + app.m_Editor.Prompt("请选择有效的板件,或者周围没有效板件"); } } @@ -158,7 +158,7 @@ export abstract class DrawBoardTool implements Command if (spaceParse.Spaces.length === 0) { - app.m_Editor.m_CommandStore.Prompt("生成板件失败"); + app.m_Editor.Prompt("生成板件失败"); return; } let mat = spaceParse.SpaceOCS; @@ -170,7 +170,7 @@ export abstract class DrawBoardTool implements Command } else { - app.m_Editor.m_CommandStore.Prompt("请选择板件") + app.m_Editor.Prompt("请选择板件") } } private async DrawInALlBoxes(opt: BoardOption) @@ -188,7 +188,7 @@ export abstract class DrawBoardTool implements Command if (spaceParse.Spaces.length === 0) { - app.m_Editor.m_CommandStore.Prompt("生成板件失败"); + app.m_Editor.Prompt("生成板件失败"); return; } let ro = new Matrix4().extractRotation(spaceParse.SpaceOCS); @@ -201,7 +201,7 @@ export abstract class DrawBoardTool implements Command } else { - app.m_Editor.m_CommandStore.Prompt("请选择板件") + app.m_Editor.Prompt("请选择板件") } } diff --git a/src/Add-on/DrawDim/DrawAlignedDimension.ts b/src/Add-on/DrawDim/DrawAlignedDimension.ts index f27ad4416..a71181ea2 100644 --- a/src/Add-on/DrawDim/DrawAlignedDimension.ts +++ b/src/Add-on/DrawDim/DrawAlignedDimension.ts @@ -15,7 +15,7 @@ export class DrawAlignedDimension implements Command protected DimType = DimensionType.Align; async exec() { - app.m_Editor.m_CommandStore.Prompt("请指定第一条尺寸线原点:"); + app.m_Editor.Prompt("请指定第一条尺寸线原点:"); let ptRes = await app.m_Editor.GetPoint({ Msg: "请指定第一条尺寸线原点:" }); if (ptRes.Status != PromptStatus.OK) { @@ -23,7 +23,7 @@ export class DrawAlignedDimension implements Command } let startPt = ptRes.Value; - app.m_Editor.m_CommandStore.Prompt("请输入第二条尺寸线原点:"); + app.m_Editor.Prompt("请输入第二条尺寸线原点:"); ptRes = await app.m_Editor.GetPoint({ Msg: "请输入第二条尺寸线原点:", BasePoint: startPt, @@ -49,7 +49,7 @@ export class DrawAlignedDimension implements Command app.m_Editor.AddNoSnapEntity(alDim); app.m_Database.ModelSpace.Append(alDim); - app.m_Editor.m_CommandStore.Prompt("指定尺寸线位置:"); + app.m_Editor.Prompt("指定尺寸线位置:"); ptRes = await app.m_Editor.GetPoint({ Msg: "指定尺寸线位置:", KeyWordList: [{ msg: "多行文字", key: "M" }, { msg: "文字", key: "T" }, { msg: "角度", key: "A" }], diff --git a/src/Add-on/DrawEllipse.ts b/src/Add-on/DrawEllipse.ts index 193bc2c99..bd53066ac 100644 --- a/src/Add-on/DrawEllipse.ts +++ b/src/Add-on/DrawEllipse.ts @@ -14,7 +14,7 @@ export class DrawEllipse implements Command { async exec() { - app.m_Editor.m_CommandStore.Prompt("指定椭圆中心:"); + app.m_Editor.Prompt("指定椭圆中心:"); app.m_Editor.UpdateScreen(); let ptRes = await app.m_Editor.GetPoint({ Msg: "指定椭圆中心", diff --git a/src/Add-on/DrawGripStretch.ts b/src/Add-on/DrawGripStretch.ts index 86caa9b90..5d6936010 100644 --- a/src/Add-on/DrawGripStretch.ts +++ b/src/Add-on/DrawGripStretch.ts @@ -1,49 +1,49 @@ -import * as THREE from 'three'; - -import { app } from '../ApplicationServices/Application'; -import { Command } from '../Editor/CommandMachine'; - -/** - * 测试绘制对象的夹点. - * - * @export - * @class DrawGripStretch - * @implements {Command} - */ -export class DrawGripStretch implements Command -{ - async exec() - { - if (app.m_Viewer.m_OutlinePass.selectedObjects.length === 0) - { - app.m_Editor.m_CommandStore.Prompt("未选择对象:"); - return; - } - - let geometry = new THREE.Geometry(); - - let material = new THREE.PointsMaterial({ - size: 15, - color: 0x001dfa, - sizeAttenuation: false - - }); - - - for (let en of app.m_Viewer.m_OutlinePass.selectedObjects) - { - if (en instanceof THREE.Mesh || en instanceof THREE.Line) - { - if (en.geometry instanceof THREE.Geometry) - { - for (let p of en.geometry.vertices) - { - geometry.vertices.push(p.clone().applyMatrix4(en.matrix)); - } - } - } - let pts = new THREE.Points(geometry, material); - app.m_Viewer.Scene.add(pts); - } - } -} +import * as THREE from 'three'; + +import { app } from '../ApplicationServices/Application'; +import { Command } from '../Editor/CommandMachine'; + +/** + * 测试绘制对象的夹点. + * + * @export + * @class DrawGripStretch + * @implements {Command} + */ +export class DrawGripStretch implements Command +{ + async exec() + { + if (app.m_Viewer.m_OutlinePass.selectedObjects.length === 0) + { + app.m_Editor.Prompt("未选择对象:"); + return; + } + + let geometry = new THREE.Geometry(); + + let material = new THREE.PointsMaterial({ + size: 15, + color: 0x001dfa, + sizeAttenuation: false + + }); + + + for (let en of app.m_Viewer.m_OutlinePass.selectedObjects) + { + if (en instanceof THREE.Mesh || en instanceof THREE.Line) + { + if (en.geometry instanceof THREE.Geometry) + { + for (let p of en.geometry.vertices) + { + geometry.vertices.push(p.clone().applyMatrix4(en.matrix)); + } + } + } + let pts = new THREE.Points(geometry, material); + app.m_Viewer.Scene.add(pts); + } + } +} diff --git a/src/Add-on/DrawSpline.ts b/src/Add-on/DrawSpline.ts index e05d65e92..bd4347172 100644 --- a/src/Add-on/DrawSpline.ts +++ b/src/Add-on/DrawSpline.ts @@ -9,7 +9,7 @@ export class DrawSpline implements Command { async exec() { - app.m_Editor.m_CommandStore.Prompt("请输入一个点:"); + app.m_Editor.Prompt("请输入一个点:"); let ptRes = await app.m_Editor.GetPoint({ Msg: "请输入第一个点:" }); if (ptRes.Status != PromptStatus.OK) return; @@ -27,7 +27,7 @@ export class DrawSpline implements Command { app.m_Database.ModelSpace.Append(spline); } - app.m_Editor.m_CommandStore.Prompt("请输入点2:"); + app.m_Editor.Prompt("请输入点2:"); ptRes = await app.m_Editor.GetPoint({ Msg: "请输入点2:", BasePoint: ptLast, diff --git a/src/Add-on/Explode.ts b/src/Add-on/Explode.ts index a8531ca1f..4fdba2367 100644 --- a/src/Add-on/Explode.ts +++ b/src/Add-on/Explode.ts @@ -18,7 +18,7 @@ export class Command_Explode implements Command { if (en instanceof Line || en instanceof Arc || en instanceof Circle) { - app.m_Editor.m_CommandStore.Prompt('无法分解'); + app.m_Editor.Prompt('无法分解'); continue; } let ens = en.Explode(); diff --git a/src/Add-on/Fillet.ts b/src/Add-on/Fillet.ts index d95a7d513..822a2979c 100644 --- a/src/Add-on/Fillet.ts +++ b/src/Add-on/Fillet.ts @@ -60,14 +60,14 @@ export class CommandFillet implements Command let arcP1 = new_cu1.GetClosestPointTo(center, true); if (!new_cu1.PtOnCurve(arcP1)) { - app.m_Editor.m_CommandStore.Prompt("半径过大"); + app.m_Editor.Prompt("半径过大"); return; } //圆弧点2 let arcP2 = new_cu2.GetClosestPointTo(center, true); if (!new_cu2.PtOnCurve(arcP2)) { - app.m_Editor.m_CommandStore.Prompt("半径过大"); + app.m_Editor.Prompt("半径过大"); return; } @@ -200,7 +200,7 @@ export class CommandFillet implements Command case PromptStatus.OK: if (enRes.Entity === oldCurve) { - app.m_Editor.m_CommandStore.Prompt("重复的对象!"); + app.m_Editor.Prompt("重复的对象!"); } else if (enRes.Entity && enRes.Entity instanceof Curve) { diff --git a/src/Add-on/OffsetX.ts b/src/Add-on/OffsetX.ts index 219d7c683..cec6cfad0 100644 --- a/src/Add-on/OffsetX.ts +++ b/src/Add-on/OffsetX.ts @@ -61,7 +61,7 @@ export class OffsetX implements Command if (step === 0) { - app.m_Editor.m_CommandStore.Prompt("步长不能为0,已经帮你转换成" + dis / 10); + app.m_Editor.Prompt("步长不能为0,已经帮你转换成" + dis / 10); step = dis / 10; } let count = dis / step; diff --git a/src/Add-on/PasteClip.ts b/src/Add-on/PasteClip.ts index 28e2a2899..748fa1652 100644 --- a/src/Add-on/PasteClip.ts +++ b/src/Add-on/PasteClip.ts @@ -52,7 +52,7 @@ export class PasteClip } catch (error) { - app.m_Editor.m_CommandStore.Prompt("黏贴遇到错误:" + error); + app.m_Editor.Prompt("黏贴遇到错误:" + error); } } diff --git a/src/Add-on/RevPl.ts b/src/Add-on/RevPl.ts index d5161e1dd..6f719dcab 100644 --- a/src/Add-on/RevPl.ts +++ b/src/Add-on/RevPl.ts @@ -14,7 +14,7 @@ export class Command_RevPl implements Command if (en instanceof Curve) { en.Reverse(); - app.m_Editor.m_CommandStore.Prompt("成功翻转曲线"); + app.m_Editor.Prompt("成功翻转曲线"); } } app.m_Editor.UpdateScreen(); diff --git a/src/Add-on/Rotate.ts b/src/Add-on/Rotate.ts index e37644044..2b5d00e60 100644 --- a/src/Add-on/Rotate.ts +++ b/src/Add-on/Rotate.ts @@ -15,7 +15,7 @@ export class Command_Rotate implements Command if (ss.Status != PromptStatus.OK) return; - app.m_Editor.m_CommandStore.Prompt("请输入第一个点:"); + app.m_Editor.Prompt("请输入第一个点:"); let ptRes = await app.m_Editor.GetPoint(); if (ptRes.Status != PromptStatus.OK) { return; } @@ -23,7 +23,7 @@ export class Command_Rotate implements Command let pt1 = ptRes.Value; let ucsInv = new Matrix4().getInverse(app.m_Editor.UCSMatrix); let pt1Ucs = pt1.clone().applyMatrix4(ucsInv); - app.m_Editor.m_CommandStore.Prompt("请输入第二个点:"); + app.m_Editor.Prompt("请输入第二个点:"); let enMap = new Map(); diff --git a/src/Add-on/Sweep.ts b/src/Add-on/Sweep.ts index 5126a36f5..b002cee00 100644 --- a/src/Add-on/Sweep.ts +++ b/src/Add-on/Sweep.ts @@ -18,7 +18,7 @@ export class Sweep implements Command return; if (!enRes.Entity.IsClose) { - app.m_Editor.m_CommandStore.Prompt("您选择的多段线没有闭合!"); + app.m_Editor.Prompt("您选择的多段线没有闭合!"); return; } } @@ -30,7 +30,7 @@ export class Sweep implements Command { if (!(enRes.Entity instanceof Curve)) { - app.m_Editor.m_CommandStore.Prompt("您选择的路径不是曲线!"); + app.m_Editor.Prompt("您选择的路径不是曲线!"); return; } diff --git a/src/Add-on/testEntity/test.ts b/src/Add-on/testEntity/test.ts index f1ba815cb..3dbe5f5e2 100644 --- a/src/Add-on/testEntity/test.ts +++ b/src/Add-on/testEntity/test.ts @@ -15,7 +15,7 @@ export class Test implements Command { constructor() { - app.m_Editor.m_CommandStore.Prompt("载入成功!"); + app.m_Editor.Prompt("载入成功!"); } async exec() { diff --git a/src/Common/Utils.ts b/src/Common/Utils.ts index c42df297d..1eb66042b 100644 --- a/src/Common/Utils.ts +++ b/src/Common/Utils.ts @@ -1,7 +1,7 @@ export async function log(msg) { let app = (await import("../ApplicationServices/Application")).app; - app.m_Editor.m_CommandStore.Prompt(msg); + app.m_Editor.Prompt(msg); } export function IsNumber(keyCode: number) diff --git a/src/Editor/CommandMachine.ts b/src/Editor/CommandMachine.ts index e4d7cfa38..440d2dadf 100644 --- a/src/Editor/CommandMachine.ts +++ b/src/Editor/CommandMachine.ts @@ -15,10 +15,10 @@ export class CommandMachine { if (this.m_CommandIng) { - app.m_Editor.m_CommandStore.Prompt('系统正忙!'); + app.m_Editor.Prompt('系统正忙!'); return; } - app.m_Editor.m_CommandStore.Prompt(cmdName); + app.m_Editor.Prompt(cmdName); if (this.m_CommandList.has(cmdName)) { if (cmdName !== "SAVE") @@ -37,14 +37,14 @@ export class CommandMachine } catch (error) { - app.m_Editor.m_CommandStore.Prompt("抱歉,命令造成了错误,请联系开发人员."); + app.m_Editor.Prompt("抱歉,命令造成了错误,请联系开发人员."); console.error(error); } this.CommandEnd(cmdName, abort); } else { - app.m_Editor.m_CommandStore.Prompt('输入命令有误'); + app.m_Editor.Prompt('输入命令有误'); this.CommandEnd(cmdName); } } diff --git a/src/Editor/GetPointServices.ts b/src/Editor/GetPointServices.ts index 3cb5133c8..6dfbd46fd 100644 --- a/src/Editor/GetPointServices.ts +++ b/src/Editor/GetPointServices.ts @@ -131,7 +131,7 @@ export class GetPointServices implements EditorService } catch (error) { - app.m_Editor.m_CommandStore.Prompt("动态拾取点回调错误!"); + app.m_Editor.Prompt("动态拾取点回调错误!"); console.log(error); } app.m_Editor.UpdateScreen(); @@ -239,7 +239,7 @@ export class GetPointServices implements EditorService if (prompt.Msg) { app.m_Editor.m_CommandStore.commandPrompt = prompt.Msg; - // app.m_Editor.m_CommandStore.Prompt(prompt.Msg); + // app.m_Editor.Prompt(prompt.Msg); this.removeCalls.push(() => { app.m_Editor.m_CommandStore.commandPrompt = ""; diff --git a/src/Editor/SnapDragServices.ts b/src/Editor/SnapDragServices.ts index 009b690ef..a3283e493 100644 --- a/src/Editor/SnapDragServices.ts +++ b/src/Editor/SnapDragServices.ts @@ -49,7 +49,7 @@ export class SnapDragServices implements EditorService this.DestroyPreLine(); app.m_Viewer.m_bNeedUpdate = true; - app.m_Editor.m_CommandStore.Prompt("拽拖开始:"); + app.m_Editor.Prompt("拽拖开始:"); app.m_Editor.m_CommandStore.isCmdIng = true; app.m_Database.hm.StartCmd("drag");