diff --git a/src/components/draw-app/properties/SignalProperty.vue b/src/components/draw-app/properties/SignalProperty.vue index 364be53..30f4a6a 100644 --- a/src/components/draw-app/properties/SignalProperty.vue +++ b/src/components/draw-app/properties/SignalProperty.vue @@ -37,6 +37,7 @@ style="margin-top: 10px" v-model="refDevData.deviceType" :options="DeviceTypeOptions" + :readonly="true" :map-options="true" :emit-value="true" @update:model-value="onUpdate" @@ -47,6 +48,7 @@ v-if="refDevData.deviceType === graphicData.RelatedRef.DeviceType.Section" style="margin-top: 10px" v-model="refDevData.id" + :readonly="true" :options="sectionList" :map-options="true" :emit-value="true" @@ -59,6 +61,7 @@ style="margin-top: 10px" v-model="refDevData.id" :options="turnoutList" + :readonly="true" :map-options="true" :emit-value="true" @update:model-value="onUpdate" @@ -70,6 +73,7 @@ style="margin-top: 10px" v-model="refDevData.devicePort" :options="DevicePortOptions" + :readonly="true" :map-options="true" :emit-value="true" @update:model-value="onUpdate" @@ -127,6 +131,10 @@ function initRefData(signal: Signal) { refDevData.id = signalModel.refDev.id; refDevData.devicePort = signalModel.refDev.devicePort; refDevData.deviceType = signalModel.refDev.deviceType; + } else { + refDevData.id = ''; + refDevData.deviceType = graphicData.RelatedRef.DeviceType.Section; + refDevData.devicePort = graphicData.RelatedRef.DevicePort.A; } } function initDeviceList() { diff --git a/src/components/draw-app/properties/SlopeProperty.vue b/src/components/draw-app/properties/SlopeProperty.vue index f65a275..9ba86b5 100644 --- a/src/components/draw-app/properties/SlopeProperty.vue +++ b/src/components/draw-app/properties/SlopeProperty.vue @@ -7,26 +7,29 @@ label="坡度长度" type="textarea" @blur="onUpdate" - v-model="slopeModel.slopeLong" + v-model="slopeLong" + lazy-rules + autogrow + /> + - @@ -57,18 +60,8 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'; const drawStore = useDrawStore(); const slopeModel = reactive(new SlopeData()); -const direction = ref(''); -const optionsDirection = ['上坡', '下坡', '无坡度']; -enum showSelect { - 上坡 = 'up', - 下坡 = 'down', - 无坡度 = 'none', -} -enum showSelectData { - up = '上坡', - down = '下坡', - none = '无坡度', -} +const direction = ref('无坡度'); +const slopeLong = ref(0); drawStore.$subscribe; watch( @@ -76,7 +69,9 @@ watch( (val) => { if (val && val.type == Slope.Type) { slopeModel.copyFrom(val.saveData() as SlopeData); - direction.value = (showSelectData as never)[slopeModel.slopeDirection]; + if (slopeModel.slopeNumber !== 0) { + direction.value = slopeModel.slopeNumber > 0 ? '上坡' : '下坡'; + } } } ); @@ -85,12 +80,14 @@ onMounted(() => { const slope = drawStore.selectedGraphic as Slope; if (slope) { slopeModel.copyFrom(slope.saveData()); - direction.value = (showSelectData as never)[slopeModel.slopeDirection]; + if (slopeModel.slopeNumber !== 0) { + direction.value = slopeModel.slopeNumber > 0 ? '上坡' : '下坡'; + } + slopeLong.value = +slopeModel.refDeviceId[1]; } }); function onUpdate() { - slopeModel.slopeDirection = (showSelect as never)[direction.value]; const slope = drawStore.selectedGraphic as Slope; if (slope) { drawStore.getDrawApp().updateGraphicAndRecord(slope, slopeModel); diff --git a/src/components/draw-app/properties/StopPositionProperty.vue b/src/components/draw-app/properties/StopPositionProperty.vue index 6317a02..245620e 100644 --- a/src/components/draw-app/properties/StopPositionProperty.vue +++ b/src/components/draw-app/properties/StopPositionProperty.vue @@ -48,6 +48,7 @@ v-model="refDevData.id" :options="sectionList" :map-options="true" + :readonly="true" :emit-value="true" @update:model-value="onUpdate" label="关联设备" @@ -120,6 +121,8 @@ function initRefData(stopPosition: StopPosition) { } if (stopPositionModel.refDev) { refDevData.id = stopPositionModel.refDev.id; + } else { + refDevData.id = ''; } } diff --git a/src/components/draw-app/properties/TransponderProperty.vue b/src/components/draw-app/properties/TransponderProperty.vue index cac2d44..616d910 100644 --- a/src/components/draw-app/properties/TransponderProperty.vue +++ b/src/components/draw-app/properties/TransponderProperty.vue @@ -49,17 +49,43 @@ @update:model-value="onUpdate" label="应答器类型" > + + + + + + diff --git a/src/drawApp/graphics/GraphicDataBase.ts b/src/drawApp/graphics/GraphicDataBase.ts index f5de800..5256f8f 100644 --- a/src/drawApp/graphics/GraphicDataBase.ts +++ b/src/drawApp/graphics/GraphicDataBase.ts @@ -48,7 +48,7 @@ export function toStorageTransform( export interface IProtoGraphicData extends pb_1.Message { common: ICommonInfo; - code: string; + code?: string; } export abstract class GraphicDataBase implements GraphicData { diff --git a/src/drawApp/graphics/SlopeInteraction.ts b/src/drawApp/graphics/SlopeInteraction.ts index f253f85..472b050 100644 --- a/src/drawApp/graphics/SlopeInteraction.ts +++ b/src/drawApp/graphics/SlopeInteraction.ts @@ -19,12 +19,6 @@ export class SlopeData extends GraphicDataBase implements ISlopeData { public get data(): graphicData.Slope { return this.getData(); } - get code(): string { - return this.data.code; - } - set code(v: string) { - this.data.code = v; - } get points(): IPointData[] { return this.data.points; } @@ -33,24 +27,12 @@ export class SlopeData extends GraphicDataBase implements ISlopeData { (p) => new graphicData.Point({ x: p.x, y: p.y }) ); } - get slopeNumber(): string { + get slopeNumber(): number { return this.data.slopeNumber; } - set slopeNumber(v: string) { + set slopeNumber(v: number) { this.data.slopeNumber = v; } - get slopeDirection(): string { - return this.data.slopeDirection; - } - set slopeDirection(v: string) { - this.data.slopeDirection = v; - } - get slopeLong(): number { - return this.data.slopeLong; - } - set slopeLong(v: number) { - this.data.slopeLong = v; - } get refDeviceId(): string[] { return this.data.refDeviceId; } diff --git a/src/drawApp/graphics/TransponderInteraction.ts b/src/drawApp/graphics/TransponderInteraction.ts index 0ea7f03..e0f3c3f 100644 --- a/src/drawApp/graphics/TransponderInteraction.ts +++ b/src/drawApp/graphics/TransponderInteraction.ts @@ -50,6 +50,12 @@ export class TransponderData set kilometerSystem(v: KilometerSystem) { this.data.kilometerSystem = new graphicData.KilometerSystem(v); } + get TransponderRef(): graphicData.RelatedRef { + return this.data.TransponderRef; + } + set TransponderRef(v: graphicData.RelatedRef) { + this.data.TransponderRef = v; + } clone(): TransponderData { return new TransponderData(this.data.cloneMessage()); } diff --git a/src/graphics/separator/SeparatorDrawAssistant.ts b/src/graphics/separator/SeparatorDrawAssistant.ts index 54482cd..3413514 100644 --- a/src/graphics/separator/SeparatorDrawAssistant.ts +++ b/src/graphics/separator/SeparatorDrawAssistant.ts @@ -6,13 +6,12 @@ import { GraphicRelationParam, JlDrawApp, JlGraphic, - linePoint, + pointBox, } from 'src/jl-graphic'; import { Section, SectionType } from '../section/Section'; import { ISeparatorData, Separator, - SeparatorConsts, SeparatorTemplate, separatorTypeEnum, } from './Separator'; @@ -208,32 +207,8 @@ export class SeparatorGraphicHitArea implements IHitArea { contains(x: number, y: number): boolean { let contains = false; const p = new Point(x, y); - const typeArr = ['section', 'turnout']; - const endTypeArr = ['endA', 'endB']; - let d = SeparatorConsts.radius; - if (typeArr.includes(this.separator.datas.separatorType)) { - const tolerance = SeparatorConsts.lineWidth; - const p1 = new Point(0, -SeparatorConsts.height / 2); - const p2 = new Point(0, SeparatorConsts.height / 2); - contains = contains || linePoint(p1, p2, p, tolerance); - return contains; - } else if (endTypeArr.includes(this.separator.datas.separatorType)) { - if (this.separator.datas.separatorType == 'endB') { - d = -d; - } - const tolerance = SeparatorConsts.lineWidth; - const p1 = new Point(0, 0); - const p2 = new Point(-d, 0); - const p3 = new Point(-d, -d); - const p4 = new Point(-d * 3, -d); - const p5 = new Point(-d, d); - const p6 = new Point(-d * 3, d); - contains = contains || linePoint(p1, p2, p, tolerance); - contains = contains || linePoint(p2, p3, p, tolerance); - contains = contains || linePoint(p3, p4, p, tolerance); - contains = contains || linePoint(p2, p5, p, tolerance); - contains = contains || linePoint(p5, p6, p, tolerance); - } + const r = this.separator.getLocalBounds(); + contains = pointBox(p, r); return contains; } } diff --git a/src/graphics/signal/Signal.ts b/src/graphics/signal/Signal.ts index 98decde..61f05d2 100644 --- a/src/graphics/signal/Signal.ts +++ b/src/graphics/signal/Signal.ts @@ -1,14 +1,23 @@ import { Graphics, Point } from 'pixi.js'; import { + calculateDistanceFromPointToLine, + calculateFootPointFromPointToLine, GraphicData, GraphicState, + isPointOnLine, JlGraphic, JlGraphicTemplate, } from 'src/jl-graphic'; import { calculateMirrorPoint } from 'src/jl-graphic'; import { LampMainBody } from './LampMainBody'; -import { drawArrow, IRelatedRefData } from '../CommonGraphics'; +import { + drawArrow, + IRelatedRefData, + createRelatedRefProto, +} from '../CommonGraphics'; import { SignalCode } from './SignalCode'; +import { Section, SectionPort } from '../section/Section'; +import { Turnout, TurnoutPort } from '../turnout/Turnout'; export enum Direction { LEFT = 0, @@ -205,6 +214,91 @@ export class Signal extends JlGraphic { } this.humanControl.endFill(); } + + buildRelation() { + const sections = this.queryStore.queryByType
(Section.Type); + const turnouts = this.queryStore.queryByType(Turnout.Type); + let deviceId = ''; + let deviceType = ''; + let minD = Number.MAX_SAFE_INTEGER; + let port: SectionPort | TurnoutPort = SectionPort.A; + sections.forEach((sec: Section) => { + for (let i = 0; i < sec.datas.points.length - 1; i++) { + const d = calculateDistanceFromPointToLine( + sec.localToCanvasPoint(sec.datas.points[i]), + sec.localToCanvasPoint(sec.datas.points[i + 1]), + this.position + ); + const p = calculateFootPointFromPointToLine( + sec.localToCanvasPoint(sec.datas.points[i]), + sec.localToCanvasPoint(sec.datas.points[i + 1]), + this.position + ); + const onLine = isPointOnLine( + sec.localToCanvasPoint(sec.datas.points[i]), + sec.localToCanvasPoint(sec.datas.points[i + 1]), + p + ); + if (onLine && d < minD) { + minD = d; + deviceId = sec.id; + deviceType = sec.type; + port = SectionPort.A; + } + } + }); + + turnouts.forEach((turnout: Turnout) => { + for (let i = 0; i < turnout.datas.pointA.length; i++) { + const p1 = turnout.localToCanvasPoint( + i === 0 ? new Point(0, 0) : turnout.datas.pointA[i - 1] + ); + const p2 = turnout.localToCanvasPoint(turnout.datas.pointA[i]); + const d = calculateDistanceFromPointToLine(p1, p2, this.position); + const p = calculateFootPointFromPointToLine(p1, p2, this.position); + const onLine = isPointOnLine(p1, p2, p); + if (onLine && d < minD) { + minD = d; + deviceId = turnout.id; + deviceType = turnout.type; + port = TurnoutPort.A; + } + } + for (let i = 0; i < turnout.datas.pointB.length; i++) { + const p1 = turnout.localToCanvasPoint( + i === 0 ? new Point(0, 0) : turnout.datas.pointB[i - 1] + ); + const p2 = turnout.localToCanvasPoint(turnout.datas.pointB[i]); + const d = calculateDistanceFromPointToLine(p1, p2, this.position); + const p = calculateFootPointFromPointToLine(p1, p2, this.position); + const onLine = isPointOnLine(p1, p2, p); + if (onLine && d < minD) { + minD = d; + deviceId = turnout.id; + deviceType = turnout.type; + port = TurnoutPort.B; + } + } + for (let i = 0; i < turnout.datas.pointC.length; i++) { + const p1 = turnout.localToCanvasPoint( + i === 0 ? new Point(0, 0) : turnout.datas.pointC[i - 1] + ); + const p2 = turnout.localToCanvasPoint(turnout.datas.pointC[i]); + const d = calculateDistanceFromPointToLine(p1, p2, this.position); + const p = calculateFootPointFromPointToLine(p1, p2, this.position); + const onLine = isPointOnLine(p1, p2, p); + if (onLine && d < minD) { + minD = d; + deviceId = turnout.id; + deviceType = turnout.type; + port = TurnoutPort.C; + } + } + }); + if (deviceId) { + this.datas.refDev = createRelatedRefProto(deviceType, deviceId, port); + } + } } export class SignalTemplate extends JlGraphicTemplate { diff --git a/src/graphics/slope/Slope.ts b/src/graphics/slope/Slope.ts index b566dcb..3d22e23 100644 --- a/src/graphics/slope/Slope.ts +++ b/src/graphics/slope/Slope.ts @@ -6,25 +6,12 @@ import { VectorText, calculateLineMidpoint, } from 'src/jl-graphic'; - -export interface ITurnoutPosRefData { - get id(): string; //道岔的ID - set id(v: string); - get position(): number; //道岔的正反为，0是正位，1是反位 - set position(v: number); -} - +import { SlopeKiloMarker } from '../slopeKiloMarker/SlopeKiloMarker'; export interface ISlopeData extends GraphicData { - get code(): string; // 名称 - set code(v: string); get points(): IPointData[]; // 线坐标点 set points(points: IPointData[]); - get slopeNumber(): string; // 坡度的值 - set slopeNumber(v: string); - get slopeDirection(): string; //坡度方向 有三种，无坡度--上坡--下坡 - set slopeDirection(v: string); - get slopeLong(): number; //该坡度的长度--两端公里标的差值 - set slopeLong(v: number); + get slopeNumber(): number; // 坡度的值 + set slopeNumber(v: number); get refDeviceId(): string[]; // 坡度关联的设备id set refDeviceId(v: string[]); clone(): ISlopeData; @@ -35,7 +22,7 @@ export interface ISlopeData extends GraphicData { export const SlopeConsts = { lineColor: '0xffffff', lineWidth: 2, - height: 40, + height: 100, }; export class Slope extends JlGraphic { @@ -73,13 +60,11 @@ export class Slope extends JlGraphic { this.lineGraphic.clear(); this.lineGraphic.lineStyle(SlopeConsts.lineWidth, SlopeConsts.lineColor); let distanceY = 0; - switch (this.datas.slopeDirection) { - case 'up': - distanceY = -SlopeConsts.height / 2; - break; - case 'down': - distanceY = SlopeConsts.height / 2; - break; + if (this.datas.slopeNumber !== 0) { + distanceY = + this.datas.slopeNumber > 0 + ? -SlopeConsts.height / 2 + : SlopeConsts.height / 2; } this.datas.points.forEach((p, i) => { if (i !== 0) { @@ -89,7 +74,7 @@ export class Slope extends JlGraphic { } }); //坡度值 - this.slopeNumber.text = this.datas.slopeNumber; + this.slopeNumber.text = parseFloat(this.datas.slopeNumber / 1000 + ''); const slopeNumberPosition = this.datas.childTransforms?.find( (t) => t.name === this.slopeNumber.name )?.transform.position; @@ -106,7 +91,15 @@ export class Slope extends JlGraphic { this.slopeNumber.position.set(centerPos.x, centerPos.y - 15); } //坡度长度 - this.slopeLong.text = this.datas.slopeLong; + const slopeKiloMarkerL = this.queryStore.queryById( + this.datas.refDeviceId[0] + ) as SlopeKiloMarker; + const slopeKiloMarkerR = this.queryStore.queryById( + this.datas.refDeviceId[1] + ) as SlopeKiloMarker; + this.slopeLong.text = + slopeKiloMarkerR.datas.kilometerSystem.kilometer - + slopeKiloMarkerL.datas.kilometerSystem.kilometer; const slopeLongPosition = this.datas.childTransforms?.find( (t) => t.name === this.slopeLong.name )?.transform.position; diff --git a/src/graphics/slope/SlopeAssistant.ts b/src/graphics/slope/SlopeAssistant.ts index 6c46148..93e7891 100644 --- a/src/graphics/slope/SlopeAssistant.ts +++ b/src/graphics/slope/SlopeAssistant.ts @@ -9,7 +9,7 @@ import { } from 'src/jl-graphic'; import { ISlopeData, Slope, SlopeTemplate, SlopeConsts } from './Slope'; -import { AxleCounting } from '../axleCounting/AxleCounting'; +import { SlopeKiloMarker } from '../slopeKiloMarker/SlopeKiloMarker'; export interface ISlopeDrawOptions { newData: () => ISlopeData; @@ -44,7 +44,7 @@ export class SlopeDraw extends GraphicDrawAssistant { data.transform = this.container.saveTransform(); return true; } - draw(graphics: AxleCounting[], map: Map) { + draw(graphics: SlopeKiloMarker[], map: Map) { if ( map.has(`${graphics[0].id}+${graphics[1].id}`) || map.has(`${graphics[1].id}+${graphics[0].id}`) @@ -61,29 +61,38 @@ export class SlopeDraw extends GraphicDrawAssistant { } oneGenerates() { const map = new Map(); - const slopes = this.app.queryStore.queryByType(Slope.Type); - const axleCountings = this.app.queryStore.queryByType( - AxleCounting.Type - ); - axleCountings.sort((a, b) => a.position.x - b.position.x); - const axleCountingsPos = axleCountings.map((g) => g.position.x); - //检验坡度有效性--是否有增加和删除 - slopes.forEach((slope) => { - const pS = slope.datas.points[0].x; - const mapS = axleCountingsPos.findIndex((x) => x == pS); - const pE = slope.datas.points[1].x; - const mapE = axleCountingsPos.findIndex((x) => x == pE); - if (mapS !== -1 && mapE !== -1 && mapE - mapS == 1) { - map.set( - `${slope.datas.refDeviceId[0]}+${slope.datas.refDeviceId[1]}`, - 1 - ); - } else { - this.app.deleteGraphics(slope); + for (let dirSlop = 0; dirSlop < 2; dirSlop++) { + const slopes = this.app.queryStore + .queryByType(Slope.Type) + .filter((g) => { + const refSlopeKiloMarker = this.app.queryStore.queryById( + g.datas.refDeviceId[0] + ) as SlopeKiloMarker; + return refSlopeKiloMarker.datas.direction == dirSlop; + }); + const slopeKiloMarkers = this.app.queryStore + .queryByType(SlopeKiloMarker.Type) + .filter((g) => g.datas.direction == dirSlop); + slopeKiloMarkers.sort((a, b) => a.position.x - b.position.x); + const slopeKiloMarkersPos = slopeKiloMarkers.map((g) => g.position.x); + //检验坡度有效性--是否有增加和删除 + slopes.forEach((slope) => { + const pS = slope.datas.points[0].x; + const mapS = slopeKiloMarkersPos.findIndex((x) => x == pS); + const pE = slope.datas.points[1].x; + const mapE = slopeKiloMarkersPos.findIndex((x) => x == pE); + if (mapS !== -1 && mapE !== -1 && mapE - mapS == 1) { + map.set( + `${slope.datas.refDeviceId[0]}+${slope.datas.refDeviceId[1]}`, + 1 + ); + } else { + this.app.deleteGraphics(slope); + } + }); + for (let i = 0; i < slopeKiloMarkers.length - 1; i++) { + this.draw([slopeKiloMarkers[i], slopeKiloMarkers[i + 1]], map); } - }); - for (let i = 0; i < axleCountings.length - 1; i++) { - this.draw([axleCountings[i], axleCountings[i + 1]], map); } } } @@ -119,6 +128,7 @@ export class SlopeInteraction extends GraphicInteractionPlugin { g.eventMode = 'static'; g.cursor = 'pointer'; g.scalable = true; + g.draggable = false; g.transformSave = true; g.lineGraphic.eventMode = 'static'; g.lineGraphic.cursor = 'pointer'; diff --git a/src/graphics/stopPosition/StopPosition.ts b/src/graphics/stopPosition/StopPosition.ts index 4900454..c48b3af 100644 --- a/src/graphics/stopPosition/StopPosition.ts +++ b/src/graphics/stopPosition/StopPosition.ts @@ -1,11 +1,15 @@ import { Graphics } from 'pixi.js'; import { + calculateDistanceFromPointToLine, + calculateFootPointFromPointToLine, + isPointOnLine, GraphicData, JlGraphic, JlGraphicTemplate, VectorText, } from 'src/jl-graphic'; -import { IRelatedRefData } from '../CommonGraphics'; +import { IRelatedRefData, createRelatedRefProto } from '../CommonGraphics'; +import { Section, SectionPort } from '../section/Section'; export enum CoachNum { Four = 0, @@ -88,6 +92,41 @@ export class StopPosition extends JlGraphic { } this.signBody.endFill(); } + buildRelation() { + const sections = this.queryStore.queryByType
(Section.Type); + let deviceId = ''; + let deviceType = ''; + let minD = Number.MAX_SAFE_INTEGER; + let port = SectionPort.A; + sections.forEach((sec: Section) => { + for (let i = 0; i < sec.datas.points.length - 1; i++) { + const d = calculateDistanceFromPointToLine( + sec.localToCanvasPoint(sec.datas.points[i]), + sec.localToCanvasPoint(sec.datas.points[i + 1]), + this.position + ); + const p = calculateFootPointFromPointToLine( + sec.localToCanvasPoint(sec.datas.points[i]), + sec.localToCanvasPoint(sec.datas.points[i + 1]), + this.position + ); + const onLine = isPointOnLine( + sec.localToCanvasPoint(sec.datas.points[i]), + sec.localToCanvasPoint(sec.datas.points[i + 1]), + p + ); + if (onLine && d < minD) { + minD = d; + deviceId = sec.id; + deviceType = sec.type; + port = SectionPort.A; + } + } + }); + if (deviceId) { + this.datas.refDev = createRelatedRefProto(deviceType, deviceId, port); + } + } } export class StopPositionTemplate extends JlGraphicTemplate { diff --git a/src/graphics/transponder/Transponder.ts b/src/graphics/transponder/Transponder.ts index aa4a710..ff5e875 100644 --- a/src/graphics/transponder/Transponder.ts +++ b/src/graphics/transponder/Transponder.ts @@ -1,11 +1,20 @@ -import { Container, Graphics } from 'pixi.js'; +import { Container, Graphics, Point } from 'pixi.js'; import { GraphicData, + GraphicRelationParam, JlGraphic, JlGraphicTemplate, VectorText, + linePoint, } from 'src/jl-graphic'; import { KilometerSystem } from '../signal/Signal'; +import { + IRelatedRefData, + createRelatedRefProto, + protoPort2Data, +} from '../CommonGraphics'; +import { Section, SectionConsts, SectionPort } from '../section/Section'; +import { Turnout, TurnoutConsts, TurnoutPort } from '../turnout/Turnout'; export interface ITransponderData extends GraphicData { get code(): string; // 编号 @@ -16,6 +25,8 @@ export interface ITransponderData extends GraphicData { set index(v: number); get kilometerSystem(): KilometerSystem; set kilometerSystem(v: KilometerSystem); + get TransponderRef(): IRelatedRefData; + set TransponderRef(v: IRelatedRefData); clone(): ITransponderData; copyFrom(data: ITransponderData): void; eq(other: ITransponderData): boolean; @@ -125,6 +136,7 @@ export class Transponder extends JlGraphic { ? TransponderConsts.wblineColor : TransponderConsts.lineColor; polygonGraphic.lineStyle(TransponderConsts.lineWidth, lineColor); + polygonGraphic.beginFill(TransponderConsts.lineColor, 0.00001); // 填充透明色（用于碰撞检测） const indexArr = [0, 5, 7]; ps.forEach((item, index) => { if (indexArr.includes(index)) { @@ -133,6 +145,7 @@ export class Transponder extends JlGraphic { polygonGraphic.lineTo(item[0], item[1]); } }); + polygonGraphic.endFill; this.labelGraphic.paint(this.datas); const style = { fill: lineColor, @@ -156,6 +169,102 @@ export class Transponder extends JlGraphic { ); } } + buildRelation() { + this.relationManage.deleteRelationOfGraphic(this); + const { x, y } = this.position; + const sections = this.queryStore.queryByType
(Section.Type); + const findSection = sections.find((section) => { + let s = false; + for (let i = 1; i < section.datas.points.length; i++) { + const p1 = section.datas.points[i - 1]; + const p2 = section.datas.points[i]; + if ( + linePoint( + section.localToCanvasPoint(p1), + section.localToCanvasPoint(p2), + { x, y }, + SectionConsts.lineWidth + ) + ) { + s = true; + break; + } + } + return s; + }); + if (findSection) { + this.relationManage.addRelation( + new GraphicRelationParam(this), + new GraphicRelationParam(findSection, SectionPort.A) + ); + return; + } + let tPort: TurnoutPort | null = null; + const portList = [TurnoutPort.A, TurnoutPort.B, TurnoutPort.C]; + const turnouts = this.queryStore.queryByType(Turnout.Type); + const findTurnout = turnouts.find((turnout) => { + let s = false; + const aPs = turnout.getPortPoints(); + aPs.some((item, index) => { + const Ps = [new Point(0, 0), ...item]; + for (let i = 1; i < Ps.length; i++) { + const p1 = Ps[i - 1]; + const p2 = Ps[i]; + if ( + linePoint( + turnout.localToCanvasPoint(p1), + turnout.localToCanvasPoint(p2), + { x, y }, + TurnoutConsts.lineWidth + ) + ) { + s = true; + tPort = portList[index]; + break; + } + } + return s; + }); + return s; + }); + if (findTurnout) { + this.relationManage.addRelation( + new GraphicRelationParam(this), + new GraphicRelationParam(findTurnout, tPort) + ); + return; + } + } + + saveRelations() { + const relationM = this.relationManage + .getRelationsOfGraphic(this) + .find( + (relation) => + relation.getOtherGraphic(this) instanceof Section || + relation.getOtherGraphic(this) instanceof Turnout + ); + const device = relationM?.getOtherGraphic
(this); + if (device) { + this.datas.TransponderRef = createRelatedRefProto( + device.type, + device.id, + relationM?.getOtherRelationParam(this).param + ); + } + } + + loadRelations() { + if (this.datas?.TransponderRef?.id) { + this.relationManage.addRelation( + new GraphicRelationParam(this), + new GraphicRelationParam( + this.queryStore.queryById(this.datas.TransponderRef.id), + protoPort2Data(this.datas.TransponderRef.devicePort) + ) + ); + } + } } export class TransponderTemplate extends JlGraphicTemplate { diff --git a/src/graphics/transponder/TransponderDrawAssistant.ts b/src/graphics/transponder/TransponderDrawAssistant.ts index 07ce9ab..698cd7b 100644 --- a/src/graphics/transponder/TransponderDrawAssistant.ts +++ b/src/graphics/transponder/TransponderDrawAssistant.ts @@ -1,4 +1,4 @@ -import { DisplayObject, FederatedPointerEvent, IHitArea, Point } from 'pixi.js'; +import { DisplayObject, FederatedPointerEvent, Point } from 'pixi.js'; import { AbsorbableLine, AbsorbablePosition, @@ -7,15 +7,11 @@ import { GraphicTransformEvent, JlDrawApp, JlGraphic, - linePoint, } from 'src/jl-graphic'; import { ITransponderData, Transponder, - TransponderConsts, TransponderTemplate, - transponderTypeEnum, - transponderTypePoints, } from './Transponder'; export class TransponderDraw extends GraphicDrawAssistant< @@ -51,30 +47,6 @@ export class TransponderDraw extends GraphicDrawAssistant< } } -//碰撞检测 -export class TransponderGraphicHitArea implements IHitArea { - transponder: Transponder; - constructor(transponder: Transponder) { - this.transponder = transponder; - } - contains(x: number, y: number): boolean { - let contains = false; - const p = new Point(x, y); - const type = transponderTypeEnum[this.transponder.datas.transponderType]; - const ps = transponderTypePoints[type]; - const tolerance = TransponderConsts.lineWidth; - const indexArr = [0, 5, 7]; - ps.forEach((item, index) => { - if (!indexArr.includes(index)) { - const p1 = new Point(ps[index - 1][0], ps[index - 1][1]); - const p2 = new Point(item[0], item[1]); - contains = contains || linePoint(p1, p2, p, tolerance); - } - }); - return contains; - } -} - export class TransponderInteraction extends GraphicInteractionPlugin { static Name = 'Transponder_transform'; constructor(app: JlDrawApp) { @@ -92,7 +64,6 @@ export class TransponderInteraction extends GraphicInteractionPlugin