From 1afcff607178f49a9ffe1a50f44d0a679bbde7c1 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 28 Mar 2024 10:04:31 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit e964b8bf2729ae9238f2b6a14aa2a95d3bde5eda Author: joylink_zhaoerwei Date: Thu Mar 28 09:58:05 2024 +0800 道岔编辑修改 commit dcd7f3322cf4253ae173184ffacecb42e4bc7518 Author: joylink_fanyuhong <18706759286@163.com> Date: Thu Mar 28 09:22:06 2024 +0800 防淹门调整 commit 7d2a1be457430ee0d18830eaf8a4abf5b9ec864c Author: joylink_fanyuhong <18706759286@163.com> Date: Thu Mar 28 09:18:23 2024 +0800 车库门调整暂提 commit 3fb3eb8135b5d11a6bbffb45c444d8fde53b42f0 Merge: d9b5841 5210c9d Author: joylink_fanyuhong <18706759286@163.com> Date: Wed Mar 27 17:20:34 2024 +0800 Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop commit d9b5841cfbb0270f7fc65b402e535fb2bc1875b3 Author: joylink_fanyuhong <18706759286@163.com> Date: Wed Mar 27 17:20:17 2024 +0800 车库门状态显示调整 commit 5210c9d9cd3ebb92f25f6d9aa420cdd676d314ab Author: joylink_zhaoerwei Date: Wed Mar 27 17:04:26 2024 +0800 屏蔽门右键bug --- src/graphics/turnout/TurnoutDrawAssistant.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/graphics/turnout/TurnoutDrawAssistant.ts b/src/graphics/turnout/TurnoutDrawAssistant.ts index 2c2e228..6cba510 100644 --- a/src/graphics/turnout/TurnoutDrawAssistant.ts +++ b/src/graphics/turnout/TurnoutDrawAssistant.ts @@ -199,7 +199,9 @@ class DragMoveAbsorbablePoint extends AbsorbablePoint { pointC: [C], } = dragTarget.datas; this.moveTarget = { - position: dragTarget.getGlobalPosition(), + position: dragTarget + .getGraphicApp() + .toCanvasCoordinates(dragTarget.getGlobalPosition()), portPos: [ dragTarget.localToCanvasPoint(A), dragTarget.localToCanvasPoint(B), @@ -234,7 +236,9 @@ class DragMoveAbsorbablePoint extends AbsorbablePoint { } else { if (this.moveTarget == undefined) { this.moveTarget = { - position: dragTarget.getGlobalPosition(), + position: dragTarget + .getGraphicApp() + .toCanvasCoordinates(dragTarget.getGlobalPosition()), portPos: [ dragTarget.localToCanvasPoint(dragTarget.getStartPoint()), dragTarget.localToCanvasPoint(dragTarget.getEndPoint()), @@ -443,6 +447,9 @@ export class TurnoutPointsInteractionPlugin extends GraphicInteractionPlugin