@fmsim/machine 1.0.88 → 2.0.0-beta.100
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agv-line.js.map +1 -1
- package/dist/agv.js +6 -2
- package/dist/agv.js.map +1 -1
- package/dist/buffer.js.map +1 -1
- package/dist/carrier-manager.js +183 -0
- package/dist/carrier-manager.js.map +1 -0
- package/dist/carrier.js +105 -14
- package/dist/carrier.js.map +1 -1
- package/dist/conveyor-join.js +8 -2
- package/dist/conveyor-join.js.map +1 -1
- package/dist/conveyor.js +9 -1
- package/dist/conveyor.js.map +1 -1
- package/dist/crane-rail.js +53 -0
- package/dist/crane-rail.js.map +1 -0
- package/dist/crane.js +144 -1
- package/dist/crane.js.map +1 -1
- package/dist/equipment.js.map +1 -1
- package/dist/factories/agv-3d.js +147 -0
- package/dist/factories/agv-3d.js.map +1 -0
- package/dist/factories/conveyor-3d.js +345 -0
- package/dist/factories/conveyor-3d.js.map +1 -0
- package/dist/factories/crane-3d.js +186 -0
- package/dist/factories/crane-3d.js.map +1 -0
- package/dist/factories/crane-rail-3d.js +95 -0
- package/dist/factories/crane-rail-3d.js.map +1 -0
- package/dist/factories/machine-3d.js +973 -0
- package/dist/factories/machine-3d.js.map +1 -0
- package/dist/factories/oht-3d.js +177 -0
- package/dist/factories/oht-3d.js.map +1 -0
- package/dist/factories/shuttle-3d.js +159 -0
- package/dist/factories/shuttle-3d.js.map +1 -0
- package/dist/factories/z-priority-defaults.js +33 -0
- package/dist/factories/z-priority-defaults.js.map +1 -0
- package/dist/factories/z-priority.js +54 -0
- package/dist/factories/z-priority.js.map +1 -0
- package/dist/features/conveyor-mixin.js.map +1 -1
- package/dist/features/mcs-status-default.js +15 -1
- package/dist/features/mcs-status-default.js.map +1 -1
- package/dist/features/mcs-status-mixin.js +22 -0
- package/dist/features/mcs-status-mixin.js.map +1 -1
- package/dist/features/mcs-zone-mixin.js.map +1 -1
- package/dist/features/parent-object-mixin.js +15 -7
- package/dist/features/parent-object-mixin.js.map +1 -1
- package/dist/floating-container.js +5 -0
- package/dist/floating-container.js.map +1 -1
- package/dist/index.js +58 -2
- package/dist/index.js.map +1 -1
- package/dist/mcs-carrier-holder.js +56 -17
- package/dist/mcs-carrier-holder.js.map +1 -1
- package/dist/mcs-machine.js +39 -0
- package/dist/mcs-machine.js.map +1 -1
- package/dist/mcs-unit.js +20 -0
- package/dist/mcs-unit.js.map +1 -1
- package/dist/mcs-vehicle.js +10 -4
- package/dist/mcs-vehicle.js.map +1 -1
- package/dist/node.js +10 -3
- package/dist/node.js.map +1 -1
- package/dist/oht-line.js.map +1 -1
- package/dist/oht.js +4 -0
- package/dist/oht.js.map +1 -1
- package/dist/port-flow.js +4 -0
- package/dist/port-flow.js.map +1 -1
- package/dist/port.js +4 -0
- package/dist/port.js.map +1 -1
- package/dist/scanner.js +30 -0
- package/dist/scanner.js.map +1 -0
- package/dist/scene/root-container-override.js +160 -96
- package/dist/scene/root-container-override.js.map +1 -1
- package/dist/shelf.js +4 -0
- package/dist/shelf.js.map +1 -1
- package/dist/shuttle.js.map +1 -1
- package/dist/static-container.js +5 -0
- package/dist/static-container.js.map +1 -1
- package/dist/stocker-abnormal-bar.js +184 -0
- package/dist/stocker-abnormal-bar.js.map +1 -0
- package/dist/stocker-capacity-bar.js +253 -6
- package/dist/stocker-capacity-bar.js.map +1 -1
- package/dist/stocker-carrier-bar.js +198 -0
- package/dist/stocker-carrier-bar.js.map +1 -0
- package/dist/stocker.js +7 -1
- package/dist/stocker.js.map +1 -1
- package/dist/templates/backdrop.js +30 -0
- package/dist/templates/backdrop.js.map +1 -0
- package/dist/templates/decal.js +21 -0
- package/dist/templates/decal.js.map +1 -0
- package/dist/templates/index.js +7 -1
- package/dist/templates/index.js.map +1 -1
- package/dist/templates/scanner.js +20 -0
- package/dist/templates/scanner.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/crane-position.js +83 -0
- package/dist/utils/crane-position.js.map +1 -0
- package/dist/utils/data-value.js +21 -0
- package/dist/utils/data-value.js.map +1 -0
- package/dist/utils/fit-gauge-scale.js +28 -0
- package/dist/utils/fit-gauge-scale.js.map +1 -0
- package/dist/utils/get-value-on-ranges.js +2 -4
- package/dist/utils/get-value-on-ranges.js.map +1 -1
- package/dist/utils/stocker-gauge.js +78 -0
- package/dist/utils/stocker-gauge.js.map +1 -0
- package/dist/zone-capacity-bar.js +3 -3
- package/dist/zone-capacity-bar.js.map +1 -1
- package/icons/backdrop.png +0 -0
- package/icons/decal.png +0 -0
- package/jest.config.js +10 -0
- package/package.json +7 -6
- package/src/agv-line.ts +1 -1
- package/src/agv.ts +10 -5
- package/src/buffer.ts +1 -1
- package/src/carrier-manager.ts +223 -0
- package/src/carrier.ts +111 -18
- package/src/conveyor-join.ts +6 -3
- package/src/conveyor.ts +10 -2
- package/src/crane-rail.ts +58 -0
- package/src/crane.ts +182 -2
- package/src/equipment.ts +1 -1
- package/src/factories/agv-3d.ts +160 -0
- package/src/factories/conveyor-3d.ts +398 -0
- package/src/factories/crane-3d.ts +217 -0
- package/src/factories/crane-rail-3d.ts +115 -0
- package/src/factories/machine-3d.ts +1192 -0
- package/src/factories/oht-3d.ts +196 -0
- package/src/factories/shuttle-3d.ts +179 -0
- package/src/factories/z-priority-defaults.ts +38 -0
- package/src/factories/z-priority.ts +60 -0
- package/src/features/conveyor-mixin.ts +1 -1
- package/src/features/mcs-status-default.ts +15 -1
- package/src/features/mcs-status-mixin.ts +26 -4
- package/src/features/mcs-zone-mixin.ts +1 -1
- package/src/features/parent-object-mixin.ts +17 -8
- package/src/floating-container.ts +5 -0
- package/src/index.ts +66 -2
- package/src/mcs-carrier-holder.ts +58 -29
- package/src/mcs-machine.ts +43 -1
- package/src/mcs-unit.ts +25 -2
- package/src/mcs-vehicle.ts +12 -9
- package/src/node.ts +9 -3
- package/src/oht-line.ts +1 -1
- package/src/oht.ts +7 -2
- package/src/port-flow.ts +6 -1
- package/src/port.ts +6 -1
- package/src/scanner.ts +29 -0
- package/src/scene/root-container-override.ts +156 -105
- package/src/shelf.ts +6 -1
- package/src/shuttle.ts +1 -1
- package/src/static-container.ts +5 -0
- package/src/stocker-abnormal-bar.ts +247 -0
- package/src/stocker-capacity-bar.ts +301 -10
- package/src/stocker-carrier-bar.ts +262 -0
- package/src/stocker.ts +10 -3
- package/src/templates/backdrop.ts +30 -0
- package/src/templates/decal.ts +21 -0
- package/src/templates/index.ts +7 -1
- package/src/templates/scanner.ts +20 -0
- package/src/utils/crane-position.ts +105 -0
- package/src/utils/data-value.ts +19 -0
- package/src/utils/fit-gauge-scale.ts +35 -0
- package/src/utils/get-value-on-ranges.ts +2 -4
- package/src/utils/stocker-gauge.ts +111 -0
- package/src/zone-capacity-bar.ts +5 -5
- package/translations/en.json +26 -1
- package/translations/ja.json +26 -1
- package/translations/ko.json +26 -1
- package/translations/ms.json +26 -1
- package/translations/zh.json +26 -1
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
const icon = new URL('../../icons/decal.png', import.meta.url).href
|
|
2
|
+
|
|
3
|
+
export default {
|
|
4
|
+
type: 'decal',
|
|
5
|
+
description: 'flat surface decal (3D-only) — floor zone paint, path lanes, signage',
|
|
6
|
+
group: ['etc'],
|
|
7
|
+
icon,
|
|
8
|
+
model: {
|
|
9
|
+
type: 'decal',
|
|
10
|
+
top: 100,
|
|
11
|
+
left: 100,
|
|
12
|
+
width: 200,
|
|
13
|
+
height: 200,
|
|
14
|
+
zPos: 0,
|
|
15
|
+
depth: 0,
|
|
16
|
+
fillStyle: '#cccccc',
|
|
17
|
+
strokeStyle: '#999999',
|
|
18
|
+
lineWidth: 1,
|
|
19
|
+
alpha: 1
|
|
20
|
+
}
|
|
21
|
+
}
|
package/src/templates/index.ts
CHANGED
|
@@ -17,9 +17,12 @@ import agvLine from './agv-line'
|
|
|
17
17
|
import ohtLine from './oht-line'
|
|
18
18
|
import conveyor from './conveyor'
|
|
19
19
|
|
|
20
|
+
import Scanner from './scanner'
|
|
20
21
|
import Node from './node'
|
|
21
22
|
import DataSubscription from './data-subscription'
|
|
22
23
|
import FloatingContainer from './floating-container'
|
|
24
|
+
import Decal from './decal'
|
|
25
|
+
import Backdrop from './backdrop'
|
|
23
26
|
|
|
24
27
|
export default [
|
|
25
28
|
StockerCapacityBar,
|
|
@@ -41,7 +44,10 @@ export default [
|
|
|
41
44
|
Shelf,
|
|
42
45
|
Port,
|
|
43
46
|
|
|
47
|
+
Scanner,
|
|
44
48
|
Node,
|
|
45
49
|
FloatingContainer,
|
|
46
|
-
DataSubscription
|
|
50
|
+
DataSubscription,
|
|
51
|
+
Decal,
|
|
52
|
+
Backdrop
|
|
47
53
|
]
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
const icon = new URL('../../icons/equipment.png', import.meta.url).href
|
|
2
|
+
|
|
3
|
+
export default {
|
|
4
|
+
type: 'Scanner',
|
|
5
|
+
description: 'Fixed mount barcode/QR scanner',
|
|
6
|
+
group: ['etc'],
|
|
7
|
+
icon,
|
|
8
|
+
model: {
|
|
9
|
+
type: 'Scanner',
|
|
10
|
+
x1: 100,
|
|
11
|
+
y1: 100,
|
|
12
|
+
x2: 130,
|
|
13
|
+
y2: 110,
|
|
14
|
+
x3: 100,
|
|
15
|
+
y3: 120,
|
|
16
|
+
strokeStyle: '#333',
|
|
17
|
+
fillStyle: 'red',
|
|
18
|
+
lineWidth: 1
|
|
19
|
+
}
|
|
20
|
+
}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Crane 위치 데이터 (data.cranePosition) 변환 유틸.
|
|
3
|
+
*
|
|
4
|
+
* 명세:
|
|
5
|
+
* {
|
|
6
|
+
* cranePosition: {
|
|
7
|
+
* current: { x, y, z }, // 실 좌표값
|
|
8
|
+
* limit: { x:{min,max}, y:{min,max}, z:{min,max} } // 각 축 한계
|
|
9
|
+
* }
|
|
10
|
+
* }
|
|
11
|
+
*
|
|
12
|
+
* current 를 limit 범위 안의 0~1 비율로 환산한 뒤 host(부모) footprint 에 매핑한다.
|
|
13
|
+
* x → host 긴쪽, y → 짧은쪽, z → 포크 높이(forkZ 0~100).
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import { parseIfJsonString } from './data-value'
|
|
17
|
+
|
|
18
|
+
/** 축별 한계 (cranePosition.limit.{x|y|z}). */
|
|
19
|
+
export interface AxisLimit {
|
|
20
|
+
min?: number
|
|
21
|
+
max?: number
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** 새 데이터 명세 — data.cranePosition. */
|
|
25
|
+
export interface CranePositionData {
|
|
26
|
+
current?: { x?: number; y?: number; z?: number }
|
|
27
|
+
limit?: { x?: AxisLimit; y?: AxisLimit; z?: AxisLimit }
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* current 값을 limit 범위 안에서 0~1 비율로 환산.
|
|
32
|
+
* limit 누락 / 0 span / 비정상 입력 시 0 반환 (안전 fallback).
|
|
33
|
+
*/
|
|
34
|
+
export function axisRatio(value: unknown, lim?: AxisLimit): number {
|
|
35
|
+
const v = Number(value)
|
|
36
|
+
const min = Number(lim?.min) || 0
|
|
37
|
+
const max = Number(lim?.max)
|
|
38
|
+
if (!Number.isFinite(v) || !Number.isFinite(max) || max === min) return 0
|
|
39
|
+
return Math.max(0, Math.min(1, (v - min) / (max - min)))
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* host(부모) footprint 안에서 0~1 비율 (rx,ry) → 크레인 top-left 로컬 좌표.
|
|
44
|
+
*
|
|
45
|
+
* **스토커 안쪽 오프셋**: 크레인의 폭/두께를 감안해, 크레인 *전체* 가 host 안에
|
|
46
|
+
* 머무르도록 top-left 좌표를 [0, hostLen - craneLen] 범위로 매핑한다 (= 양끝에서
|
|
47
|
+
* craneLen/2 만큼 inset 된 중심선 위를 움직임). 크레인이 host 보다 크면 span 0
|
|
48
|
+
* 으로 떨어져 host 모서리에 정렬.
|
|
49
|
+
*
|
|
50
|
+
* x(rx) 는 host 의 긴쪽, y(ry) 는 짧은쪽에 매핑 (가상 rail 은 host 긴쪽 방향).
|
|
51
|
+
*/
|
|
52
|
+
export function mapCraneLocalPosition(
|
|
53
|
+
hostW: number,
|
|
54
|
+
hostH: number,
|
|
55
|
+
craneW: number,
|
|
56
|
+
craneH: number,
|
|
57
|
+
rx: number,
|
|
58
|
+
ry: number
|
|
59
|
+
): { left: number; top: number } {
|
|
60
|
+
const longIsWidth = hostW >= hostH
|
|
61
|
+
const longLen = longIsWidth ? hostW : hostH
|
|
62
|
+
const shortLen = longIsWidth ? hostH : hostW
|
|
63
|
+
const craneLongSize = longIsWidth ? craneW : craneH
|
|
64
|
+
const craneShortSize = longIsWidth ? craneH : craneW
|
|
65
|
+
|
|
66
|
+
// 크레인 크기를 뺀 inset 가용 span. top-left = ratio * span 이므로 크레인
|
|
67
|
+
// 전체가 host [0, hostLen] 안에 들어온다.
|
|
68
|
+
const longSpan = Math.max(0, longLen - craneLongSize)
|
|
69
|
+
const shortSpan = Math.max(0, shortLen - craneShortSize)
|
|
70
|
+
const longPos = rx * longSpan
|
|
71
|
+
const shortPos = ry * shortSpan
|
|
72
|
+
|
|
73
|
+
return {
|
|
74
|
+
left: longIsWidth ? longPos : shortPos,
|
|
75
|
+
top: longIsWidth ? shortPos : longPos
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* 객체 키를 재귀적으로 소문자화한 사본 반환 (배열/원시값은 그대로, 값은 변형 안 함).
|
|
81
|
+
* 데이터 키는 모두 대문자 전제 — CRANEPOSITION 의 중첩 키(CURRENT/LIMIT/X/Y/Z/MIN/MAX)를
|
|
82
|
+
* 내부 표준형(소문자 current/limit/x/y/z/min/max)으로 변환하기 위한 정규화.
|
|
83
|
+
*/
|
|
84
|
+
export function lowerKeysDeep<T = any>(value: any): T {
|
|
85
|
+
if (Array.isArray(value)) return value.map(v => lowerKeysDeep(v)) as any
|
|
86
|
+
if (value && typeof value === 'object') {
|
|
87
|
+
const out: Record<string, any> = {}
|
|
88
|
+
for (const k of Object.keys(value)) {
|
|
89
|
+
out[k.toLowerCase()] = lowerKeysDeep(value[k])
|
|
90
|
+
}
|
|
91
|
+
return out as T
|
|
92
|
+
}
|
|
93
|
+
return value as T
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/**
|
|
97
|
+
* raw CRANEPOSITION → 내부 표준형(소문자 키) 구조(CranePositionData).
|
|
98
|
+
* 값이 JSON 문자열로 올 수 있어 먼저 파싱하고, 중첩 키(CURRENT/LIMIT/X/Y/Z/MIN/MAX)를
|
|
99
|
+
* 소문자(current.x / limit.x.min)로 변환. 파싱 실패/비객체면 undefined.
|
|
100
|
+
*/
|
|
101
|
+
export function normalizeCranePosition(raw: any): CranePositionData | undefined {
|
|
102
|
+
const obj = parseIfJsonString(raw)
|
|
103
|
+
if (!obj || typeof obj !== 'object') return undefined
|
|
104
|
+
return lowerKeysDeep<CranePositionData>(obj)
|
|
105
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright © HatioLab Inc. All rights reserved.
|
|
3
|
+
*
|
|
4
|
+
* 데이터 필드값이 JSON 문자열로 전달될 수 있어(예: CRANEPOSITION, MULTICARRIERS)
|
|
5
|
+
* 객체/배열로 변환하기 위한 헬퍼.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* 값이 JSON 문자열이면 파싱해서 반환. 객체/배열 등 비문자열은 그대로 반환.
|
|
10
|
+
* 파싱 실패 시 undefined.
|
|
11
|
+
*/
|
|
12
|
+
export function parseIfJsonString(value: any): any {
|
|
13
|
+
if (typeof value !== 'string') return value
|
|
14
|
+
try {
|
|
15
|
+
return JSON.parse(value)
|
|
16
|
+
} catch {
|
|
17
|
+
return undefined
|
|
18
|
+
}
|
|
19
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 스토커 지붕 위 용량 게이지 바의 비례 축소 계수를 계산한다.
|
|
3
|
+
*
|
|
4
|
+
* 정책:
|
|
5
|
+
* - 게이지 바의 *최대* 크기는 maxW × maxH. 스토커가 충분히 크면 이 크기 그대로 (계수 1).
|
|
6
|
+
* - 스토커가 그보다 작으면 지붕 footprint 안에 들어오도록 *비례* 축소 (uniform).
|
|
7
|
+
* - *확대는 하지 않는다* (계수 상한 1) — 현재 크기가 상한이라는 요구사항.
|
|
8
|
+
*
|
|
9
|
+
* 방향 매핑: 바의 가로축(maxW)은 스토커의 *장축*에 정렬된다 (buildGauge 의
|
|
10
|
+
* `isWidthLonger ? geo.rotateY` 처리와 일치). 따라서 가용 치수도 그 기준으로 매칭한다.
|
|
11
|
+
*
|
|
12
|
+
* @param w 스토커 footprint 가로 (월드 단위)
|
|
13
|
+
* @param h 스토커 footprint 세로 (월드 단위)
|
|
14
|
+
* @param maxW 게이지 바 최대 가로
|
|
15
|
+
* @param maxH 게이지 바 최대 세로
|
|
16
|
+
* @param margin 지붕 가장자리 여백 비율 (0~1, 기본 0.85)
|
|
17
|
+
* @returns 0 < scale <= 1
|
|
18
|
+
*/
|
|
19
|
+
export function fitGaugeScale(
|
|
20
|
+
w: number,
|
|
21
|
+
h: number,
|
|
22
|
+
maxW: number,
|
|
23
|
+
maxH: number,
|
|
24
|
+
margin: number = 0.85
|
|
25
|
+
): number {
|
|
26
|
+
const isWidthLonger = w >= h
|
|
27
|
+
// 바 가로축(maxW)이 정렬되는 스토커 치수 = 장축, 세로축(maxH) = 단축
|
|
28
|
+
const availAlongW = isWidthLonger ? w : h
|
|
29
|
+
const availAlongH = isWidthLonger ? h : w
|
|
30
|
+
|
|
31
|
+
const scale = Math.min(1, (availAlongW * margin) / maxW, (availAlongH * margin) / maxH)
|
|
32
|
+
|
|
33
|
+
// 음수/NaN 방어 — 0 이하로 떨어지면 안 됨
|
|
34
|
+
return scale > 0 && Number.isFinite(scale) ? scale : 1
|
|
35
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export function
|
|
1
|
+
export function getValueOnRanges(value, param): any {
|
|
2
2
|
for (let range in param) {
|
|
3
3
|
let [from, to]: (number | string)[] = range.split('~')
|
|
4
4
|
let from_defined = !!from
|
|
@@ -8,14 +8,12 @@ export function getVaueOnRanges(value, param): any {
|
|
|
8
8
|
to = parseFloat(to)
|
|
9
9
|
value = Number(value) || 0
|
|
10
10
|
|
|
11
|
-
// from이나 to 둘 중 하나만 있는 경우 먼저 계산
|
|
12
11
|
if (from_defined && !to_defined && value >= from) {
|
|
13
12
|
return param[range]
|
|
14
|
-
} else if (!from_defined && to_defined && value <
|
|
13
|
+
} else if (!from_defined && to_defined && value < to) {
|
|
15
14
|
return param[range]
|
|
16
15
|
}
|
|
17
16
|
|
|
18
|
-
// 소수점이 있으므로 from <= value < to 가 되야함
|
|
19
17
|
if (value >= from && value < to) {
|
|
20
18
|
return param[range]
|
|
21
19
|
}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* 스토커 게이지 세그먼트 계산 (2D/3D 공통 단일 소스).
|
|
3
|
+
*
|
|
4
|
+
* 2D(StockerCapacityBar) 와 3D(machine-3d buildGauge) 가 각자 세그먼트 비율/색상을
|
|
5
|
+
* 중복 계산하면 필드/색상 drift 가 발생한다(실제로 carrier 필드명이 어긋난 전례).
|
|
6
|
+
* 이 모듈이 carrier/abnormal 세그먼트 계산의 단일 소스이며 순수 함수라 단위 테스트가
|
|
7
|
+
* 용이하다. 표현(라벨 포맷·watermark·테두리색)은 렌더러별로 다르므로 여기서 다루지 않는다.
|
|
8
|
+
*
|
|
9
|
+
* canonical 데이터 필드(2D 기준):
|
|
10
|
+
* - carrier : CARRIER_FULL / CARRIER_EMPTY / CARRIER_EMPTY_EMPTY
|
|
11
|
+
* - abnormal : CARRIER_NORMAL / CARRIER_ABNORMAL
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
import { Legend } from '../features/mcs-status-default'
|
|
15
|
+
|
|
16
|
+
export type StockerGaugeMode = 'capacity' | 'carrier' | 'abnormal'
|
|
17
|
+
|
|
18
|
+
export interface GaugeSegment {
|
|
19
|
+
/** 세그먼트 라벨(2D per-segment 표시용, '\n' 은 줄바꿈). */
|
|
20
|
+
label: string
|
|
21
|
+
/** 카운트 원본값. */
|
|
22
|
+
count: number
|
|
23
|
+
/** 전체 대비 비율 (0~1). total 이 0 이면 0. */
|
|
24
|
+
ratio: number
|
|
25
|
+
/** 채움 색상. */
|
|
26
|
+
color: string
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** carrier 세그먼트 색상 (2D/3D 공통). LEGEND_CARRIER 기본값과 동일 — 테마 미지정 시 폴백. */
|
|
30
|
+
export const CARRIER_COLORS = {
|
|
31
|
+
full: '#4AA7FE',
|
|
32
|
+
empty: '#8BDA5B',
|
|
33
|
+
emptyEmpty: '#019D59'
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export interface CarrierColors {
|
|
37
|
+
full: string
|
|
38
|
+
empty: string
|
|
39
|
+
emptyEmpty: string
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* carrier legend(테마)에서 full/empty/emptyEmpty 색상 추출.
|
|
44
|
+
* carrier 컴포넌트의 색 취득 로직(statusColor = legend[status] || legend.default)과 동일하게,
|
|
45
|
+
* status 키(FULL/EMPTY/EMPTYEMPTY)로 직접 조회한다. 키/default 모두 없으면 CARRIER_COLORS 로 폴백.
|
|
46
|
+
*/
|
|
47
|
+
export function carrierColorsFromLegend(legend?: Legend): CarrierColors {
|
|
48
|
+
const pick = (key: string, fallback: string) => (legend && (legend[key] || legend.default)) || fallback
|
|
49
|
+
return {
|
|
50
|
+
full: pick('FULL', CARRIER_COLORS.full),
|
|
51
|
+
empty: pick('EMPTY', CARRIER_COLORS.empty),
|
|
52
|
+
emptyEmpty: pick('EMPTYEMPTY', CARRIER_COLORS.emptyEmpty)
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** abnormal 세그먼트 색상 (2D/3D 공통). */
|
|
57
|
+
export const ABNORMAL_COLORS = {
|
|
58
|
+
normal: '#8BDA5B',
|
|
59
|
+
abnormal: '#F4B4B4'
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function num(v: unknown): number {
|
|
63
|
+
const n = Number(v)
|
|
64
|
+
return Number.isFinite(n) && n > 0 ? n : 0
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* 캐리어 상태 세그먼트 (Full / Empty / EmptyEmpty). total 0 이면 모든 ratio 0.
|
|
69
|
+
* colors 미지정 시 CARRIER_COLORS(기본). 테마 색은 carrierColorsFromLegend 로 만들어 전달.
|
|
70
|
+
*/
|
|
71
|
+
export function carrierSegments(
|
|
72
|
+
full: unknown,
|
|
73
|
+
empty: unknown,
|
|
74
|
+
emptyEmpty: unknown,
|
|
75
|
+
colors: CarrierColors = CARRIER_COLORS
|
|
76
|
+
): GaugeSegment[] {
|
|
77
|
+
const f = num(full)
|
|
78
|
+
const e = num(empty)
|
|
79
|
+
const ee = num(emptyEmpty)
|
|
80
|
+
const total = f + e + ee
|
|
81
|
+
const r = (c: number) => (total > 0 ? c / total : 0)
|
|
82
|
+
return [
|
|
83
|
+
{ label: 'Full', count: f, ratio: r(f), color: colors.full },
|
|
84
|
+
{ label: 'Empty', count: e, ratio: r(e), color: colors.empty },
|
|
85
|
+
{ label: 'Empty\nEmpty', count: ee, ratio: r(ee), color: colors.emptyEmpty }
|
|
86
|
+
]
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/** 캐리어 정상/비정상 세그먼트 (Normal / Abnormal). total 0 이면 모든 ratio 0. */
|
|
90
|
+
export function abnormalSegments(normal: unknown, abnormal: unknown): GaugeSegment[] {
|
|
91
|
+
const n = num(normal)
|
|
92
|
+
const a = num(abnormal)
|
|
93
|
+
const total = n + a
|
|
94
|
+
const r = (c: number) => (total > 0 ? c / total : 0)
|
|
95
|
+
return [
|
|
96
|
+
{ label: 'Normal', count: n, ratio: r(n), color: ABNORMAL_COLORS.normal },
|
|
97
|
+
{ label: 'Abnormal', count: a, ratio: r(a), color: ABNORMAL_COLORS.abnormal }
|
|
98
|
+
]
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** 캐리어 세그먼트 — canonical raw data(CARRIER_*) 에서 직접. 3D 처럼 raw data 소스용. */
|
|
102
|
+
export function carrierSegmentsFromData(data: any, colors?: CarrierColors): GaugeSegment[] {
|
|
103
|
+
const d = data && typeof data === 'object' ? data : {}
|
|
104
|
+
return carrierSegments(d.CARRIER_FULL, d.CARRIER_EMPTY, d.CARRIER_EMPTY_EMPTY, colors)
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/** 비정상 세그먼트 — canonical raw data(CARRIER_*) 에서 직접. */
|
|
108
|
+
export function abnormalSegmentsFromData(data: any): GaugeSegment[] {
|
|
109
|
+
const d = data && typeof data === 'object' ? data : {}
|
|
110
|
+
return abnormalSegments(d.CARRIER_NORMAL, d.CARRIER_ABNORMAL)
|
|
111
|
+
}
|
package/src/zone-capacity-bar.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Component, ComponentNature, POSITION, Properties, sceneComponent } from
|
|
|
2
2
|
import { themesColorRange } from '@fmsim/api'
|
|
3
3
|
import { LEGEND_CAPACITY } from './features/mcs-status-default'
|
|
4
4
|
import { safeRound } from './utils/safe-round'
|
|
5
|
-
import {
|
|
5
|
+
import { getValueOnRanges } from './utils/get-value-on-ranges'
|
|
6
6
|
import { MCSZoneMixin, MCSZoneMixinProperties } from './features/mcs-zone-mixin'
|
|
7
7
|
import { ParentObjectMixinProperties } from './features/parent-object-mixin'
|
|
8
8
|
import MCSUnit from './mcs-unit'
|
|
@@ -99,12 +99,12 @@ export default class ZoneCapacityBar extends MCSZoneMixin(MCSUnit) {
|
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
getLegendFallback() {
|
|
102
|
-
return this.root.zoneCapacityLegendTheme || LEGEND_CAPACITY
|
|
102
|
+
return (this.root as any).zoneCapacityLegendTheme || LEGEND_CAPACITY
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
get statusColor() {
|
|
106
106
|
const { fullup } = this.state
|
|
107
|
-
return fullup ? 'red' :
|
|
107
|
+
return fullup ? 'red' : getValueOnRanges(this.usage, this.legend)
|
|
108
108
|
}
|
|
109
109
|
|
|
110
110
|
get text() {
|
|
@@ -275,14 +275,14 @@ export default class ZoneCapacityBar extends MCSZoneMixin(MCSUnit) {
|
|
|
275
275
|
// intentionally have done nothing
|
|
276
276
|
}
|
|
277
277
|
|
|
278
|
-
onchangeData(after:
|
|
278
|
+
onchangeData(after: Record<string, any>, before: Record<string, any>): void {
|
|
279
279
|
const {
|
|
280
280
|
CURRENTCAPACITY = 0,
|
|
281
281
|
MAXCAPACITY = 100,
|
|
282
282
|
HIGHWATERMARK = 100,
|
|
283
283
|
LOWWATERMARK = 0,
|
|
284
284
|
FULLUP = 'F'
|
|
285
|
-
} = typeof this.data == 'object' ? this.data : {}
|
|
285
|
+
} = this.data && typeof this.data == 'object' ? this.data : {}
|
|
286
286
|
|
|
287
287
|
const currentUsage = Number(CURRENTCAPACITY) || 0
|
|
288
288
|
const maxCapacity = Number(MAXCAPACITY) || 100
|
package/translations/en.json
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"label.current-usage": "current usage",
|
|
3
3
|
"label.fullup": "fullup",
|
|
4
|
+
"label.carrier-full": "carrier full",
|
|
5
|
+
"label.carrier-empty": "carrier empty",
|
|
6
|
+
"label.carrier-empty-empty": "carrier empty empty",
|
|
7
|
+
"label.carrier-normal": "carrier normal",
|
|
8
|
+
"label.carrier-abnormal": "carrier abnormal",
|
|
4
9
|
"label.high-watermark": "high watermark",
|
|
5
10
|
"label.legend-name": "legend",
|
|
6
11
|
"label.max-capacity": "max capacity",
|
|
@@ -46,5 +51,25 @@
|
|
|
46
51
|
"label.node-machine": "node machine",
|
|
47
52
|
"label.nodes": "nodes",
|
|
48
53
|
"label.vehicle-animation": "vehicle animation",
|
|
49
|
-
"label.battery-rate-legend-name": "battery rate"
|
|
54
|
+
"label.battery-rate-legend-name": "battery rate",
|
|
55
|
+
"label.conveyor-orientation": "Transfer Direction",
|
|
56
|
+
"component.backdrop": "backdrop",
|
|
57
|
+
"label.fit-to-board": "Fit to Board",
|
|
58
|
+
"label.see-through": "see-through",
|
|
59
|
+
"label.east": "East",
|
|
60
|
+
"label.west": "West",
|
|
61
|
+
"label.north": "North",
|
|
62
|
+
"label.south": "South",
|
|
63
|
+
"label.floor": "Floor",
|
|
64
|
+
"label.ceiling": "Ceiling",
|
|
65
|
+
"label.visible": "Visible",
|
|
66
|
+
"label.alpha": "Alpha",
|
|
67
|
+
"label.rotation": "Rotation",
|
|
68
|
+
"label.mirror": "Mirror",
|
|
69
|
+
"label.copy-to-opposite": "Copy to opposite",
|
|
70
|
+
"label.copy-to-walls": "Copy to all walls",
|
|
71
|
+
"label.light-preset": "light preset",
|
|
72
|
+
"label.dark": "dark",
|
|
73
|
+
"label.medium": "medium",
|
|
74
|
+
"label.bright": "bright"
|
|
50
75
|
}
|
package/translations/ja.json
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"label.current-usage": "current usage",
|
|
3
3
|
"label.fullup": "fullup",
|
|
4
|
+
"label.carrier-full": "carrier full",
|
|
5
|
+
"label.carrier-empty": "carrier empty",
|
|
6
|
+
"label.carrier-empty-empty": "carrier empty empty",
|
|
7
|
+
"label.carrier-normal": "carrier normal",
|
|
8
|
+
"label.carrier-abnormal": "carrier abnormal",
|
|
4
9
|
"label.high-watermark": "high watermark",
|
|
5
10
|
"label.low-watermark": "low watermark",
|
|
6
11
|
"label.legend-name": "legend",
|
|
@@ -48,5 +53,25 @@
|
|
|
48
53
|
"label.node-machine": "node machine",
|
|
49
54
|
"label.nodes": "nodes",
|
|
50
55
|
"label.vehicle-animation": "vehicle animation",
|
|
51
|
-
"label.battery-rate-legend-name": "battery rate"
|
|
56
|
+
"label.battery-rate-legend-name": "battery rate",
|
|
57
|
+
"label.conveyor-orientation": "搬送方向",
|
|
58
|
+
"component.backdrop": "バックドロップ",
|
|
59
|
+
"label.fit-to-board": "ボードに合わせる",
|
|
60
|
+
"label.see-through": "透過",
|
|
61
|
+
"label.east": "東壁",
|
|
62
|
+
"label.west": "西壁",
|
|
63
|
+
"label.north": "北壁",
|
|
64
|
+
"label.south": "南壁",
|
|
65
|
+
"label.floor": "床",
|
|
66
|
+
"label.ceiling": "天井",
|
|
67
|
+
"label.visible": "表示",
|
|
68
|
+
"label.alpha": "透明度",
|
|
69
|
+
"label.rotation": "回転",
|
|
70
|
+
"label.mirror": "鏡像",
|
|
71
|
+
"label.copy-to-opposite": "反対側にコピー",
|
|
72
|
+
"label.copy-to-walls": "壁4面にコピー",
|
|
73
|
+
"label.light-preset": "照明プリセット",
|
|
74
|
+
"label.dark": "暗",
|
|
75
|
+
"label.medium": "中",
|
|
76
|
+
"label.bright": "明"
|
|
52
77
|
}
|
package/translations/ko.json
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"label.current-usage": "현재 사용량",
|
|
3
3
|
"label.fullup": "만재",
|
|
4
|
+
"label.carrier-full": "적재 캐리어",
|
|
5
|
+
"label.carrier-empty": "공 캐리어",
|
|
6
|
+
"label.carrier-empty-empty": "이중 공 캐리어",
|
|
7
|
+
"label.carrier-normal": "정상 캐리어",
|
|
8
|
+
"label.carrier-abnormal": "비정상 캐리어",
|
|
4
9
|
"label.high-watermark": "고수위워터마크",
|
|
5
10
|
"label.low-watermark": "저수위워터마크",
|
|
6
11
|
"label.legend-name": "레전드",
|
|
@@ -49,5 +54,25 @@
|
|
|
49
54
|
"label.node-machine": "node machine",
|
|
50
55
|
"label.nodes": "nodes",
|
|
51
56
|
"label.vehicle-animation": "vehicle animation",
|
|
52
|
-
"label.battery-rate-legend-name": "배터리 잔량"
|
|
57
|
+
"label.battery-rate-legend-name": "배터리 잔량",
|
|
58
|
+
"label.conveyor-orientation": "이송방향",
|
|
59
|
+
"component.backdrop": "배경",
|
|
60
|
+
"label.fit-to-board": "보드에 맞춤",
|
|
61
|
+
"label.see-through": "투과",
|
|
62
|
+
"label.east": "동측 벽",
|
|
63
|
+
"label.west": "서측 벽",
|
|
64
|
+
"label.north": "북측 벽",
|
|
65
|
+
"label.south": "남측 벽",
|
|
66
|
+
"label.floor": "바닥",
|
|
67
|
+
"label.ceiling": "천장",
|
|
68
|
+
"label.visible": "표시",
|
|
69
|
+
"label.alpha": "투명도",
|
|
70
|
+
"label.rotation": "회전",
|
|
71
|
+
"label.mirror": "거울상",
|
|
72
|
+
"label.copy-to-opposite": "반대편에 복사",
|
|
73
|
+
"label.copy-to-walls": "벽 4면에 복사",
|
|
74
|
+
"label.light-preset": "조명 프리셋",
|
|
75
|
+
"label.dark": "어두움",
|
|
76
|
+
"label.medium": "중간",
|
|
77
|
+
"label.bright": "밝음"
|
|
53
78
|
}
|
package/translations/ms.json
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"label.current-usage": "current usage",
|
|
3
3
|
"label.fullup": "fullup",
|
|
4
|
+
"label.carrier-full": "carrier full",
|
|
5
|
+
"label.carrier-empty": "carrier empty",
|
|
6
|
+
"label.carrier-empty-empty": "carrier empty empty",
|
|
7
|
+
"label.carrier-normal": "carrier normal",
|
|
8
|
+
"label.carrier-abnormal": "carrier abnormal",
|
|
4
9
|
"label.high-watermark": "high watermark",
|
|
5
10
|
"label.low-watermark": "low watermark",
|
|
6
11
|
"label.legend-name": "legend",
|
|
@@ -48,5 +53,25 @@
|
|
|
48
53
|
"label.node-machine": "node machine",
|
|
49
54
|
"label.nodes": "nodes",
|
|
50
55
|
"label.vehicle-animation": "vehicle animation",
|
|
51
|
-
"label.battery-rate-legend-name": "battery rate"
|
|
56
|
+
"label.battery-rate-legend-name": "battery rate",
|
|
57
|
+
"label.conveyor-orientation": "Transfer Direction",
|
|
58
|
+
"component.backdrop": "Backdrop",
|
|
59
|
+
"label.fit-to-board": "Muat Papan",
|
|
60
|
+
"label.see-through": "tembus pandang",
|
|
61
|
+
"label.east": "Timur",
|
|
62
|
+
"label.west": "Barat",
|
|
63
|
+
"label.north": "Utara",
|
|
64
|
+
"label.south": "Selatan",
|
|
65
|
+
"label.floor": "Lantai",
|
|
66
|
+
"label.ceiling": "Siling",
|
|
67
|
+
"label.visible": "Kelihatan",
|
|
68
|
+
"label.alpha": "Alfa",
|
|
69
|
+
"label.rotation": "Putaran",
|
|
70
|
+
"label.mirror": "Cermin",
|
|
71
|
+
"label.copy-to-opposite": "Salin ke bertentangan",
|
|
72
|
+
"label.copy-to-walls": "Salin ke semua dinding",
|
|
73
|
+
"label.light-preset": "pratetapan cahaya",
|
|
74
|
+
"label.dark": "gelap",
|
|
75
|
+
"label.medium": "sederhana",
|
|
76
|
+
"label.bright": "cerah"
|
|
52
77
|
}
|
package/translations/zh.json
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"label.current-usage": "current usage",
|
|
3
3
|
"label.fullup": "fullup",
|
|
4
|
+
"label.carrier-full": "carrier full",
|
|
5
|
+
"label.carrier-empty": "carrier empty",
|
|
6
|
+
"label.carrier-empty-empty": "carrier empty empty",
|
|
7
|
+
"label.carrier-normal": "carrier normal",
|
|
8
|
+
"label.carrier-abnormal": "carrier abnormal",
|
|
4
9
|
"label.high-watermark": "high watermark",
|
|
5
10
|
"label.low-watermark": "low watermark",
|
|
6
11
|
"label.legend-name": "legend",
|
|
@@ -48,5 +53,25 @@
|
|
|
48
53
|
"label.node-machine": "node machine",
|
|
49
54
|
"label.nodes": "nodes",
|
|
50
55
|
"label.vehicle-animation": "vehicle animation",
|
|
51
|
-
"label.battery-rate-legend-name": "battery rate"
|
|
56
|
+
"label.battery-rate-legend-name": "battery rate",
|
|
57
|
+
"label.conveyor-orientation": "输送方向",
|
|
58
|
+
"component.backdrop": "背景",
|
|
59
|
+
"label.fit-to-board": "适配画板",
|
|
60
|
+
"label.see-through": "透视",
|
|
61
|
+
"label.east": "东墙",
|
|
62
|
+
"label.west": "西墙",
|
|
63
|
+
"label.north": "北墙",
|
|
64
|
+
"label.south": "南墙",
|
|
65
|
+
"label.floor": "地板",
|
|
66
|
+
"label.ceiling": "天花板",
|
|
67
|
+
"label.visible": "显示",
|
|
68
|
+
"label.alpha": "透明度",
|
|
69
|
+
"label.rotation": "旋转",
|
|
70
|
+
"label.mirror": "镜像",
|
|
71
|
+
"label.copy-to-opposite": "复制到对面",
|
|
72
|
+
"label.copy-to-walls": "复制到4面墙",
|
|
73
|
+
"label.light-preset": "灯光预设",
|
|
74
|
+
"label.dark": "昏暗",
|
|
75
|
+
"label.medium": "适中",
|
|
76
|
+
"label.bright": "明亮"
|
|
52
77
|
}
|