列車時刻表の表示バグ(の一部)修正

01397 · Oct 27, 2019 · 9a66b43 · 9a66b43
1 parent 55eede2
commit 9a66b43
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 12 deletions.
diff --git a/dist/js/DiagramParser.js b/dist/js/DiagramParser.js
diff --git a/dist/js/DiagramParser.js.map b/dist/js/DiagramParser.js.map
diff --git a/dist/js/components/TrainSubview.js b/dist/js/components/TrainSubview.js
diff --git a/dist/js/components/TrainSubview.js.map b/dist/js/components/TrainSubview.js.map
diff --git a/dist/js/components/TrainTimetableView.js b/dist/js/components/TrainTimetableView.js
diff --git a/dist/js/components/TrainTimetableView.js.map b/dist/js/components/TrainTimetableView.js.map
diff --git a/src/DiagramParser.ts b/src/DiagramParser.ts
@@ -652,6 +652,19 @@ export class StationTime {
     result.firstStationIndex = result._data.findIndex(v => v);
     return result;
   }
+  public update() {
+    const data = this._data;
+    let s: number = null,
+      e: number;
+    for (let i = 0; i < data.length; i++) {
+      if (!(i in data)) continue;
+      if (s === null) s = i;
+      if (data[i].stopType === 3) delete data[i];
+      e = i;
+    }
+    this.firstStationIndex = s;
+    this.terminalStationIndex = e;
+  }
   /**
    * 始発駅番号(方向別！！)
    */

diff --git a/src/components/TrainSubview.ts b/src/components/TrainSubview.ts
@@ -81,6 +81,7 @@ export default class TrainSubview extends Subview {
               track: null,
             };
           }
+          this.cellInfo.train.timetable.update();
           this.updateMainView();
         };
         const radio = new Array(3).fill(0).map((v, i) => {
@@ -227,7 +228,7 @@ export default class TrainSubview extends Subview {
     const stationIndex =
       this.cellInfo.train.direction === 0 ? this.cellInfo.stationIndex : this.app.data.railway.stations.length - this.cellInfo.stationIndex - 1;
     if (!this.cellInfo.train.timetable.data[stationIndex]) {
-      if (arrival.value !== '' || departure.value !== '') return;
+      //if (arrival.value !== '' || departure.value !== '') return;
       this.cellInfo.train.timetable.data[stationIndex] = {
         stopType: 1,
         arrival: null,
@@ -260,6 +261,7 @@ export default class TrainSubview extends Subview {
     departure.value = ttd.departure !== null ? numberToTimeString(ttd.departure, 'HH MM SS') : '';
     delta.value = ttd.arrival !== null && ttd.departure !== null ? numberToTimeString(ttd.departure - ttd.arrival, 'HH MM SS') : '';
     this.updateMainView();
+    this.cellInfo.train.timetable.update();
   }
   public focusField(type: string) {
     let field = null;

diff --git a/src/components/TrainTimetableView.ts b/src/components/TrainTimetableView.ts
@@ -58,8 +58,8 @@ export default class TrainTimetableView extends View {
       {
         label: '列車',
         submenu: [
-          { label: '左に列車を挿入', accelerator: 'Alt+Left', click: () => this.insertTrain(this.getActiveCell[0]) },
-          { label: '右に列車を挿入', accelerator: 'Alt+Right', click: () => this.insertTrain(this.getActiveCell[0] + 1) },
+          { label: '左に列車を挿入', accelerator: 'Alt+Left', click: () => this.insertTrain(this.getActiveCell().col) },
+          { label: '右に列車を挿入', accelerator: 'Alt+Right', click: () => this.insertTrain(this.getActiveCell().col + 1) },
         ],
       },
     ]);
@@ -509,7 +509,9 @@ export default class TrainTimetableView extends View {
   }
   private insertTrain(index: number) {
     const trainList = this.app.data.railway.diagrams[this.diaIndex].trains[this.direction];
-    trainList.splice(index, 0, new Train());
+    const train = new Train();
+    train.direction = this.direction;
+    trainList.splice(index, 0, train);
     this.update();
   }
   private selectCell(col: number, row: number, mode: 'select' | 'toggle' | 'adding' | 'deleting' = 'select') {