Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop
This commit is contained in:
commit
6e80d2da85
@ -199,7 +199,9 @@ class DragMoveAbsorbablePoint extends AbsorbablePoint {
|
|||||||
pointC: [C],
|
pointC: [C],
|
||||||
} = dragTarget.datas;
|
} = dragTarget.datas;
|
||||||
this.moveTarget = {
|
this.moveTarget = {
|
||||||
position: dragTarget.getGlobalPosition(),
|
position: dragTarget
|
||||||
|
.getGraphicApp()
|
||||||
|
.toCanvasCoordinates(dragTarget.getGlobalPosition()),
|
||||||
portPos: [
|
portPos: [
|
||||||
dragTarget.localToCanvasPoint(A),
|
dragTarget.localToCanvasPoint(A),
|
||||||
dragTarget.localToCanvasPoint(B),
|
dragTarget.localToCanvasPoint(B),
|
||||||
@ -234,7 +236,9 @@ class DragMoveAbsorbablePoint extends AbsorbablePoint {
|
|||||||
} else {
|
} else {
|
||||||
if (this.moveTarget == undefined) {
|
if (this.moveTarget == undefined) {
|
||||||
this.moveTarget = {
|
this.moveTarget = {
|
||||||
position: dragTarget.getGlobalPosition(),
|
position: dragTarget
|
||||||
|
.getGraphicApp()
|
||||||
|
.toCanvasCoordinates(dragTarget.getGlobalPosition()),
|
||||||
portPos: [
|
portPos: [
|
||||||
dragTarget.localToCanvasPoint(dragTarget.getStartPoint()),
|
dragTarget.localToCanvasPoint(dragTarget.getStartPoint()),
|
||||||
dragTarget.localToCanvasPoint(dragTarget.getEndPoint()),
|
dragTarget.localToCanvasPoint(dragTarget.getEndPoint()),
|
||||||
@ -443,6 +447,9 @@ export class TurnoutPointsInteractionPlugin extends GraphicInteractionPlugin<Tur
|
|||||||
tep = new TurnoutEditPlugin(turnout, { onEditPointCreate });
|
tep = new TurnoutEditPlugin(turnout, { onEditPointCreate });
|
||||||
turnout.addAssistantAppend(tep);
|
turnout.addAssistantAppend(tep);
|
||||||
}
|
}
|
||||||
|
tep.editPoints = [[], [], []];
|
||||||
|
tep.removeChildren();
|
||||||
|
tep.initEditPoints();
|
||||||
//tep.reset();
|
//tep.reset();
|
||||||
tep.showAll();
|
tep.showAll();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user