From 7d2a1be457430ee0d18830eaf8a4abf5b9ec864c Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Thu, 28 Mar 2024 09:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=BA=93=E9=97=A8=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/drawIcon.svg | 8 -
src/components/draw-app/DrawProperties.vue | 10 --
.../draw-app/properties/FloodGateProperty.vue | 95 -----------
.../properties/GarageDoorBoxProperty.vue | 78 ---------
src/drawApp/common.ts | 6 +-
src/drawApp/commonApp.ts | 32 ----
src/drawApp/graphics/FloodGateInteraction.ts | 85 ----------
.../graphics/GarageDoorBoxInteraction.ts | 150 ------------------
src/drawApp/lineScene.ts | 25 +--
src/graphics/floodGate/FloodGate.ts | 126 ---------------
.../floodGate/FloodGateDrawAssistant.ts | 126 ---------------
src/graphics/garageDoorBox/GarageDoorBox.ts | 110 -------------
.../garageDoorBox/GarageDoorBoxAssistant.ts | 132 ---------------
src/layouts/DrawLayout.vue | 8 -
14 files changed, 2 insertions(+), 989 deletions(-)
delete mode 100644 src/components/draw-app/properties/FloodGateProperty.vue
delete mode 100644 src/components/draw-app/properties/GarageDoorBoxProperty.vue
delete mode 100644 src/drawApp/graphics/FloodGateInteraction.ts
delete mode 100644 src/drawApp/graphics/GarageDoorBoxInteraction.ts
delete mode 100644 src/graphics/floodGate/FloodGate.ts
delete mode 100644 src/graphics/floodGate/FloodGateDrawAssistant.ts
delete mode 100644 src/graphics/garageDoorBox/GarageDoorBox.ts
delete mode 100644 src/graphics/garageDoorBox/GarageDoorBoxAssistant.ts
diff --git a/public/drawIcon.svg b/public/drawIcon.svg
index b214fc1..1a825dc 100644
--- a/public/drawIcon.svg
+++ b/public/drawIcon.svg
@@ -32,11 +32,6 @@
-
-
-
-
-
@@ -83,7 +78,4 @@
-
-
-
diff --git a/src/components/draw-app/DrawProperties.vue b/src/components/draw-app/DrawProperties.vue
index dc9b47c..ac88326 100644
--- a/src/components/draw-app/DrawProperties.vue
+++ b/src/components/draw-app/DrawProperties.vue
@@ -139,18 +139,12 @@
drawStore.selectedGraphicType === ConcentrationDividingLine.Type
"
/>
-
-
@@ -229,14 +223,10 @@ import { TrackLogicSection } from 'src/graphics/trackLogicSection/TrackLogicSect
import MultipleSelectProperty from './properties/multipleSelectProperty.vue';
import { DepartureTimer } from 'src/graphics/departureTimer/DepartureTimer';
import DepartureTimerProperty from './properties/DepartureTimerProperty.vue';
-import FloodGateProperty from './properties/FloodGateProperty.vue';
-import { FloodGate } from 'src/graphics/floodGate/FloodGate';
import GarageDoorProperty from './properties/GarageDoorProperty.vue';
import { GarageDoor } from 'src/graphics/garageDoor/GarageDoor';
import CarWashingProperty from './properties/CarWashingProperty.vue';
import { CarWashing } from 'src/graphics/carWashing/CarWashing';
-import GarageDoorBoxProperty from './properties/GarageDoorBoxProperty.vue';
-import { GarageDoorBox } from 'src/graphics/garageDoorBox/GarageDoorBox';
const drawStore = useDrawStore();
diff --git a/src/components/draw-app/properties/FloodGateProperty.vue b/src/components/draw-app/properties/FloodGateProperty.vue
deleted file mode 100644
index ddefe34..0000000
--- a/src/components/draw-app/properties/FloodGateProperty.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
-
- {{ getName(id) }}
-
-
-
-
-
-
-
diff --git a/src/components/draw-app/properties/GarageDoorBoxProperty.vue b/src/components/draw-app/properties/GarageDoorBoxProperty.vue
deleted file mode 100644
index 891e572..0000000
--- a/src/components/draw-app/properties/GarageDoorBoxProperty.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drawApp/common.ts b/src/drawApp/common.ts
index 21bb5c9..c0ab81f 100644
--- a/src/drawApp/common.ts
+++ b/src/drawApp/common.ts
@@ -23,8 +23,6 @@ import { IbpBox } from 'src/graphics/ibpBox/IbpBox';
import { PslBox } from 'src/graphics/pslBox/PslBox';
import { GarageDoor } from 'src/graphics/garageDoor/GarageDoor';
import { CarWashing } from 'src/graphics/carWashing/CarWashing';
-import { FloodGate } from 'src/graphics/floodGate/FloodGate';
-import { GarageDoorBox } from 'src/graphics/garageDoorBox/GarageDoorBox';
export const drawCommonLayerList = [
// 图层列表 默认显示的图层defaultShow: true
@@ -59,8 +57,6 @@ export const drawCommonLayerList = [
value: ConcentrationDividingLine.Type,
defaultShow: true,
},
- { label: '车库门', value: GarageDoor.Type, defaultShow: true },
- { label: '防淹门', value: FloodGate.Type, defaultShow: true },
+ { label: '车库门/防淹门', value: GarageDoor.Type, defaultShow: true },
{ label: '洗车机', value: CarWashing.Type, defaultShow: true },
- { label: '车库门设置', value: GarageDoorBox.Type, defaultShow: true },
];
diff --git a/src/drawApp/commonApp.ts b/src/drawApp/commonApp.ts
index 8a7e5c6..41a6ad7 100644
--- a/src/drawApp/commonApp.ts
+++ b/src/drawApp/commonApp.ts
@@ -96,15 +96,6 @@ import {
GatedBoxData,
DrawGatedBoxInteraction,
} from './graphics/GatedBoxInteraction';
-import {
- GarageDoorBox,
- GarageDoorBoxTemplate,
-} from 'src/graphics/garageDoorBox/GarageDoorBox';
-import {
- GarageDoorBoxData,
- DrawGarageDoorBoxInteraction,
-} from './graphics/GarageDoorBoxInteraction';
-import { GarageDoorBoxDraw } from 'src/graphics/garageDoorBox/GarageDoorBoxAssistant';
// import { EsbButton, EsbButtonTemplate } from 'src/graphics/esbButton/EsbButton';
// import {
// EsbButtonData,
@@ -157,9 +148,6 @@ import {
CarWashingTemplate,
} from 'src/graphics/carWashing/CarWashing';
import { CarWashingDraw } from 'src/graphics/carWashing/CarWashingDrawAssistant';
-import { FloodGateData } from './graphics/FloodGateInteraction';
-import { FloodGate, FloodGateTemplate } from 'src/graphics/floodGate/FloodGate';
-import { FloodGateDraw } from 'src/graphics/floodGate/FloodGateDrawAssistant';
import {
GarageDoorData,
GarageDoorState,
@@ -235,10 +223,6 @@ export function initCommonDrawApp(app: IDrawApp) {
new StopPositionDraw(app, new StopPositionTemplate(new StopPositionData()));
new SpksSwitchDraw(app, new SpksSwitchTemplate(new SpksSwitchData()));
new GatedBoxDraw(app, new GatedBoxTemplate(new GatedBoxData()));
- new GarageDoorBoxDraw(
- app,
- new GarageDoorBoxTemplate(new GarageDoorBoxData())
- );
// new EsbButtonDraw(
// app,
// new EsbButtonTemplate(new EsbButtonData(), new EsbButtonState())
@@ -260,7 +244,6 @@ export function initCommonDrawApp(app: IDrawApp) {
new ConcentrationDividingLineTemplate(new ConcentrationDividingLineData())
);
new CarWashingDraw(app, new CarWashingTemplate(new CarWashingData()));
- new FloodGateDraw(app, new FloodGateTemplate(new FloodGateData()));
new GarageDoorDraw(
app,
new GarageDoorTemplate(new GarageDoorData(), new GarageDoorState())
@@ -269,7 +252,6 @@ export function initCommonDrawApp(app: IDrawApp) {
DrawStopPositionInteraction.init(app);
DrawSpksSwitchInteraction.init(app);
DrawGatedBoxInteraction.init(app);
- DrawGarageDoorBoxInteraction.init(app);
// DrawEsbButtonInteraction.init(app);
// 画布右键菜单
@@ -451,9 +433,6 @@ export function loadCommonDrawDatas(
storage.gateBoxs.forEach((gatedBox) => {
datas.push(new GatedBoxData(gatedBox));
});
- storage.garageDoorBoxes.forEach((garageDoorBox) => {
- datas.push(new GarageDoorBoxData(garageDoorBox));
- });
// storage.esbButtons.forEach((esbButton) => {
// datas.push(new EsbButtonData(esbButton));
// });
@@ -478,9 +457,6 @@ export function loadCommonDrawDatas(
storage.concentrationDividingLines.forEach((concentrationDividingLine) => {
datas.push(new ConcentrationDividingLineData(concentrationDividingLine));
});
- storage.floodGates.forEach((flood) => {
- datas.push(new FloodGateData(flood));
- });
storage.carWashings.forEach((carWashing) => {
datas.push(new CarWashingData(carWashing));
});
@@ -546,11 +522,6 @@ export function saveCommonDrawDatas(app: IDrawApp) {
// } else if (EsbButton.Type === g.type) {
// const esbButtonData = (g as EsbButton).saveData();
// storage.esbButtons.push((esbButtonData as EsbButtonData).data);
- } else if (GarageDoorBox.Type === g.type) {
- const garageDoorBoxData = (g as GarageDoorBox).saveData();
- storage.garageDoorBoxes.push(
- (garageDoorBoxData as GarageDoorBoxData).data
- );
} else if (Transponder.Type === g.type) {
const transponderData = (g as Transponder).saveData();
storage.transponders.push((transponderData as TransponderData).data);
@@ -581,9 +552,6 @@ export function saveCommonDrawDatas(app: IDrawApp) {
} else if (g instanceof CarWashing) {
const carWashingData = g.saveData();
storage.carWashings.push((carWashingData as CarWashingData).data);
- } else if (g instanceof FloodGate) {
- const floodGateData = g.saveData();
- storage.floodGates.push((floodGateData as FloodGateData).data);
} else if (g instanceof GarageDoor) {
const garageDoorData = g.saveData();
storage.garageDoors.push((garageDoorData as GarageDoorData).data);
diff --git a/src/drawApp/graphics/FloodGateInteraction.ts b/src/drawApp/graphics/FloodGateInteraction.ts
deleted file mode 100644
index 7240566..0000000
--- a/src/drawApp/graphics/FloodGateInteraction.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import * as pb_1 from 'google-protobuf';
-import { FederatedMouseEvent } from 'pixi.js';
-import { FloodGate, IFloodGateData } from 'src/graphics/floodGate/FloodGate';
-import { GraphicInteractionPlugin, JlGraphic, IGraphicScene } from 'jl-graphic';
-
-import { graphicData } from 'src/protos/stationLayoutGraphics';
-import { GraphicDataBase } from './GraphicDataBase';
-
-export class FloodGateData extends GraphicDataBase implements IFloodGateData {
- constructor(data?: graphicData.FloodGate) {
- let floodGate;
- if (!data) {
- floodGate = new graphicData.FloodGate({
- common: GraphicDataBase.defaultCommonInfo(FloodGate.Type),
- });
- } else {
- floodGate = data;
- }
- super(floodGate);
- }
-
- public get data(): graphicData.FloodGate {
- return this.getData();
- }
- get code(): string {
- return this.data.code;
- }
- set code(v: string) {
- this.data.code = v;
- }
- get linkSection(): number {
- return this.data.linkSection;
- }
- set linkSection(v: number) {
- this.data.linkSection = v;
- }
- get centralizedStations(): number[] {
- return this.data.centralizedStations;
- }
- set centralizedStations(v: number[]) {
- this.data.centralizedStations = v;
- }
- clone(): FloodGateData {
- return new FloodGateData(this.data.cloneMessage());
- }
- copyFrom(data: FloodGateData): void {
- pb_1.Message.copyInto(data.data, this.data);
- }
- eq(other: FloodGateData): boolean {
- return pb_1.Message.equals(this.data, other.data);
- }
-}
-
-export class FloodGateOperationInteraction extends GraphicInteractionPlugin {
- static Name = 'flood_gate_operation';
- constructor(scene: IGraphicScene) {
- super(FloodGateOperationInteraction.Name, scene);
- }
- static init(scene: IGraphicScene) {
- return new FloodGateOperationInteraction(scene);
- }
- filter(...grahpics: JlGraphic[]): FloodGate[] | undefined {
- return grahpics.filter((g): g is FloodGate => g.type === FloodGate.Type);
- }
- bind(g: FloodGate): void {
- g.eventMode = 'static';
- g.cursor = 'pointer';
- g.on('mousedown', this.onPress, this);
- }
- unbind(g: FloodGate): void {
- g.eventMode = 'none';
- g.cursor = 'default';
- g.off('mousedown', this.onPress, this);
- }
- onPress(e: FederatedMouseEvent) {
- const g = e.target as FloodGate;
- g.on('mouseleave', this.onRelease, this);
- g.on('mouseup', this.onRelease, this);
- }
- onRelease(e: FederatedMouseEvent) {
- const g = e.target as FloodGate;
- g.off('mouseleave', this.onRelease, this);
- g.off('mouseup', this.onRelease, this);
- }
-}
diff --git a/src/drawApp/graphics/GarageDoorBoxInteraction.ts b/src/drawApp/graphics/GarageDoorBoxInteraction.ts
deleted file mode 100644
index 9c5860b..0000000
--- a/src/drawApp/graphics/GarageDoorBoxInteraction.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import * as pb_1 from 'google-protobuf';
-import { DisplayObject, FederatedMouseEvent } from 'pixi.js';
-import {
- GarageDoorBox,
- IGarageDoorBox,
-} from 'src/graphics/garageDoorBox/GarageDoorBox';
-import {
- IGraphicApp,
- GraphicInteractionPlugin,
- JlGraphic,
- IGraphicScene,
- MenuItemOptions,
- ContextMenu,
-} from 'jl-graphic';
-
-import { graphicData } from 'src/protos/stationLayoutGraphics';
-import { GraphicDataBase } from './GraphicDataBase';
-import { usePslStore } from 'src/stores/psl-store';
-
-export class GarageDoorBoxData
- extends GraphicDataBase
- implements IGarageDoorBox
-{
- constructor(data?: graphicData.GarageDoorBox) {
- let garageDoorBox;
- if (!data) {
- garageDoorBox = new graphicData.GarageDoorBox({
- common: GraphicDataBase.defaultCommonInfo(GarageDoorBox.Type),
- });
- } else {
- garageDoorBox = data;
- }
- super(garageDoorBox);
- }
-
- public get data(): graphicData.GarageDoorBox {
- return this.getData();
- }
- get code(): string {
- return this.data.code;
- }
- set code(v: string) {
- this.data.code = v;
- }
- get flip(): boolean {
- return this.data.flip;
- }
- set flip(v: boolean) {
- this.data.flip = v;
- }
- get refGarageDoorId(): number {
- return this.data.refGarageDoorId;
- }
- set refGarageDoorId(v: number) {
- this.data.refGarageDoorId = v;
- }
- get refPslMapCode(): string {
- return this.data.refPslMapCode;
- }
- set refPslMapCode(v: string) {
- this.data.refPslMapCode = v;
- }
- clone(): GarageDoorBoxData {
- return new GarageDoorBoxData(this.data.cloneMessage());
- }
- copyFrom(data: GarageDoorBoxData): void {
- pb_1.Message.copyInto(data.data, this.data);
- }
- eq(other: GarageDoorBoxData): boolean {
- return pb_1.Message.equals(this.data, other.data);
- }
-}
-
-const flipConfig: MenuItemOptions = {
- name: '上下翻转',
-};
-const GarageDoorBoxEditMenu: ContextMenu = ContextMenu.init({
- name: '设置车库门编辑菜单',
- groups: [
- {
- items: [flipConfig],
- },
- ],
-});
-export class DrawGarageDoorBoxInteraction extends GraphicInteractionPlugin {
- static Name = 'garage_door_box_draw_right_menu';
- constructor(app: IGraphicApp) {
- super(DrawGarageDoorBoxInteraction.Name, app);
- app.registerMenu(GarageDoorBoxEditMenu);
- }
- static init(app: IGraphicApp) {
- return new DrawGarageDoorBoxInteraction(app);
- }
- filter(...grahpics: JlGraphic[]): GarageDoorBox[] | undefined {
- return grahpics
- .filter((g) => g.type === GarageDoorBox.Type)
- .map((g) => g as GarageDoorBox);
- }
- bind(g: GarageDoorBox): void {
- g.on('_rightclick', this.onContextMenu, this);
- }
-
- unbind(g: GarageDoorBox): void {
- g.off('_rightclick', this.onContextMenu, this);
- }
-
- onContextMenu(e: FederatedMouseEvent) {
- const target = e.target as DisplayObject;
- const garageDoorBox = target.getGraphic() as GarageDoorBox;
- this.app.updateSelected(garageDoorBox);
- flipConfig.handler = () => {
- garageDoorBox.datas.flip = !garageDoorBox.datas.flip;
- garageDoorBox.repaint();
- };
- GarageDoorBoxEditMenu.open(e.global);
- }
-}
-
-export class GarageDoorBoxOperateInteraction extends GraphicInteractionPlugin {
- static Name = 'garage_door_box_operate_menu';
- constructor(app: IGraphicScene) {
- super(GarageDoorBoxOperateInteraction.Name, app);
- }
- static init(app: IGraphicScene) {
- return new GarageDoorBoxOperateInteraction(app);
- }
- filter(...grahpics: JlGraphic[]): GarageDoorBox[] | undefined {
- return grahpics
- .filter((g) => g.type === GarageDoorBox.Type)
- .map((g) => g as GarageDoorBox);
- }
- bind(g: GarageDoorBox): void {
- g.eventMode = 'static';
- g.cursor = 'pointer';
- g.on('_leftclick', this.onLeftClick, this);
- }
-
- unbind(g: GarageDoorBox): void {
- g.eventMode = 'none';
- g.off('_leftclick', this.onLeftClick, this);
- }
- onLeftClick(e: FederatedMouseEvent) {
- const target = e.target as DisplayObject;
- const garageDoorBox = target.getGraphic() as GarageDoorBox;
- usePslStore().setPslParam(
- garageDoorBox.datas.id,
- garageDoorBox.datas.refPslMapCode
- );
- }
-}
diff --git a/src/drawApp/lineScene.ts b/src/drawApp/lineScene.ts
index ad91799..12e5b61 100644
--- a/src/drawApp/lineScene.ts
+++ b/src/drawApp/lineScene.ts
@@ -21,11 +21,6 @@ import {
Signal,
KilometerSystem,
} from 'src/graphics/signal/Signal';
-import {
- FloodGateData,
- FloodGateOperationInteraction,
-} from './graphics/FloodGateInteraction';
-import { FloodGate, FloodGateTemplate } from 'src/graphics/floodGate/FloodGate';
import {
CarWashingData,
CarWashingOperationInteraction,
@@ -129,11 +124,6 @@ import {
SpksSwitchOperationInteraction,
} from './graphics/SpksSwitchInteraction';
import { GatedBoxData } from './graphics/GatedBoxInteraction';
-import { GarageDoorBoxData } from './graphics/GarageDoorBoxInteraction';
-import {
- GarageDoorBox,
- GarageDoorBoxTemplate,
-} from 'src/graphics/garageDoorBox/GarageDoorBox';
import {
EsbButtonData,
EsbButtonOperationInteraction,
@@ -175,7 +165,6 @@ import {
} from 'src/graphics/trackLogicSection/TrackLogicSection';
import { TrackLogicSectionData } from './graphics/TrackLogicSectionInteraction';
import { GatedBoxOperateInteraction } from './graphics/GatedBoxInteraction';
-import { GarageDoorBoxOperateInteraction } from './graphics/GarageDoorBoxInteraction';
import { CategoryType } from 'src/components/CategoryType';
import {
AutoReturnBox,
@@ -261,10 +250,8 @@ export const layerList = [
{ label: '轨道区段', value: TrackSection.Type, defaultShow: false },
{ label: '轨道逻辑区段', value: TrackLogicSection.Type, defaultShow: false },
{ label: '自动折返按钮箱', value: AutoReturnBox.Type, defaultShow: true },
- { label: '车库门', value: GarageDoor.Type, defaultShow: true },
- { label: '防淹门', value: FloodGate.Type, defaultShow: true },
+ { label: '车库门/防淹门', value: GarageDoor.Type, defaultShow: true },
{ label: '洗车机', value: CarWashing.Type, defaultShow: true },
- { label: '车库门设置', value: GarageDoorBox.Type, defaultShow: true },
];
let lineScene: IGraphicScene;
@@ -335,8 +322,6 @@ export function initLineScene(lineApp: IGraphicApp, sceneName: string) {
),
new CarWashingTemplate(new CarWashingData()),
new GarageDoorTemplate(new GarageDoorData(), new GarageDoorState()),
- new FloodGateTemplate(new FloodGateData()),
- new GarageDoorBoxTemplate(new GarageDoorBoxData()),
];
lineScene.registerGraphicTemplates(...graphicTemplate);
SignalOperateInteraction.init(lineScene);
@@ -355,8 +340,6 @@ export function initLineScene(lineApp: IGraphicApp, sceneName: string) {
IbpBoxOperateInteraction.init(lineScene);
CarWashingOperationInteraction.init(lineScene);
GarageDoorOperationInteraction.init(lineScene);
- FloodGateOperationInteraction.init(lineScene);
- GarageDoorBoxOperateInteraction.init(lineScene);
if (categoryType === CategoryType.TH) {
GatedBoxOperateInteraction.init(lineScene);
}
@@ -663,12 +646,6 @@ export async function loadLineDatas(): Promise {
storage.garageDoors.forEach((garageDoor) => {
datas.push(new GarageDoorData(garageDoor));
});
- storage.floodGates.forEach((floodGate) => {
- datas.push(new FloodGateData(floodGate));
- });
- storage.garageDoorBoxes.forEach((garageDoorBox) => {
- datas.push(new GarageDoorBoxData(garageDoorBox));
- });
// const linkIdGenerator = new IdGenerator(Link.Type);
// storage.CalculateLink.forEach((link) => {
// const g = new LinkData(link);
diff --git a/src/graphics/floodGate/FloodGate.ts b/src/graphics/floodGate/FloodGate.ts
deleted file mode 100644
index 9a1eadd..0000000
--- a/src/graphics/floodGate/FloodGate.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { Graphics } from 'pixi.js';
-import {
- GraphicData,
- JlGraphic,
- JlGraphicTemplate,
- VectorText,
- linePoint,
-} from 'jl-graphic';
-import { Section, SectionType } from '../section/Section';
-
-export interface IFloodGateData extends GraphicData {
- get code(): string;
- set code(v: string);
- get linkSection(): number;
- set linkSection(v: number);
- get centralizedStations(): number[];
- set centralizedStations(v: number[]);
- clone(): IFloodGateData;
- copyFrom(data: IFloodGateData): void;
- eq(other: IFloodGateData): boolean;
-}
-
-const floodGateConsts = {
- codeFontSize: 12,
- codeColor: 0xffffff,
- bodyLineColor: 0xffffff,
- bodyLineWidth: 2,
- bodyColor: 0x000000,
- bodyRectWidth: 10,
- bodyRectHeight: 20,
-};
-export class FloodGate extends JlGraphic {
- static Type = 'floodGate';
- codeGraph: VectorText = new VectorText('');
- lineBody: Graphics = new Graphics();
-
- constructor() {
- super(FloodGate.Type);
- this.addChild(this.codeGraph);
- this.addChild(this.lineBody);
- this.codeGraph.name = 'flood_code';
- }
- get code(): string {
- return this.datas.code;
- }
- get datas(): IFloodGateData {
- return this.getDatas();
- }
- doRepaint(): void {
- const codeGraph = this.codeGraph;
- codeGraph.text = this.datas.code;
- codeGraph.style.fill = floodGateConsts.codeColor;
- codeGraph.setVectorFontSize(floodGateConsts.codeFontSize);
- codeGraph.anchor.set(0.5);
- const codeTransform = this.datas?.childTransforms?.find(
- (item) => item.name === 'flood_code'
- );
- if (codeTransform) {
- const position = codeTransform?.transform.position;
- const rotation = codeTransform?.transform?.rotation;
- codeGraph.position.set(position?.x, position?.y);
- codeGraph.rotation = rotation || 0;
- } else {
- codeGraph.position.set(0, -30);
- }
- this.lineBody.clear();
- this.lineBody.lineStyle(
- floodGateConsts.bodyLineWidth,
- floodGateConsts.bodyLineColor
- );
- this.lineBody.moveTo(
- -floodGateConsts.bodyRectWidth / 2,
- -floodGateConsts.bodyRectHeight / 2
- );
- this.lineBody.lineTo(
- floodGateConsts.bodyRectWidth / 2,
- -floodGateConsts.bodyRectHeight / 2
- );
- this.lineBody.moveTo(
- -floodGateConsts.bodyRectWidth / 2,
- floodGateConsts.bodyRectHeight / 2
- );
- this.lineBody.lineTo(
- floodGateConsts.bodyRectWidth / 2,
- floodGateConsts.bodyRectHeight / 2
- );
- this.lineBody.moveTo(0, -floodGateConsts.bodyRectHeight / 2);
- this.lineBody.lineTo(0, floodGateConsts.bodyRectHeight / 2);
- }
-
- buildRelation() {
- const sections = this.queryStore
- .queryByType(Section.Type)
- .filter((s) => s.datas.sectionType === SectionType.Physical);
- let xj = false;
- const se = sections.find((section) => {
- const points = section.linePoints;
- points.forEach((point, index) => {
- if (index !== 0) {
- xj =
- linePoint(
- section.localToCanvasPoint(points[index - 1]),
- section.localToCanvasPoint(point),
- this.localToCanvasPoint({ x: 0, y: 0 }),
- 8
- ) || xj;
- }
- });
- return xj;
- });
- if (se) {
- this.datas.linkSection = se.datas.id;
- }
- }
-}
-
-export class FloodGateTemplate extends JlGraphicTemplate {
- constructor(dataTemplate: IFloodGateData) {
- super(FloodGate.Type, { dataTemplate });
- }
- new(): FloodGate {
- const floodGate = new FloodGate();
- floodGate.loadData(this.datas);
- return floodGate;
- }
-}
diff --git a/src/graphics/floodGate/FloodGateDrawAssistant.ts b/src/graphics/floodGate/FloodGateDrawAssistant.ts
deleted file mode 100644
index c410cc6..0000000
--- a/src/graphics/floodGate/FloodGateDrawAssistant.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { DisplayObject, FederatedMouseEvent, Point } from 'pixi.js';
-import {
- AbsorbableLine,
- AbsorbablePosition,
- GraphicDrawAssistant,
- GraphicInteractionPlugin,
- GraphicTransformEvent,
- IDrawApp,
- JlGraphic,
-} from 'jl-graphic';
-import { FloodGate, FloodGateTemplate, IFloodGateData } from './FloodGate';
-
-export interface IFloodGateDataDrawOptions {
- newData: () => IFloodGateData;
-}
-export class FloodGateDraw extends GraphicDrawAssistant<
- FloodGateTemplate,
- IFloodGateData
-> {
- _floodGate: FloodGate | null = null;
- constructor(app: IDrawApp, template: FloodGateTemplate) {
- super(
- app,
- template,
- 'svguse:../../drawIcon.svg#icon-flood-gate',
- '防淹门FloodGate'
- );
- FloodGateInteraction.init(app);
- }
- public get floodGate(): FloodGate {
- if (!this._floodGate) {
- this._floodGate = this.graphicTemplate.new();
- this._floodGate.loadData(this.graphicTemplate.datas);
- this.container.addChild(this._floodGate);
- }
- return this._floodGate;
- }
-
- onLeftUp(e: FederatedMouseEvent): void {
- this.container.position.copyFrom(this.toCanvasCoordinates(e.global));
- this.createAndStore(true);
- }
-
- redraw(p: Point): void {
- this.floodGate.repaint();
- this.container.position.set(p.x, p.y);
- }
-
- prepareData(data: IFloodGateData): boolean {
- data.transform = this.container.saveTransform();
- data.code = 'FloodGate';
- return true;
- }
-}
-/**
- * 构建吸附线
- * @param floodGate
- */
-function buildAbsorbablePositions(floodGate: FloodGate): AbsorbablePosition[] {
- const aps: AbsorbablePosition[] = [];
- const floodGates = floodGate.queryStore.queryByType(
- FloodGate.Type
- );
- const canvas = floodGate.getCanvas();
- floodGates.forEach((item) => {
- if (item.id === floodGate.id) {
- return;
- }
- const ala = new AbsorbableLine(
- new Point(item.x, 0),
- new Point(item.x, canvas.height)
- );
- const alb = new AbsorbableLine(
- new Point(0, item.y),
- new Point(canvas.width, item.y)
- );
- aps.push(ala);
- aps.push(alb);
- });
- return aps;
-}
-
-export class FloodGateInteraction extends GraphicInteractionPlugin {
- static Name = 'flood_gate_transform';
- constructor(app: IDrawApp) {
- super(FloodGateInteraction.Name, app);
- }
- static init(app: IDrawApp) {
- return new FloodGateInteraction(app);
- }
- filter(...grahpics: JlGraphic[]): FloodGate[] | undefined {
- return grahpics
- .filter((g) => g.type === FloodGate.Type)
- .map((g) => g as FloodGate);
- }
- bind(g: FloodGate): void {
- g.eventMode = 'static';
- g.cursor = 'pointer';
- g.scalable = true;
- g.rotatable = true;
- g.codeGraph.draggable = true;
- g.codeGraph.selectable = true;
- g.codeGraph.rotatable = true;
- g.codeGraph.transformSave = true;
- g.codeGraph.eventMode = 'static';
- g.on('transformstart', this.transformstart, this);
- }
- unbind(g: FloodGate): void {
- g.eventMode = 'none';
- g.scalable = false;
- g.rotatable = false;
- g.codeGraph.draggable = false;
- g.codeGraph.selectable = false;
- g.codeGraph.rotatable = false;
- g.codeGraph.transformSave = false;
- g.codeGraph.eventMode = 'none';
- g.off('transformstart', this.transformstart, this);
- }
- transformstart(e: GraphicTransformEvent) {
- const target = e.target as DisplayObject;
- const floodGate = target.getGraphic() as FloodGate;
- floodGate.getGraphicApp().setOptions({
- absorbablePositions: buildAbsorbablePositions(floodGate),
- });
- }
-}
diff --git a/src/graphics/garageDoorBox/GarageDoorBox.ts b/src/graphics/garageDoorBox/GarageDoorBox.ts
deleted file mode 100644
index 162b2cf..0000000
--- a/src/graphics/garageDoorBox/GarageDoorBox.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Graphics } from 'pixi.js';
-import {
- GraphicData,
- JlGraphic,
- JlGraphicTemplate,
- VectorText,
-} from 'jl-graphic';
-
-export interface IGarageDoorBox extends GraphicData {
- get code(): string;
- set code(v: string);
- get flip(): boolean;
- set flip(v: boolean);
- get refGarageDoorId(): number;
- set refGarageDoorId(v: number);
- get refPslMapCode(): string;
- set refPslMapCode(v: string);
- clone(): IGarageDoorBox;
- copyFrom(data: IGarageDoorBox): void;
- eq(other: IGarageDoorBox): boolean;
-}
-
-const garageDoorBoxConsts = {
- codeFontSize: 12,
- codeColor: 0xffffff,
- bodyLineColor: 0xffffff,
- bodyLineWidth: 4,
- bodyRectLineColor: 0xffffff,
- bodyRectLineWidth: 2,
- bodyRectWidth: 20,
- bodyRectHeight: 20,
- bodyColor: 0x000000,
-};
-export class GarageDoorBox extends JlGraphic {
- static Type = 'garageDoorBox';
- codeGraph: VectorText = new VectorText('');
- rectBody: Graphics = new Graphics();
- lineBody: Graphics = new Graphics();
- textGraph: VectorText = new VectorText('G');
-
- constructor() {
- super(GarageDoorBox.Type);
- this.addChild(this.codeGraph);
- this.addChild(this.rectBody);
- this.addChild(this.lineBody);
- this.addChild(this.textGraph);
- this.codeGraph.name = 'g_d_b_code';
- }
- get code(): string {
- return this.datas.code;
- }
- get datas(): IGarageDoorBox {
- return this.getDatas();
- }
- doRepaint(): void {
- const codeGraph = this.codeGraph;
- codeGraph.text = this.datas.code;
- codeGraph.style.fill = garageDoorBoxConsts.codeColor;
- codeGraph.setVectorFontSize(garageDoorBoxConsts.codeFontSize);
- const codeTransform = this.datas?.childTransforms?.find(
- (item) => item.name === 'g_d_b_code'
- );
- if (codeTransform) {
- const position = codeTransform?.transform.position;
- const rotation = codeTransform?.transform?.rotation;
- codeGraph.position.set(position?.x, position?.y);
- codeGraph.rotation = rotation || 0;
- } else {
- codeGraph.position.set(20, 0);
- }
- codeGraph.anchor.set(0.5);
- this.textGraph.style.fill = garageDoorBoxConsts.codeColor;
- this.textGraph.setVectorFontSize(garageDoorBoxConsts.codeFontSize);
- this.textGraph.anchor.set(0.5);
- this.rectBody.clear();
- this.rectBody.beginFill(garageDoorBoxConsts.bodyColor, 0);
- this.rectBody.lineStyle(
- garageDoorBoxConsts.bodyRectLineWidth,
- garageDoorBoxConsts.bodyRectLineColor
- );
- this.rectBody.drawRect(
- -garageDoorBoxConsts.bodyRectWidth / 2,
- -garageDoorBoxConsts.bodyRectHeight / 2,
- garageDoorBoxConsts.bodyRectWidth,
- garageDoorBoxConsts.bodyRectHeight
- );
- this.rectBody.endFill();
- this.lineBody.clear();
- const lineY = this.datas.flip
- ? garageDoorBoxConsts.bodyRectHeight / 2
- : -garageDoorBoxConsts.bodyRectHeight / 2;
- this.lineBody.lineStyle(
- garageDoorBoxConsts.bodyLineWidth,
- garageDoorBoxConsts.bodyLineColor
- );
- this.lineBody.moveTo(-garageDoorBoxConsts.bodyRectWidth / 2, lineY);
- this.lineBody.lineTo(garageDoorBoxConsts.bodyRectWidth / 2, lineY);
- }
-}
-
-export class GarageDoorBoxTemplate extends JlGraphicTemplate {
- constructor(dataTemplate: IGarageDoorBox) {
- super(GarageDoorBox.Type, { dataTemplate });
- }
- new(): GarageDoorBox {
- const garageDoorBox = new GarageDoorBox();
- garageDoorBox.loadData(this.datas);
- return garageDoorBox;
- }
-}
diff --git a/src/graphics/garageDoorBox/GarageDoorBoxAssistant.ts b/src/graphics/garageDoorBox/GarageDoorBoxAssistant.ts
deleted file mode 100644
index c27f6e7..0000000
--- a/src/graphics/garageDoorBox/GarageDoorBoxAssistant.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { DisplayObject, FederatedMouseEvent, Point } from 'pixi.js';
-import {
- AbsorbableLine,
- AbsorbablePosition,
- GraphicDrawAssistant,
- GraphicInteractionPlugin,
- GraphicTransformEvent,
- IDrawApp,
- JlGraphic,
-} from 'jl-graphic';
-import {
- GarageDoorBox,
- GarageDoorBoxTemplate,
- IGarageDoorBox,
-} from './GarageDoorBox';
-
-export interface IGarageDoorBoxDrawOptions {
- newData: () => IGarageDoorBox;
-}
-export class GarageDoorBoxDraw extends GraphicDrawAssistant<
- GarageDoorBoxTemplate,
- IGarageDoorBox
-> {
- _garageDoorBox: GarageDoorBox | null = null;
- constructor(app: IDrawApp, template: GarageDoorBoxTemplate) {
- super(
- app,
- template,
- 'svguse:../../drawIcon.svg#icon-garage-door-box',
- '设置车库门GarageDoorBox'
- );
- GarageDoorBoxInteraction.init(app);
- }
- public get garageDoorBox(): GarageDoorBox {
- if (!this._garageDoorBox) {
- this._garageDoorBox = this.graphicTemplate.new();
- this._garageDoorBox.loadData(this.graphicTemplate.datas);
- this.container.addChild(this._garageDoorBox);
- }
- return this._garageDoorBox;
- }
-
- onLeftUp(e: FederatedMouseEvent): void {
- this.container.position.copyFrom(this.toCanvasCoordinates(e.global));
- this.createAndStore(true);
- }
-
- redraw(p: Point): void {
- this.garageDoorBox.repaint();
- this.container.position.set(p.x, p.y);
- }
-
- prepareData(data: IGarageDoorBox): boolean {
- data.transform = this.container.saveTransform();
- data.code = 'G';
- return true;
- }
-}
-/**
- * 构建吸附线
- * @param garageDoorBox
- */
-function buildAbsorbablePositions(
- garageDoorBox: GarageDoorBox
-): AbsorbablePosition[] {
- const aps: AbsorbablePosition[] = [];
- const garageDoorBoxs = garageDoorBox.queryStore.queryByType(
- GarageDoorBox.Type
- );
- const canvas = garageDoorBox.getCanvas();
- garageDoorBoxs.forEach((item) => {
- if (item.id === garageDoorBox.id) {
- return;
- }
- const ala = new AbsorbableLine(
- new Point(item.x, 0),
- new Point(item.x, canvas.height)
- );
- const alb = new AbsorbableLine(
- new Point(0, item.y),
- new Point(canvas.width, item.y)
- );
- aps.push(ala);
- aps.push(alb);
- });
- return aps;
-}
-
-export class GarageDoorBoxInteraction extends GraphicInteractionPlugin {
- static Name = 'garage_door_box_transform';
- constructor(app: IDrawApp) {
- super(GarageDoorBoxInteraction.Name, app);
- }
- static init(app: IDrawApp) {
- return new GarageDoorBoxInteraction(app);
- }
- filter(...grahpics: JlGraphic[]): GarageDoorBox[] | undefined {
- return grahpics
- .filter((g) => g.type === GarageDoorBox.Type)
- .map((g) => g as GarageDoorBox);
- }
- bind(g: GarageDoorBox): void {
- g.eventMode = 'static';
- g.cursor = 'pointer';
- g.scalable = true;
- g.rotatable = true;
- g.codeGraph.draggable = true;
- g.codeGraph.selectable = true;
- g.codeGraph.rotatable = true;
- g.codeGraph.transformSave = true;
- g.codeGraph.eventMode = 'static';
- g.on('transformstart', this.transformstart, this);
- }
- unbind(g: GarageDoorBox): void {
- g.eventMode = 'none';
- g.scalable = false;
- g.rotatable = false;
- g.codeGraph.draggable = false;
- g.codeGraph.selectable = false;
- g.codeGraph.rotatable = false;
- g.codeGraph.transformSave = false;
- g.codeGraph.eventMode = 'none';
- g.off('transformstart', this.transformstart, this);
- }
- transformstart(e: GraphicTransformEvent) {
- const target = e.target as DisplayObject;
- const garageDoorBox = target.getGraphic() as GarageDoorBox;
- garageDoorBox.getGraphicApp().setOptions({
- absorbablePositions: buildAbsorbablePositions(garageDoorBox),
- });
- }
-}
diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index ed53f63..7180cd6 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -275,9 +275,7 @@ import { distance2, JlGraphic } from 'jl-graphic';
import { IbpBox } from 'src/graphics/ibpBox/IbpBox';
import { PslBox } from 'src/graphics/pslBox/PslBox';
import { CarWashing } from 'src/graphics/carWashing/CarWashing';
-import { FloodGate } from 'src/graphics/floodGate/FloodGate';
import { GarageDoor } from 'src/graphics/garageDoor/GarageDoor';
-import { GarageDoorBox } from 'src/graphics/garageDoorBox/GarageDoorBox';
const $q = useQuasar();
const route = useRoute();
@@ -444,9 +442,7 @@ onMounted(() => {
IbpBox.Type,
PslBox.Type,
CarWashing.Type,
- FloodGate.Type,
GarageDoor.Type,
- GarageDoorBox.Type,
];
switch (drawStore.categoryType) {
case CategoryType.TH:
@@ -842,9 +838,6 @@ function oneClickRelateCentralizedStation() {
const carWashings = drawApp.queryStore
.queryByType(CarWashing.Type)
.filter((g) => containDeviceIds.includes(g.datas.linkSection));
- const floodGates = drawApp.queryStore
- .queryByType(FloodGate.Type)
- .filter((g) => containDeviceIds.includes(g.datas.linkSection));
const allSetCentralizedStationsDevice = [
...containDevices,
...signals,
@@ -852,7 +845,6 @@ function oneClickRelateCentralizedStation() {
...axleCountings,
...garageDoors,
...carWashings,
- ...floodGates,
];
allSetCentralizedStationsDevice.forEach(
(g) => ((g as Signal).datas.centralizedStations = [])