From 108516e0599fc14ba44389b2891a9a896c08ad6d Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed, 7 Jun 2023 15:20:34 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/DrawLayout.vue | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index f18354f..eb3619d 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -5,6 +5,21 @@
         <q-btn dense flat round icon="menu" @click="toggleLeftDrawer" />
 
         <q-toolbar-title>
+          <q-btn color="accent" label="功能菜单">
+            <q-menu>
+              <q-list style="min-width: 100px">
+                <q-item clickable v-close-popup @click="saveAllDrawDatas">
+                  <q-item-section>保存并校验</q-item-section>
+                </q-item>
+                <!--   <q-item clickable v-close-popup>
+                  <q-item-section>另存为</q-item-section>
+                </q-item> -->
+                <q-item clickable v-close-popup>
+                  <q-item-section>一键关联</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </q-btn>
           <q-btn-toggle
             v-model="selectUtil"
             color="brown"
@@ -121,7 +136,8 @@
 
 <script setup lang="ts">
 import DrawProperties from 'src/components/draw-app/DrawProperties.vue';
-import { getDrawApp, loadDrawDatas } from 'src/drawApp';
+import { getDrawApp, loadDrawDatas, saveDrawDatas } from 'src/drawApp';
+import { JlDrawApp } from 'src/jl-graphic';
 import { useDrawStore } from 'src/stores/draw-store';
 import { onMounted, onUnmounted, reactive, ref } from 'vue';
 import { useRoute } from 'vue-router';
@@ -229,6 +245,10 @@ function onResize() {
     drawApp.onDomResize(canvasWidth.value, canvasHeight.value);
   }
 }
