From 3fe0040f9ee5a22a257967d0e0daf37035e322af Mon Sep 17 00:00:00 2001 From: Zoe Date: Fri, 3 Aug 2018 15:03:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20#ILSUB=20=E7=94=BB=E6=9D=BF=E6=97=B6?= =?UTF-8?q?=E7=94=A8Jig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawBoard/DrawLeftRightBoard.ts | 23 +++++++++++----------- src/Add-on/DrawBoard/DrawSingleBoard.ts | 14 +++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts index 8da25db31..0d873fb3b 100644 --- a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts +++ b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts @@ -8,6 +8,7 @@ import { MoveMatrix } from '../../Geometry/GeUtils'; import { BoardModal, BoardModalType } from '../../UI/Components/Board/BoardModal'; import { ModalPosition } from '../../UI/Components/Modal/ModalsManage'; import { SideBoardStore } from '../../UI/Store/BoardStore'; +import { Jig } from '../../Editor/Jig'; export class DrawLeftRight implements Command @@ -26,28 +27,26 @@ export class DrawLeftRight implements Command let thickness = parseFloat(data.thickness); let spacing = parseFloat(data.spaceSize); - let leftBarod = Board.CreateBoard(lenght, width, thickness, BoardType.Vertical) - let rightBoard = Board.CreateBoard(lenght, width, thickness, BoardType.Vertical); + let leftBoard = Jig.Draw(Board.CreateBoard(lenght, width, thickness, BoardType.Vertical)); + let rightBoard = Jig.Draw(Board.CreateBoard(lenght, width, thickness, BoardType.Vertical)); rightBoard.ApplyMatrix(MoveMatrix(new Vector3(spacing - thickness))); - app.m_Database.ModelSpace.Append(leftBarod); - app.m_Database.ModelSpace.Append(rightBoard); - let ptRes = await app.m_Editor.GetPoint({ Msg: "请拾取基点:", Callback: (v) => { - let currentPt = leftBarod.Position; - let vec = v.clone().sub(currentPt); - - leftBarod.ApplyMatrix(MoveMatrix(vec)); + let vec = v.clone().sub(leftBoard.Position); + leftBoard.ApplyMatrix(MoveMatrix(vec)); rightBoard.ApplyMatrix(MoveMatrix(vec)) } }); - if (ptRes.Status === PromptStatus.Cancel) + + Jig.End(); + + if (ptRes.Status === PromptStatus.OK) { - rightBoard.Erase(); - leftBarod.Erase(); + app.m_Database.ModelSpace.Append(leftBoard); + app.m_Database.ModelSpace.Append(rightBoard); } } } diff --git a/src/Add-on/DrawBoard/DrawSingleBoard.ts b/src/Add-on/DrawBoard/DrawSingleBoard.ts index c1add3d2c..9ccf91292 100644 --- a/src/Add-on/DrawBoard/DrawSingleBoard.ts +++ b/src/Add-on/DrawBoard/DrawSingleBoard.ts @@ -7,6 +7,7 @@ import { MoveMatrix } from '../../Geometry/GeUtils'; import { BoardModal, BoardModalType } from '../../UI/Components/Board/BoardModal'; import { ModalPosition } from '../../UI/Components/Modal/ModalsManage'; import { SingleBoardStore } from '../../UI/Store/BoardStore'; +import { Jig } from '../../Editor/Jig'; export class DrawSingleBoard implements Command { @@ -18,21 +19,22 @@ export class DrawSingleBoard implements Command app.m_Editor.m_ModalManage.Callback = async () => { let opt = store.m_BoardOption; - let board = Board.CreateBoard(parseFloat(opt.height), parseFloat(opt.width), parseFloat(opt.thickness), opt.type); - app.m_Database.ModelSpace.Append(board); + let board = Jig.Draw(Board.CreateBoard(parseFloat(opt.height), parseFloat(opt.width), parseFloat(opt.thickness), opt.type)); let ptRes = await app.m_Editor.GetPoint({ Msg: "选择基点", Callback: v => { - let oldPt = board.Position; - let vec = v.clone().sub(oldPt); + let vec = v.clone().sub(board.Position); board.ApplyMatrix(MoveMatrix(vec)); } }); - if (ptRes.Status === PromptStatus.Cancel) + + Jig.End(); + + if (ptRes.Status === PromptStatus.OK) { - board.Erase(); + app.m_Database.ModelSpace.Append(board); } } }