@fmsim/machine 2.0.0-beta.10 → 2.0.0-beta.100

package/src/utils/stocker-gauge.ts

@@ -0,0 +1,111 @@
+/*
+ * 스토커 게이지 세그먼트 계산 (2D/3D 공통 단일 소스).
+ *
+ * 2D(StockerCapacityBar) 와 3D(machine-3d buildGauge) 가 각자 세그먼트 비율/색상을
+ * 중복 계산하면 필드/색상 drift 가 발생한다(실제로 carrier 필드명이 어긋난 전례).
+ * 이 모듈이 carrier/abnormal 세그먼트 계산의 단일 소스이며 순수 함수라 단위 테스트가
+ * 용이하다. 표현(라벨 포맷·watermark·테두리색)은 렌더러별로 다르므로 여기서 다루지 않는다.
+ *
+ * canonical 데이터 필드(2D 기준):
+ *  - carrier  : CARRIER_FULL / CARRIER_EMPTY / CARRIER_EMPTY_EMPTY
+ *  - abnormal : CARRIER_NORMAL / CARRIER_ABNORMAL
+ */
+
+import { Legend } from '../features/mcs-status-default'
+
+export type StockerGaugeMode = 'capacity' | 'carrier' | 'abnormal'
+
+export interface GaugeSegment {
+  /** 세그먼트 라벨(2D per-segment 표시용, '\n' 은 줄바꿈). */
+  label: string
+  /** 카운트 원본값. */
+  count: number
+  /** 전체 대비 비율 (0~1). total 이 0 이면 0. */
+  ratio: number
+  /** 채움 색상. */
+  color: string
+}
+
+/** carrier 세그먼트 색상 (2D/3D 공통). LEGEND_CARRIER 기본값과 동일 — 테마 미지정 시 폴백. */
+export const CARRIER_COLORS = {
+  full: '#4AA7FE',
+  empty: '#8BDA5B',
+  emptyEmpty: '#019D59'
+}
+
+export interface CarrierColors {
+  full: string
+  empty: string
+  emptyEmpty: string
+}
+
+/**
+ * carrier legend(테마)에서 full/empty/emptyEmpty 색상 추출.
+ * carrier 컴포넌트의 색 취득 로직(statusColor = legend[status] || legend.default)과 동일하게,
+ * status 키(FULL/EMPTY/EMPTYEMPTY)로 직접 조회한다. 키/default 모두 없으면 CARRIER_COLORS 로 폴백.
+ */
+export function carrierColorsFromLegend(legend?: Legend): CarrierColors {
+  const pick = (key: string, fallback: string) => (legend && (legend[key] || legend.default)) || fallback
+  return {
+    full: pick('FULL', CARRIER_COLORS.full),
+    empty: pick('EMPTY', CARRIER_COLORS.empty),
+    emptyEmpty: pick('EMPTYEMPTY', CARRIER_COLORS.emptyEmpty)
+  }
+}
+
+/** abnormal 세그먼트 색상 (2D/3D 공통). */
+export const ABNORMAL_COLORS = {
+  normal: '#8BDA5B',
+  abnormal: '#F4B4B4'
+}
+
+function num(v: unknown): number {
+  const n = Number(v)
+  return Number.isFinite(n) && n > 0 ? n : 0
+}
+
+/**
+ * 캐리어 상태 세그먼트 (Full / Empty / EmptyEmpty). total 0 이면 모든 ratio 0.
+ * colors 미지정 시 CARRIER_COLORS(기본). 테마 색은 carrierColorsFromLegend 로 만들어 전달.
+ */
+export function carrierSegments(
+  full: unknown,
+  empty: unknown,
+  emptyEmpty: unknown,
+  colors: CarrierColors = CARRIER_COLORS
+): GaugeSegment[] {
+  const f = num(full)
+  const e = num(empty)
+  const ee = num(emptyEmpty)
+  const total = f + e + ee
+  const r = (c: number) => (total > 0 ? c / total : 0)
+  return [
+    { label: 'Full', count: f, ratio: r(f), color: colors.full },
+    { label: 'Empty', count: e, ratio: r(e), color: colors.empty },
+    { label: 'Empty\nEmpty', count: ee, ratio: r(ee), color: colors.emptyEmpty }
+  ]
+}
+
+/** 캐리어 정상/비정상 세그먼트 (Normal / Abnormal). total 0 이면 모든 ratio 0. */
+export function abnormalSegments(normal: unknown, abnormal: unknown): GaugeSegment[] {
+  const n = num(normal)
+  const a = num(abnormal)
+  const total = n + a
+  const r = (c: number) => (total > 0 ? c / total : 0)
+  return [
+    { label: 'Normal', count: n, ratio: r(n), color: ABNORMAL_COLORS.normal },
+    { label: 'Abnormal', count: a, ratio: r(a), color: ABNORMAL_COLORS.abnormal }
+  ]
+}
+
+/** 캐리어 세그먼트 — canonical raw data(CARRIER_*) 에서 직접. 3D 처럼 raw data 소스용. */
+export function carrierSegmentsFromData(data: any, colors?: CarrierColors): GaugeSegment[] {
+  const d = data && typeof data === 'object' ? data : {}
+  return carrierSegments(d.CARRIER_FULL, d.CARRIER_EMPTY, d.CARRIER_EMPTY_EMPTY, colors)
+}
+
+/** 비정상 세그먼트 — canonical raw data(CARRIER_*) 에서 직접. */
+export function abnormalSegmentsFromData(data: any): GaugeSegment[] {
+  const d = data && typeof data === 'object' ? data : {}
+  return abnormalSegments(d.CARRIER_NORMAL, d.CARRIER_ABNORMAL)
+}