+function saveAllDrawDatas() {
+  const drawApp = getDrawApp();
+  saveDrawDatas(drawApp as JlDrawApp);
+}
 
 onUnmounted(() => {
   drawStore.destroy();

From 3fff97ae87dd9c488d2e531d905d2331248d2c9b Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed, 7 Jun 2023 15:39:25 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/drawApp/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drawApp/index.ts b/src/drawApp/index.ts
index adf91fd..a466d0b 100644
--- a/src/drawApp/index.ts
+++ b/src/drawApp/index.ts
@@ -146,7 +146,7 @@ export function initDrawApp(dom: HTMLElement): JlDrawApp {
   );
   app.addKeyboardListener(
     new KeyListener({
-      value: 'KeyS',
+      value: 'KeyO',
       onPress: () => {
         app.interactionPlugin(Station.Type).resume();
       },

From 067afc4ddde1ccfb5b1a876d0f31fd6d7e3fc1c3 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed, 7 Jun 2023 15:44:30 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/DrawLayout.vue | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index eb3619d..685ffe0 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -2,9 +2,7 @@
   <q-layout view="hHh LpR fFf">
     <q-header reveal class="bg-primary text-white">
       <q-toolbar>
-        <q-btn dense flat round icon="menu" @click="toggleLeftDrawer" />
-
-        <q-toolbar-title>
+        <q-toolbar-title class="q-gutter-sm">
           <q-btn color="accent" label="功能菜单">
             <q-menu>
               <q-list style="min-width: 100px">
@@ -143,20 +141,11 @@ import { onMounted, onUnmounted, reactive, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 const route = useRoute();
-const selectUtil = ref();
-const utilsOption: ControlItem[] = reactive([]);
-const drawSelect = (item: string) => {
-  getDrawApp()?.interactionPlugin(item).resume();
-};
 
 const drawStore = useDrawStore();
 
 const leftDrawerOpen = ref(false);
 const rightDrawerOpen = ref(false);
-function toggleLeftDrawer() {
-  leftDrawerOpen.value = !leftDrawerOpen.value;
-  onResize();
-}
 function toggleRightDrawer() {
   rightDrawerOpen.value = !rightDrawerOpen.value;
   onResize();
@@ -164,6 +153,12 @@ function toggleRightDrawer() {
 
 const link = ref('outbox');
 
+//工具栏所用
+const selectUtil = ref();
+const utilsOption: ControlItem[] = reactive([]);
+const drawSelect = (item: string) => {
+  getDrawApp()?.interactionPlugin(item).resume();
+};
 class ControlItem {
   value: string;
   slot: string;

From 77d5a07672bfd27ddb06f61191b05c2a7066d3a6 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 7 Jun 2023 16:04:40 +0800
Subject: [PATCH 4/9] =?UTF-8?q?table=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/MainLayout.vue | 17 +++++++++++++++--
 src/pages/DraftManage.vue  | 14 +++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index de522e3..75c26d8 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,6 +1,7 @@
 <template>
   <q-layout view="hHh Lpr lFf">
     <q-header elevated>
+      <q-resize-observer @resize="onHeaderResize" />
       <q-toolbar>
         <q-btn
           flat
@@ -33,13 +34,16 @@
     </q-drawer>
 
     <q-page-container>
-      <router-view />
+      <q-resize-observer @resize="onResize" />
+      <q-scroll-area :style="{ height: scrollHeight + 'px' }">
+        <router-view :sizeHeight="scrollHeight" />
+      </q-scroll-area>
     </q-page-container>
   </q-layout>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, reactive } from 'vue';
 import SysMenu from 'src/components/SysMenu.vue';
 
 const leftDrawerOpen = ref(false);
@@ -47,4 +51,13 @@ const leftDrawerOpen = ref(false);
 function toggleLeftDrawer() {
   leftDrawerOpen.value = !leftDrawerOpen.value;
 }
+const scrollHeight = ref(100);
+function onResize() {
+  scrollHeight.value = window.innerHeight - headerSize.height;
+}
+const headerSize = reactive({} as { width: number; height: number });
+function onHeaderResize(size: { width: number; height: number }) {
+  headerSize.width = size.width;
+  headerSize.height = size.height;
+}
 </script>
diff --git a/src/pages/DraftManage.vue b/src/pages/DraftManage.vue
index dfd91e5..9849e66 100644
--- a/src/pages/DraftManage.vue
+++ b/src/pages/DraftManage.vue
@@ -3,6 +3,7 @@
     <q-table
       ref="tableRef"
       title="草稿图"
+      :style="{ height: tableHeight + 'px' }"
       :rows="rows"
       :columns="columnDefs"
       row-key="id"
@@ -103,7 +104,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted, computed } from 'vue';
 import { useQuasar, type QTableColumn } from 'quasar';
 import {
   pageQuery,
@@ -114,6 +115,17 @@ import {
 
 const $q = useQuasar();
 
+const props = withDefaults(
+  defineProps<{
+    sizeHeight: number;
+  }>(),
+  { sizeHeight: 500 }
+);
+
+const tableHeight = computed(() => {
+  return props.sizeHeight - 32;
+});
+
 onMounted(() => {
   tableRef.value.requestServerInteraction();
 });

From d3ea5832c0d545dbae3b94bf3ec3c0bc24a672ad Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 7 Jun 2023 16:05:41 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=BB=98=E5=9B=BE=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jl-graphic/app/JlGraphicApp.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jl-graphic/app/JlGraphicApp.ts b/src/jl-graphic/app/JlGraphicApp.ts
index 529f67d..d3b4f5a 100644
--- a/src/jl-graphic/app/JlGraphicApp.ts
+++ b/src/jl-graphic/app/JlGraphicApp.ts
@@ -894,7 +894,8 @@ export class GraphicApp extends EventEmitter<GraphicAppEvents> {
       }
     }
     this.interactionPluginMap.forEach((plugin) => {
-      plugin.pause();
+      // plugin.pause();
+      this.doPauseInteractionPlugin(plugin);
     });
     this.canvas.destroy(true);
     this.viewport.destroy();

From 265ff0a93973e5a1415a789fca517ce4a9178722 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 7 Jun 2023 17:21:25 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/DrawLayout.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index 685ffe0..93e6be9 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -36,7 +36,7 @@
             </template>
           </q-btn-toggle>
         </q-toolbar-title>
-
+        <q-btn color="info" label="返回" @click="backConfirm" />
         <q-btn dense flat round icon="menu" @click="toggleRightDrawer" />
       </q-toolbar>
       <q-resize-observer @resize="onHeaderResize" />
@@ -138,9 +138,10 @@ import { getDrawApp, loadDrawDatas, saveDrawDatas } from 'src/drawApp';
 import { JlDrawApp } from 'src/jl-graphic';
 import { useDrawStore } from 'src/stores/draw-store';
 import { onMounted, onUnmounted, reactive, ref } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 const route = useRoute();
+const router = useRouter();
 
 const drawStore = useDrawStore();
 
@@ -245,6 +246,10 @@ function saveAllDrawDatas() {
   saveDrawDatas(drawApp as JlDrawApp);
 }
 
+function backConfirm() {
+  router.go(-1);
+}
+
 onUnmounted(() => {
   drawStore.destroy();
 });

From 9dd01ac10eed11bc5e4426ffa0a4f689b3239c71 Mon Sep 17 00:00:00 2001
From: Yuan <yuanliyedefy@gmail.com>
Date: Thu, 8 Jun 2023 09:38:14 +0800
Subject: [PATCH 7/9] =?UTF-8?q?wip-=E9=81=93=E5=B2=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/drawApp/graphics/TurnoutInteraction.ts   |  75 ++++++
 src/drawApp/index.ts                         |  22 ++
 src/graphics/turnout/Turnout.ts              | 103 ++++++--
 src/graphics/turnout/TurnoutDrawAssistant.ts | 144 +++++++++++
 src/protos/stationLayoutGraphics.ts          | 236 ++++++++++++++++++-
 5 files changed, 557 insertions(+), 23 deletions(-)
 create mode 100644 src/drawApp/graphics/TurnoutInteraction.ts

diff --git a/src/drawApp/graphics/TurnoutInteraction.ts b/src/drawApp/graphics/TurnoutInteraction.ts
new file mode 100644
index 0000000..d2f32a4
--- /dev/null
+++ b/src/drawApp/graphics/TurnoutInteraction.ts
@@ -0,0 +1,75 @@
+import { ITrunoutData } from 'src/graphics/turnout/Turnout';
+import * as pb_1 from 'google-protobuf';
+import { GraphicDataBase } from './GraphicDataBase';
+import { graphicData } from 'src/protos/stationLayoutGraphics';
+import { IPointData } from 'pixi.js';
+import { GraphicData } from 'src/jl-graphic';
+
+export class TurnoutData extends GraphicDataBase implements ITrunoutData {
+  constructor(data?: graphicData.Turnout) {
+    let turnout;
+    if (!data) {
+      turnout = new graphicData.Turnout({
+        common: GraphicDataBase.defaultCommonInfo(),
+      });
+    } else {
+      turnout = data;
+    }
+    super(turnout);
+  }
+  get data(): graphicData.Turnout {
+    return this.getData<graphicData.Turnout>();
+  }
+
+  get code(): string {
+    return this.data.code;
+  }
+  set code(v: string) {
+    this.data.code = v;
+  }
+  get lineWidth(): number {
+    return this.data.lineWidth;
+  }
+  set lineWidth(v: number) {
+    this.data.lineWidth = v;
+  }
+  get lineColor(): string {
+    return this.data.lineColor;
+  }
+  set lineColor(v: string) {
+    this.data.lineColor = v;
+  }
+  get forkPoint(): IPointData {
+    return this.data.forkPoint;
+  }
+  set forkPoint(v: IPointData) {
+    this.data.forkPoint = new graphicData.Point({ x: v.x, y: v.y });
+  }
+  get pointA(): IPointData {
+    return this.data.pointA;
+  }
+  set pointA(v: IPointData) {
+    this.data.pointA = new graphicData.Point({ x: v.x, y: v.y });
+  }
+  get pointB(): IPointData {
+    return this.data.pointB;
+  }
+  set pointB(v: IPointData) {
+    this.data.pointB = new graphicData.Point({ x: v.x, y: v.y });
+  }
+  get pointC(): IPointData {
+    return this.data.pointC;
+  }
+  set pointC(v: IPointData) {
+    this.data.pointC = new graphicData.Point({ x: v.x, y: v.y });
+  }
+  clone(): TurnoutData {
+    return new TurnoutData(this.data.cloneMessage());
+  }
+  copyFrom(data: TurnoutData): void {
+    pb_1.Message.copyInto(data.data, this.data);
+  }
+  eq(other: TurnoutData): boolean {
+    return pb_1.Message.equals(this.data, other.data);
+  }
+}
diff --git a/src/drawApp/index.ts b/src/drawApp/index.ts
index dcbaaae..a4a196a 100644
--- a/src/drawApp/index.ts
+++ b/src/drawApp/index.ts
@@ -29,6 +29,9 @@ import { PlatformData } from './graphics/PlatformInteraction';
 import { StationData } from './graphics/StationInteraction';
 import { TrainData } from './graphics/TrainInteraction';
 import { graphicData } from 'src/protos/stationLayoutGraphics';
+import { Turnout } from 'src/graphics/turnout/Turnout';
+import { TurnoutDraw } from 'src/graphics/turnout/TurnoutDrawAssistant';
+import { TurnoutData } from './graphics/TurnoutInteraction';
 
 export function fromStoragePoint(p: graphicData.Point): Point {
   return new Point(p.x, p.y);
@@ -118,6 +121,9 @@ export function initDrawApp(dom: HTMLElement): JlDrawApp {
       new TrainDraw(app, () => {
         return new TrainData();
       }),
+      new TurnoutDraw(app, () => {
+        return new TurnoutData();
+      }),
     ],
   });
 
@@ -147,6 +153,15 @@ export function initDrawApp(dom: HTMLElement): JlDrawApp {
       },
     })
   );
+  app.addKeyboardListener(
+    new KeyListener({
+      value: 'KeyW',
+      onPress: () => {
+        console.log(app.interactionPlugin(Turnout.Type));
+        app.interactionPlugin(Turnout.Type).resume();
+      },
+    })
+  );
   app.addKeyboardListener(
     new KeyListener({
       value: 'KeyR',
@@ -159,6 +174,7 @@ export function initDrawApp(dom: HTMLElement): JlDrawApp {
     new KeyListener({
       value: 'KeyF',
       onPress: () => {
+        console.log(1);
         app.interactionPlugin(IscsFan.Type).resume();
       },
     })
@@ -240,6 +256,9 @@ export function saveDrawDatas(app: JlDrawApp) {
     } else if (Train.Type === g.type) {
       const trainData = (g as Train).saveData();
       storage.train.push((trainData as TrainData).data);
+    } else if (Turnout.Type === g.type) {
+      const turnoutData = (g as Turnout).saveData();
+      storage.turnouts.push((turnoutData as TurnoutData).data);
     }
   });
   const base64 = fromUint8Array(storage.serialize());
@@ -276,6 +295,9 @@ export function loadDrawDatas(app: GraphicApp) {
     storage.train.forEach((train) => {
       datas.push(new TrainData(train));
     });
+    storage.turnouts.forEach((turnout) => {
+      datas.push(new TurnoutData(turnout));
+    });
     app.loadGraphic(datas);
   } else {
     app.loadGraphic([]);
diff --git a/src/graphics/turnout/Turnout.ts b/src/graphics/turnout/Turnout.ts
index 67fbc62..aec3862 100644
--- a/src/graphics/turnout/Turnout.ts
+++ b/src/graphics/turnout/Turnout.ts
@@ -1,53 +1,120 @@
 import { Color, Graphics, IPointData } from 'pixi.js';
-import { GraphicData, JlGraphic } from 'src/jl-graphic';
+import {
+  GraphicData,
+  GraphicState,
+  JlGraphic,
+  JlGraphicTemplate,
+  VectorText,
+} from 'src/jl-graphic';
 
 export interface ITrunoutData extends GraphicData {
   get code(): string;
   set code(code: string);
   get lineWidth(): number;
-  set lineWidth(code: number);
+  set lineWidth(width: number);
   get lineColor(): string;
-  set lineColor(code: string);
+  set lineColor(color: string);
+  get forkPoint(): IPointData;
+  set forkPoint(point: IPointData);
   get pointA(): IPointData;
-  set pointA(code: IPointData);
+  set pointA(point: IPointData);
   get pointB(): IPointData;
-  set pointB(code: IPointData);
+  set pointB(point: IPointData);
   get pointC(): IPointData;
-  set pointC(code: IPointData);
+  set pointC(point: IPointData);
   clone(): ITrunoutData;
   copyFrom(data: ITrunoutData): void;
   eq(other: ITrunoutData): boolean;
 }
 
+export enum TurnoutPosition {
+  NORMAL = 0,
+  REVERSE = 1,
+}
+
+export interface ITurnoutState extends GraphicState {
+  position: TurnoutPosition;
+}
+
 export class Turnout extends JlGraphic {
   static Type = 'Turnout';
   graphics: {
-    forkPoint: {
-      AB: Graphics;
-      AC: Graphics;
-    };
+    fork: Graphics;
+    sections: Graphics;
+    label: VectorText;
   };
 
   constructor() {
     super(Turnout.Type);
     this.graphics = {
-      forkPoint: { AB: new Graphics(), AC: new Graphics() },
+      fork: new Graphics(),
+      sections: new Graphics(),
+      label: new VectorText(),
     };
+    this.addChild(this.graphics.fork);
+    this.addChild(this.graphics.sections);
+    this.graphics.label.anchor.set(0.5);
+    this.graphics.label.style.fill = '#0f0';
+    this.graphics.label.setVectorFontSize(16);
+    this.addChild(this.graphics.label);
   }
 
   get datas(): ITrunoutData {
     return this.getDatas<ITrunoutData>();
   }
+  get states(): ITurnoutState {
+    return this.getStates<ITurnoutState>();
+  }
 
   doRepaint(): void {
-    const { pointA, pointB, pointC } = this.datas;
+    const { pointA, pointB, pointC, forkPoint } = this.datas;
+    const intersectB = Turnout.getIntersectionPoint(forkPoint, 20, pointB);
+    const intersectC = Turnout.getIntersectionPoint(forkPoint, 20, pointC);
 
-    const forkPoint: IPointData = {
-      x: pointA.x + (pointB.x - pointA.x),
-      y: pointA.y + (pointB.y - pointA.y),
-    };
+    this.graphics.sections
+      .clear()
+      .lineStyle(this.datas.lineWidth, new Color(this.datas.lineColor))
+      .moveTo(pointA.x, pointA.y)
+      .lineTo(forkPoint.x, forkPoint.y)
+      .moveTo(pointB.x, pointB.y)
+      .lineTo(intersectB.x, intersectB.y)
+      .moveTo(pointC.x, pointC.y)
+      .lineTo(intersectC.x, intersectC.y);
 
-    // this.lineGraphic.clear();
-    // this.lineGraphic.lineStyle(this.datas.lineWidth, new Color());
+    this.graphics.fork
+      .clear()
+      .lineStyle(this.datas.lineWidth, new Color(this.datas.lineColor))
+      .moveTo(forkPoint.x, forkPoint.y)
+      .lineTo(intersectB.x, intersectB.y);
+
+    this.graphics.label.text = this.datas.code;
+    this.graphics.label.position.set(
+      this.datas.forkPoint.x + 20,
+      this.datas.forkPoint.y + 20
+    );
+  }
+
+  static getIntersectionPoint(
+    c: IPointData,
+    r: number,
+    p: IPointData
+  ): IPointData {
+    const len = Math.sqrt((c.x - p.x) ** 2 + (c.y - p.y) ** 2);
+    const scale = r / len;
+    return { x: c.x + scale * (p.x - c.x), y: c.y + scale * (p.y - c.y) };
+  }
+}
+
+export class TurnoutTemplate extends JlGraphicTemplate<Turnout> {
+  lineWidth: number;
+  lineColor: string;
+  constructor() {
+    super(Turnout.Type);
+    this.lineWidth = 5;
+    this.lineColor = '#5578b6';
+  }
+
+  new() {
+    return new Turnout();
   }
 }
diff --git a/src/graphics/turnout/TurnoutDrawAssistant.ts b/src/graphics/turnout/TurnoutDrawAssistant.ts
index e69de29..5dcb9ac 100644
--- a/src/graphics/turnout/TurnoutDrawAssistant.ts
+++ b/src/graphics/turnout/TurnoutDrawAssistant.ts
@@ -0,0 +1,144 @@
+import {
+  DraggablePoint,
+  GraphicApp,
+  GraphicDrawAssistant,
+  GraphicInteractionPlugin,
+  JlDrawApp,
+  JlGraphic,
+  linePoint,
+} from 'src/jl-graphic';
+import { ITrunoutData, Turnout, TurnoutTemplate } from './Turnout';
+import {
+  DisplayObject,
+  FederatedMouseEvent,
+  Graphics,
+  IHitArea,
+  IPointData,
+  Point,
+} from 'pixi.js';
+import { PolylineEditPlugin } from 'src/jl-graphic/plugins/GraphicEditPlugin';
+
+export class TurnoutDraw extends GraphicDrawAssistant<
+  TurnoutTemplate,
+  ITrunoutData
+> {
+  graphic = new Graphics();
+  point: Point = new Point(0, 0);
+  constructor(app: JlDrawApp, createData: () => ITrunoutData) {
+    super(app, new TurnoutTemplate(), createData, Turnout.Type, '道岔Turnout');
+    this.container.addChild(this.graphic);
+  }
+
+  onLeftDown(e: FederatedMouseEvent): void {
+    console.log(e);
+    this.createAndStore(true);
+  }
+
+  prepareData(data: ITrunoutData): boolean {
+    data.forkPoint = this.point;
+    data.lineColor = this.graphicTemplate.lineColor;
+    data.lineWidth = this.graphicTemplate.lineWidth;
+    data.forkPoint = this.point;
+    const { pointA, pointB, pointC } = this.getDefaultEndPoint(this.point);
+    data.pointA = pointA;
+    data.pointB = pointB;
+    data.pointC = pointC;
+    data.code = 'AAA';
+    return true;
+  }
+
+  getDefaultEndPoint(p: IPointData): {
+    pointA: IPointData;
+    pointB: IPointData;
+    pointC: IPointData;
+  } {
+    return {
+      pointA: new Point(p.x + 50, p.y),
+      pointB: new Point(p.x - 50, p.y),
+      pointC: new Point(p.x - 50, p.y - 50),
+    };
+  }
+
+  redraw(cp: Point): void {
+    const { pointA, pointB, pointC } = this.getDefaultEndPoint(cp);
+
+    const intersectC = Turnout.getIntersectionPoint(cp, 20, pointC);
+
+    this.graphic
+      .clear()
+      .lineStyle(this.graphicTemplate.lineWidth, this.graphicTemplate.lineColor)
+      .moveTo(pointA.x, pointA.y)
+      .lineTo(cp.x, cp.y)
+      .moveTo(pointB.x, pointB.y)
+      .lineTo(cp.x, cp.y)
+      .moveTo(pointC.x, pointC.y)
+      .lineTo(intersectC.x, intersectC.y);
+
+    this.point.set(cp.x, cp.y);
+  }
+}
+
+export class TurnoutHitArea implements IHitArea {
+  turnout: Turnout;
+  constructor(turnout: Turnout) {
+    this.turnout = turnout;
+  }
+  contains(x: number, y: number): boolean {
+    const { pointA, pointB, pointC, forkPoint } = this.turnout.datas;
+    return (
+      linePoint(pointA, forkPoint, { x, y }, this.turnout.datas.lineWidth) ||
+      linePoint(pointB, forkPoint, { x, y }, this.turnout.datas.lineWidth) ||
+      linePoint(pointC, forkPoint, { x, y }, this.turnout.datas.lineWidth)
+    );
+  }
+}
+
+// function onEditPointCreate(
+//   g: ILineGraphic,
+//   dp: DraggablePoint,
+//   index: number
+// ): void {
+//   const link = g as Link;
+//   if (index === 0 || index == link.datas.points.length - 1) {
+//     // 端点
+//     dp.on('transformstart', (e: GraphicTransformEvent) => {
+//       if (e.isShift()) {
+//         link.getGraphicApp().setOptions({
+//           absorbablePositions: buildAbsorbablePositions(link),
+//         });
+//       }
+//     });
+//   }
+// }
+
+export class TurnoutPointsEditPlugin extends GraphicInteractionPlugin<Turnout> {
+  static Name = 'TurnoutPointsDrag';
+  constructor(app: GraphicApp) {
+    super(TurnoutPointsEditPlugin.Name, app);
+  }
+  bind(g: Turnout): void {
+    g.graphics.sections.eventMode = 'static';
+    g.graphics.sections.cursor = 'pointer';
+    g.graphics.fork.eventMode = 'static';
+    g.graphics.fork.cursor = 'pointer';
+    g.hitArea = new TurnoutHitArea(g);
+    g.on('selected', this.onSelected, this);
+  }
+  unbind(g: Turnout): void {
+    g.off('selected', this.onSelected, this);
+  }
+  onSelected(g: DisplayObject) {
+    console.log(g);
+    // const turnout = g as Turnout;
+    // let editPlugin = turnout.getAssistantAppend<PolylineEditPlugin>(
+    //   PolylineEditPlugin.Name
+    // );
+    // if (!editPlugin) {
+    //   // editPlugin = new PolylineEditPlugin(turnout, { onEditPointCreate });
+    //   // turnout.addAssistantAppend(editPlugin);
+    // }
+  }
+  filter(...grahpics: JlGraphic[]): Turnout[] | undefined {
+    return grahpics.filter((g) => g.type == Turnout.Type) as Turnout[];
+  }
+}
diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts
index 29c99e3..b4b9f48 100644
--- a/src/protos/stationLayoutGraphics.ts
+++ b/src/protos/stationLayoutGraphics.ts
@@ -15,9 +15,10 @@ export namespace graphicData {
             stations?: Station[];
             Rects?: Rect[];
             train?: Train[];
+            turnouts?: Turnout[];
         }) {
             super();
-            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 3, 4, 5, 6, 7], this.#one_of_decls);
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 3, 4, 5, 6, 7, 8], this.#one_of_decls);
             if (!Array.isArray(data) && typeof data == "object") {
                 if ("canvas" in data && data.canvas != undefined) {
                     this.canvas = data.canvas;
@@ -40,6 +41,9 @@ export namespace graphicData {
                 if ("train" in data && data.train != undefined) {
                     this.train = data.train;
                 }
+                if ("turnouts" in data && data.turnouts != undefined) {
+                    this.turnouts = data.turnouts;
+                }
             }
         }
         get canvas() {
@@ -87,6 +91,12 @@ export namespace graphicData {
         set train(value: Train[]) {
             pb_1.Message.setRepeatedWrapperField(this, 7, value);
         }
+        get turnouts() {
+            return pb_1.Message.getRepeatedWrapperField(this, Turnout, 8) as Turnout[];
+        }
+        set turnouts(value: Turnout[]) {
+            pb_1.Message.setRepeatedWrapperField(this, 8, value);
+        }
         static fromObject(data: {
             canvas?: ReturnType<typeof Canvas.prototype.toObject>;
             links?: ReturnType<typeof Link.prototype.toObject>[];
@@ -95,6 +105,7 @@ export namespace graphicData {
             stations?: ReturnType<typeof Station.prototype.toObject>[];
             Rects?: ReturnType<typeof Rect.prototype.toObject>[];
             train?: ReturnType<typeof Train.prototype.toObject>[];
+            turnouts?: ReturnType<typeof Turnout.prototype.toObject>[];
         }): RtssGraphicStorage {
             const message = new RtssGraphicStorage({});
             if (data.canvas != null) {
@@ -118,6 +129,9 @@ export namespace graphicData {
             if (data.train != null) {
                 message.train = data.train.map(item => Train.fromObject(item));
             }
+            if (data.turnouts != null) {
+                message.turnouts = data.turnouts.map(item => Turnout.fromObject(item));
+            }
             return message;
         }
         toObject() {
@@ -129,6 +143,7 @@ export namespace graphicData {
                 stations?: ReturnType<typeof Station.prototype.toObject>[];
                 Rects?: ReturnType<typeof Rect.prototype.toObject>[];
                 train?: ReturnType<typeof Train.prototype.toObject>[];
+                turnouts?: ReturnType<typeof Turnout.prototype.toObject>[];
             } = {};
             if (this.canvas != null) {
                 data.canvas = this.canvas.toObject();
@@ -151,6 +166,9 @@ export namespace graphicData {
             if (this.train != null) {
                 data.train = this.train.map((item: Train) => item.toObject());
             }
+            if (this.turnouts != null) {
+                data.turnouts = this.turnouts.map((item: Turnout) => item.toObject());
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -171,6 +189,8 @@ export namespace graphicData {
                 writer.writeRepeatedMessage(6, this.Rects, (item: Rect) => item.serialize(writer));
             if (this.train.length)
                 writer.writeRepeatedMessage(7, this.train, (item: Train) => item.serialize(writer));
+            if (this.turnouts.length)
+                writer.writeRepeatedMessage(8, this.turnouts, (item: Turnout) => item.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -201,6 +221,9 @@ export namespace graphicData {
                     case 7:
                         reader.readMessage(message.train, () => pb_1.Message.addToRepeatedWrapperField(message, 7, Train.deserialize(reader), Train));
                         break;
+                    case 8:
+                        reader.readMessage(message.turnouts, () => pb_1.Message.addToRepeatedWrapperField(message, 8, Turnout.deserialize(reader), Turnout));
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -2268,23 +2291,202 @@ export namespace graphicData {
     }
     export class Turnout extends pb_1.Message {
         #one_of_decls: number[][] = [];
-        constructor(data?: any[] | {}) {
+        constructor(data?: any[] | {
+            common?: CommonInfo;
+            code?: string;
+            lineColor?: string;
+            lineWidth?: number;
+            forkPoint?: Point;
+            pointA?: Point;
+            pointB?: Point;
+            pointC?: Point;
+        }) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
-            if (!Array.isArray(data) && typeof data == "object") { }
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("common" in data && data.common != undefined) {
+                    this.common = data.common;
+                }
+                if ("code" in data && data.code != undefined) {
+                    this.code = data.code;
+                }
+                if ("lineColor" in data && data.lineColor != undefined) {
+                    this.lineColor = data.lineColor;
+                }
+                if ("lineWidth" in data && data.lineWidth != undefined) {
+                    this.lineWidth = data.lineWidth;
+                }
+                if ("forkPoint" in data && data.forkPoint != undefined) {
+                    this.forkPoint = data.forkPoint;
+                }
+                if ("pointA" in data && data.pointA != undefined) {
+                    this.pointA = data.pointA;
+                }
+                if ("pointB" in data && data.pointB != undefined) {
+                    this.pointB = data.pointB;
+                }
+                if ("pointC" in data && data.pointC != undefined) {
+                    this.pointC = data.pointC;
+                }
+            }
         }
-        static fromObject(data: {}): Turnout {
+        get common() {
+            return pb_1.Message.getWrapperField(this, CommonInfo, 1) as CommonInfo;
+        }
+        set common(value: CommonInfo) {
+            pb_1.Message.setWrapperField(this, 1, value);
+        }
+        get has_common() {
+            return pb_1.Message.getField(this, 1) != null;
+        }
+        get code() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set code(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        get lineColor() {
+            return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
+        }
+        set lineColor(value: string) {
+            pb_1.Message.setField(this, 3, value);
+        }
+        get lineWidth() {
+            return pb_1.Message.getFieldWithDefault(this, 4, 0) as number;
+        }
+        set lineWidth(value: number) {
+            pb_1.Message.setField(this, 4, value);
+        }
+        get forkPoint() {
+            return pb_1.Message.getWrapperField(this, Point, 5) as Point;
+        }
+        set forkPoint(value: Point) {
+            pb_1.Message.setWrapperField(this, 5, value);
+        }
+        get has_forkPoint() {
+            return pb_1.Message.getField(this, 5) != null;
+        }
+        get pointA() {
+            return pb_1.Message.getWrapperField(this, Point, 6) as Point;
+        }
+        set pointA(value: Point) {
+            pb_1.Message.setWrapperField(this, 6, value);
+        }
+        get has_pointA() {
+            return pb_1.Message.getField(this, 6) != null;
+        }
+        get pointB() {
+            return pb_1.Message.getWrapperField(this, Point, 7) as Point;
+        }
+        set pointB(value: Point) {
+            pb_1.Message.setWrapperField(this, 7, value);
+        }
+        get has_pointB() {
+            return pb_1.Message.getField(this, 7) != null;
+        }
+        get pointC() {
+            return pb_1.Message.getWrapperField(this, Point, 8) as Point;
+        }
+        set pointC(value: Point) {
+            pb_1.Message.setWrapperField(this, 8, value);
+        }
+        get has_pointC() {
+            return pb_1.Message.getField(this, 8) != null;
+        }
+        static fromObject(data: {
+            common?: ReturnType<typeof CommonInfo.prototype.toObject>;
+            code?: string;
+            lineColor?: string;
+            lineWidth?: number;
+            forkPoint?: ReturnType<typeof Point.prototype.toObject>;
+            pointA?: ReturnType<typeof Point.prototype.toObject>;
+            pointB?: ReturnType<typeof Point.prototype.toObject>;
+            pointC?: ReturnType<typeof Point.prototype.toObject>;
+        }): Turnout {
             const message = new Turnout({});
+            if (data.common != null) {
+                message.common = CommonInfo.fromObject(data.common);
+            }
+            if (data.code != null) {
+                message.code = data.code;
+            }
+            if (data.lineColor != null) {
+                message.lineColor = data.lineColor;
+            }
+            if (data.lineWidth != null) {
+                message.lineWidth = data.lineWidth;
+            }
+            if (data.forkPoint != null) {
+                message.forkPoint = Point.fromObject(data.forkPoint);
+            }
+            if (data.pointA != null) {
+                message.pointA = Point.fromObject(data.pointA);
+            }
+            if (data.pointB != null) {
+                message.pointB = Point.fromObject(data.pointB);
+            }
+            if (data.pointC != null) {
+                message.pointC = Point.fromObject(data.pointC);
+            }
             return message;
         }
         toObject() {
-            const data: {} = {};
+            const data: {
+                common?: ReturnType<typeof CommonInfo.prototype.toObject>;
+                code?: string;
+                lineColor?: string;
+                lineWidth?: number;
+                forkPoint?: ReturnType<typeof Point.prototype.toObject>;
+                pointA?: ReturnType<typeof Point.prototype.toObject>;
+                pointB?: ReturnType<typeof Point.prototype.toObject>;
+                pointC?: ReturnType<typeof Point.prototype.toObject>;
+            } = {};
+            if (this.common != null) {
+                data.common = this.common.toObject();
+            }
+            if (this.code != null) {
+                data.code = this.code;
+            }
+            if (this.lineColor != null) {
+                data.lineColor = this.lineColor;
+            }
+            if (this.lineWidth != null) {
+                data.lineWidth = this.lineWidth;
+            }
+            if (this.forkPoint != null) {
+                data.forkPoint = this.forkPoint.toObject();
+            }
+            if (this.pointA != null) {
+                data.pointA = this.pointA.toObject();
+            }
+            if (this.pointB != null) {
+                data.pointB = this.pointB.toObject();
+            }
+            if (this.pointC != null) {
+                data.pointC = this.pointC.toObject();
+            }
             return data;
         }
         serialize(): Uint8Array;
         serialize(w: pb_1.BinaryWriter): void;
         serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
             const writer = w || new pb_1.BinaryWriter();
+            if (this.has_common)
+                writer.writeMessage(1, this.common, () => this.common.serialize(writer));
+            if (this.code.length)
+                writer.writeString(2, this.code);
+            if (this.lineColor.length)
+                writer.writeString(3, this.lineColor);
+            if (this.lineWidth != 0)
+                writer.writeInt32(4, this.lineWidth);
+            if (this.has_forkPoint)
+                writer.writeMessage(5, this.forkPoint, () => this.forkPoint.serialize(writer));
+            if (this.has_pointA)
+                writer.writeMessage(6, this.pointA, () => this.pointA.serialize(writer));
+            if (this.has_pointB)
+                writer.writeMessage(7, this.pointB, () => this.pointB.serialize(writer));
+            if (this.has_pointC)
+                writer.writeMessage(8, this.pointC, () => this.pointC.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -2294,6 +2496,30 @@ export namespace graphicData {
                 if (reader.isEndGroup())
                     break;
                 switch (reader.getFieldNumber()) {
+                    case 1:
+                        reader.readMessage(message.common, () => message.common = CommonInfo.deserialize(reader));
+                        break;
+                    case 2:
+                        message.code = reader.readString();
+                        break;
+                    case 3:
+                        message.lineColor = reader.readString();
+                        break;
+                    case 4:
+                        message.lineWidth = reader.readInt32();
+                        break;
+                    case 5:
+                        reader.readMessage(message.forkPoint, () => message.forkPoint = Point.deserialize(reader));
+                        break;
+                    case 6:
+                        reader.readMessage(message.pointA, () => message.pointA = Point.deserialize(reader));
+                        break;
+                    case 7:
+                        reader.readMessage(message.pointB, () => message.pointB = Point.deserialize(reader));
+                        break;
+                    case 8:
+                        reader.readMessage(message.pointC, () => message.pointC = Point.deserialize(reader));
+                        break;
                     default: reader.skipField();
                 }
             }

From 84e6771c9de6d8d3f142e8e8732d11455876089b Mon Sep 17 00:00:00 2001
From: Yuan <yuanliyedefy@gmail.com>
Date: Thu, 8 Jun 2023 09:40:12 +0800
Subject: [PATCH 8/9] merge

---
 src/protos/stationLayoutGraphics.ts | 46 -----------------------------
 xian-ncc-da-message                 |  2 +-
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts
index b4b9f48..b81cbdf 100644
--- a/src/protos/stationLayoutGraphics.ts
+++ b/src/protos/stationLayoutGraphics.ts
@@ -2294,8 +2294,6 @@ export namespace graphicData {
         constructor(data?: any[] | {
             common?: CommonInfo;
             code?: string;
-            lineColor?: string;
-            lineWidth?: number;
             forkPoint?: Point;
             pointA?: Point;
             pointB?: Point;
@@ -2310,12 +2308,6 @@ export namespace graphicData {
                 if ("code" in data && data.code != undefined) {
                     this.code = data.code;
                 }
-                if ("lineColor" in data && data.lineColor != undefined) {
-                    this.lineColor = data.lineColor;
-                }
-                if ("lineWidth" in data && data.lineWidth != undefined) {
-                    this.lineWidth = data.lineWidth;
-                }
                 if ("forkPoint" in data && data.forkPoint != undefined) {
                     this.forkPoint = data.forkPoint;
                 }
@@ -2345,18 +2337,6 @@ export namespace graphicData {
         set code(value: string) {
             pb_1.Message.setField(this, 2, value);
         }
-        get lineColor() {
-            return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
-        }
-        set lineColor(value: string) {
-            pb_1.Message.setField(this, 3, value);
-        }
-        get lineWidth() {
-            return pb_1.Message.getFieldWithDefault(this, 4, 0) as number;
-        }
-        set lineWidth(value: number) {
-            pb_1.Message.setField(this, 4, value);
-        }
         get forkPoint() {
             return pb_1.Message.getWrapperField(this, Point, 5) as Point;
         }
@@ -2396,8 +2376,6 @@ export namespace graphicData {
         static fromObject(data: {
             common?: ReturnType<typeof CommonInfo.prototype.toObject>;
             code?: string;
-            lineColor?: string;
-            lineWidth?: number;
             forkPoint?: ReturnType<typeof Point.prototype.toObject>;
             pointA?: ReturnType<typeof Point.prototype.toObject>;
             pointB?: ReturnType<typeof Point.prototype.toObject>;
@@ -2410,12 +2388,6 @@ export namespace graphicData {
             if (data.code != null) {
                 message.code = data.code;
             }
-            if (data.lineColor != null) {
-                message.lineColor = data.lineColor;
-            }
-            if (data.lineWidth != null) {
-                message.lineWidth = data.lineWidth;
-            }
             if (data.forkPoint != null) {
                 message.forkPoint = Point.fromObject(data.forkPoint);
             }
@@ -2434,8 +2406,6 @@ export namespace graphicData {
             const data: {
                 common?: ReturnType<typeof CommonInfo.prototype.toObject>;
                 code?: string;
-                lineColor?: string;
-                lineWidth?: number;
                 forkPoint?: ReturnType<typeof Point.prototype.toObject>;
                 pointA?: ReturnType<typeof Point.prototype.toObject>;
                 pointB?: ReturnType<typeof Point.prototype.toObject>;
@@ -2447,12 +2417,6 @@ export namespace graphicData {
             if (this.code != null) {
                 data.code = this.code;
             }
-            if (this.lineColor != null) {
-                data.lineColor = this.lineColor;
-            }
-            if (this.lineWidth != null) {
-                data.lineWidth = this.lineWidth;
-            }
             if (this.forkPoint != null) {
                 data.forkPoint = this.forkPoint.toObject();
             }
@@ -2475,10 +2439,6 @@ export namespace graphicData {
                 writer.writeMessage(1, this.common, () => this.common.serialize(writer));
             if (this.code.length)
                 writer.writeString(2, this.code);
-            if (this.lineColor.length)
-                writer.writeString(3, this.lineColor);
-            if (this.lineWidth != 0)
-                writer.writeInt32(4, this.lineWidth);
             if (this.has_forkPoint)
                 writer.writeMessage(5, this.forkPoint, () => this.forkPoint.serialize(writer));
             if (this.has_pointA)
@@ -2502,12 +2462,6 @@ export namespace graphicData {
                     case 2:
                         message.code = reader.readString();
                         break;
-                    case 3:
-                        message.lineColor = reader.readString();
-                        break;
-                    case 4:
-                        message.lineWidth = reader.readInt32();
-                        break;
                     case 5:
                         reader.readMessage(message.forkPoint, () => message.forkPoint = Point.deserialize(reader));
                         break;
diff --git a/xian-ncc-da-message b/xian-ncc-da-message
index eb0340f..e7a80d7 160000
--- a/xian-ncc-da-message
+++ b/xian-ncc-da-message
@@ -1 +1 @@
-Subproject commit eb0340f7d2fafef7fb77833f113ca19e3b144791
+Subproject commit e7a80d731e2ed31e09a5944269796811c9e21cf3

From ab911061078216285439ad03073683a948c98cfa Mon Sep 17 00:00:00 2001
From: Yuan <yuanliyedefy@gmail.com>
Date: Thu, 8 Jun 2023 09:44:53 +0800
Subject: [PATCH 9/9] merge

---
 xian-ncc-da-message | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xian-ncc-da-message b/xian-ncc-da-message
index e7a80d7..2e001ed 160000
--- a/xian-ncc-da-message
+++ b/xian-ncc-da-message
@@ -1 +1 @@
-Subproject commit e7a80d731e2ed31e09a5944269796811c9e21cf3
+Subproject commit 2e001eddeeeaea3aa9c607df72d2196572a717da