diff --git a/src/graphics/sectionLink/SectionLinkDrawAssistant.ts b/src/graphics/sectionLink/SectionLinkDrawAssistant.ts index a560e6c..b21e671 100644 --- a/src/graphics/sectionLink/SectionLinkDrawAssistant.ts +++ b/src/graphics/sectionLink/SectionLinkDrawAssistant.ts @@ -83,9 +83,8 @@ export class SectionLinkDraw extends GraphicDrawAssistant< points.push(section.localToCanvasPoint(p)); }); sectionLink.datas.points = points; - const DeviceType = graphicData.SimpleRef.DeviceType; - const refAxle1 = this.buildSimpleRef(axle1.id, DeviceType.AxleCounting); - const refAxle2 = this.buildSimpleRef(axle2.id, DeviceType.AxleCounting); + const refAxle1 = this.buildSimpleRef(axle1.id, srDeviceType.AxleCounting); + const refAxle2 = this.buildSimpleRef(axle2.id, srDeviceType.AxleCounting); /** * 判断link AB端 A端一定在左侧(根据计轴关联区段判断区段AB端是否倒序) */ @@ -123,17 +122,11 @@ export class SectionLinkDraw extends GraphicDrawAssistant< const points: IPointData[] = [forkP]; const refTurnout = this.buildRelatedRef( turnout.id, - graphicData.RelatedRef.DeviceType.Turnout, + rrDeviceType.Turnout, port ); - const refSimTurnout = this.buildSimpleRef( - turnout.id, - graphicData.SimpleRef.DeviceType.Turnout - ); - const refAxle = this.buildSimpleRef( - axle.id, - graphicData.SimpleRef.DeviceType.AxleCounting - ); + const refSimTurnout = this.buildSimpleRef(turnout.id, srDeviceType.Turnout); + const refAxle = this.buildSimpleRef(axle.id, srDeviceType.AxleCounting); if (port === rrDevicePort.A) { turnout.datas.pointA.forEach((p) => { points.push(turnout.localToCanvasPoint(p)); @@ -272,8 +265,6 @@ export class SectionLinkDraw extends GraphicDrawAssistant< } /**构建link之间的关联关系 */ buildLinkRef(map: Map) { - const DeviceType = graphicData.RelatedRef.DeviceType; - const DevicePort = graphicData.RelatedRef.DevicePort; map.forEach((value) => { if (value.length === 2) { const link1 = this.app.queryStore.queryById(value[0]) as SectionLink; @@ -281,46 +272,46 @@ export class SectionLinkDraw extends GraphicDrawAssistant< if (link1.datas.aSimRef.id === link2.datas.bSimRef.id) { link1.datas.aRef = this.buildRelatedRef( link2.id, - DeviceType.SectionLink, - DevicePort.B + rrDeviceType.SectionLink, + rrDevicePort.B ); link2.datas.bRef = this.buildRelatedRef( link1.id, - DeviceType.SectionLink, - DevicePort.A + rrDeviceType.SectionLink, + rrDevicePort.A ); } else if (link1.datas.bSimRef.id === link2.datas.aSimRef.id) { link1.datas.bRef = this.buildRelatedRef( link2.id, - DeviceType.SectionLink, - DevicePort.A + rrDeviceType.SectionLink, + rrDevicePort.A ); link2.datas.aRef = this.buildRelatedRef( link1.id, - DeviceType.SectionLink, - DevicePort.B + rrDeviceType.SectionLink, + rrDevicePort.B ); } else if (link1.datas.aSimRef.id === link2.datas.aSimRef.id) { link1.datas.aRef = this.buildRelatedRef( link2.id, - DeviceType.SectionLink, - DevicePort.A + rrDeviceType.SectionLink, + rrDevicePort.A ); link2.datas.aRef = this.buildRelatedRef( link1.id, - DeviceType.SectionLink, - DevicePort.A + rrDeviceType.SectionLink, + rrDevicePort.A ); } else if (link1.datas.bSimRef.id === link2.datas.bSimRef.id) { link1.datas.bRef = this.buildRelatedRef( link2.id, - DeviceType.SectionLink, - DevicePort.B + rrDeviceType.SectionLink, + rrDevicePort.B ); link2.datas.bRef = this.buildRelatedRef( link1.id, - DeviceType.SectionLink, - DevicePort.B + rrDeviceType.SectionLink, + rrDevicePort.B ); } else { throw new Error('构建link关联关系错误!');