package/src/zone-capacity-bar.ts

@@ -2,7 +2,7 @@ import { Component, ComponentNature, POSITION, Properties, sceneComponent } from
 import { themesColorRange } from '@fmsim/api'
 import { LEGEND_CAPACITY } from './features/mcs-status-default'
 import { safeRound } from './utils/safe-round'
-import { getVaueOnRanges } from './utils/get-value-on-ranges'
+import { getValueOnRanges } from './utils/get-value-on-ranges'
 import { MCSZoneMixin, MCSZoneMixinProperties } from './features/mcs-zone-mixin'
 import { ParentObjectMixinProperties } from './features/parent-object-mixin'
 import MCSUnit from './mcs-unit'
@@ -104,7 +104,7 @@ export default class ZoneCapacityBar extends MCSZoneMixin(MCSUnit) {
 
   get statusColor() {
     const { fullup } = this.state
-    return fullup ? 'red' : getVaueOnRanges(this.usage, this.legend)
+    return fullup ? 'red' : getValueOnRanges(this.usage, this.legend)
   }
 
   get text() {
@@ -282,7 +282,7 @@ export default class ZoneCapacityBar extends MCSZoneMixin(MCSUnit) {
       HIGHWATERMARK = 100,
       LOWWATERMARK = 0,
       FULLUP = 'F'
-    } = typeof this.data == 'object' ? this.data : {}
+    } = this.data && typeof this.data == 'object' ? this.data : {}
 
     const currentUsage = Number(CURRENTCAPACITY) || 0
     const maxCapacity = Number(MAXCAPACITY) || 100

package/translations/en.json

@@ -1,6 +1,11 @@
 {
   "label.current-usage": "current usage",
   "label.fullup": "fullup",
+  "label.carrier-full": "carrier full",
+  "label.carrier-empty": "carrier empty",
+  "label.carrier-empty-empty": "carrier empty empty",
+  "label.carrier-normal": "carrier normal",
+  "label.carrier-abnormal": "carrier abnormal",
   "label.high-watermark": "high watermark",
   "label.legend-name": "legend",
   "label.max-capacity": "max capacity",
@@ -46,5 +51,25 @@
   "label.node-machine": "node machine",
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
-  "label.battery-rate-legend-name": "battery rate"
+  "label.battery-rate-legend-name": "battery rate",
+  "label.conveyor-orientation": "Transfer Direction",
+  "component.backdrop": "backdrop",
+  "label.fit-to-board": "Fit to Board",
+  "label.see-through": "see-through",
+  "label.east": "East",
+  "label.west": "West",
+  "label.north": "North",
+  "label.south": "South",
+  "label.floor": "Floor",
+  "label.ceiling": "Ceiling",
+  "label.visible": "Visible",
+  "label.alpha": "Alpha",
+  "label.rotation": "Rotation",
+  "label.mirror": "Mirror",
+  "label.copy-to-opposite": "Copy to opposite",
+  "label.copy-to-walls": "Copy to all walls",
+  "label.light-preset": "light preset",
+  "label.dark": "dark",
+  "label.medium": "medium",
+  "label.bright": "bright"
 }

package/translations/ja.json

@@ -1,6 +1,11 @@
 {
   "label.current-usage": "current usage",
   "label.fullup": "fullup",
+  "label.carrier-full": "carrier full",
+  "label.carrier-empty": "carrier empty",
+  "label.carrier-empty-empty": "carrier empty empty",
+  "label.carrier-normal": "carrier normal",
+  "label.carrier-abnormal": "carrier abnormal",
   "label.high-watermark": "high watermark",
   "label.low-watermark": "low watermark",
   "label.legend-name": "legend",
@@ -48,5 +53,25 @@
   "label.node-machine": "node machine",
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
-  "label.battery-rate-legend-name": "battery rate"
+  "label.battery-rate-legend-name": "battery rate",
+  "label.conveyor-orientation": "搬送方向",
+  "component.backdrop": "バックドロップ",
+  "label.fit-to-board": "ボードに合わせる",
+  "label.see-through": "透過",
+  "label.east": "東壁",
+  "label.west": "西壁",
+  "label.north": "北壁",
+  "label.south": "南壁",
+  "label.floor": "床",
+  "label.ceiling": "天井",
+  "label.visible": "表示",
+  "label.alpha": "透明度",
+  "label.rotation": "回転",
+  "label.mirror": "鏡像",
+  "label.copy-to-opposite": "反対側にコピー",
+  "label.copy-to-walls": "壁4面にコピー",
+  "label.light-preset": "照明プリセット",
+  "label.dark": "暗",
+  "label.medium": "中",
+  "label.bright": "明"
 }

package/translations/ko.json

@@ -1,6 +1,11 @@
 {
   "label.current-usage": "현재 사용량",
   "label.fullup": "만재",
+  "label.carrier-full": "적재 캐리어",
+  "label.carrier-empty": "공 캐리어",
+  "label.carrier-empty-empty": "이중 공 캐리어",
+  "label.carrier-normal": "정상 캐리어",
+  "label.carrier-abnormal": "비정상 캐리어",
   "label.high-watermark": "고수위워터마크",
   "label.low-watermark": "저수위워터마크",
   "label.legend-name": "레전드",
@@ -49,5 +54,25 @@
   "label.node-machine": "node machine",
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
-  "label.battery-rate-legend-name": "배터리 잔량"
+  "label.battery-rate-legend-name": "배터리 잔량",
+  "label.conveyor-orientation": "이송방향",
+  "component.backdrop": "배경",
+  "label.fit-to-board": "보드에 맞춤",
+  "label.see-through": "투과",
+  "label.east": "동측 벽",
+  "label.west": "서측 벽",
+  "label.north": "북측 벽",
+  "label.south": "남측 벽",
+  "label.floor": "바닥",
+  "label.ceiling": "천장",
+  "label.visible": "표시",
+  "label.alpha": "투명도",
+  "label.rotation": "회전",
+  "label.mirror": "거울상",
+  "label.copy-to-opposite": "반대편에 복사",
+  "label.copy-to-walls": "벽 4면에 복사",
+  "label.light-preset": "조명 프리셋",
+  "label.dark": "어두움",
+  "label.medium": "중간",
+  "label.bright": "밝음"
 }

package/translations/ms.json

@@ -1,6 +1,11 @@
 {
   "label.current-usage": "current usage",
   "label.fullup": "fullup",
+  "label.carrier-full": "carrier full",
+  "label.carrier-empty": "carrier empty",
+  "label.carrier-empty-empty": "carrier empty empty",
+  "label.carrier-normal": "carrier normal",
+  "label.carrier-abnormal": "carrier abnormal",
   "label.high-watermark": "high watermark",
   "label.low-watermark": "low watermark",
   "label.legend-name": "legend",
@@ -48,5 +53,25 @@
   "label.node-machine": "node machine",
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
-  "label.battery-rate-legend-name": "battery rate"
+  "label.battery-rate-legend-name": "battery rate",
+  "label.conveyor-orientation": "Transfer Direction",
+  "component.backdrop": "Backdrop",
+  "label.fit-to-board": "Muat Papan",
+  "label.see-through": "tembus pandang",
+  "label.east": "Timur",
+  "label.west": "Barat",
+  "label.north": "Utara",
+  "label.south": "Selatan",
+  "label.floor": "Lantai",
+  "label.ceiling": "Siling",
+  "label.visible": "Kelihatan",
+  "label.alpha": "Alfa",
+  "label.rotation": "Putaran",
+  "label.mirror": "Cermin",
+  "label.copy-to-opposite": "Salin ke bertentangan",
+  "label.copy-to-walls": "Salin ke semua dinding",
+  "label.light-preset": "pratetapan cahaya",
+  "label.dark": "gelap",
+  "label.medium": "sederhana",
+  "label.bright": "cerah"
 }

package/translations/zh.json

@@ -1,6 +1,11 @@
 {
   "label.current-usage": "current usage",
   "label.fullup": "fullup",
+  "label.carrier-full": "carrier full",
+  "label.carrier-empty": "carrier empty",
+  "label.carrier-empty-empty": "carrier empty empty",
+  "label.carrier-normal": "carrier normal",
+  "label.carrier-abnormal": "carrier abnormal",
   "label.high-watermark": "high watermark",
   "label.low-watermark": "low watermark",
   "label.legend-name": "legend",
@@ -48,5 +53,25 @@
   "label.node-machine": "node machine",
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
-  "label.battery-rate-legend-name": "battery rate"
+  "label.battery-rate-legend-name": "battery rate",
+  "label.conveyor-orientation": "输送方向",
+  "component.backdrop": "背景",
+  "label.fit-to-board": "适配画板",
+  "label.see-through": "透视",
+  "label.east": "东墙",
+  "label.west": "西墙",
+  "label.north": "北墙",
+  "label.south": "南墙",
+  "label.floor": "地板",
+  "label.ceiling": "天花板",
+  "label.visible": "显示",
+  "label.alpha": "透明度",
+  "label.rotation": "旋转",
+  "label.mirror": "镜像",
+  "label.copy-to-opposite": "复制到对面",
+  "label.copy-to-walls": "复制到4面墙",
+  "label.light-preset": "灯光预设",
+  "label.dark": "昏暗",
+  "label.medium": "适中",
+  "label.bright": "明亮"
 }