@fmsim/machine 2.0.0-beta.7 → 2.0.0-beta.75

package/src/stocker-capacity-bar.ts

@@ -11,7 +11,7 @@ import { themesColorRange } from '@fmsim/api'
 import { MCSStatusMixin } from './features/mcs-status-mixin'
 import { LEGEND_CAPACITY, Legend } 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 { ParentObjectMixin, ParentObjectMixinProperties } from './features/parent-object-mixin'
 
 const NATURE: ComponentNature = {
@@ -127,7 +127,7 @@ export default class StockerCapacityBar extends ParentObjectMixin(MCSStatusMixin
 
   get statusColor() {
     const { fullup } = this.state
-    return fullup ? 'red' : getVaueOnRanges(this.usage, this.legend)
+    return fullup ? 'red' : getValueOnRanges(this.usage, this.legend)
   }
 
   get text() {
@@ -304,7 +304,7 @@ export default class StockerCapacityBar extends ParentObjectMixin(MCSStatusMixin
       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/src/stocker-carrier-bar.ts

@@ -246,7 +246,7 @@ export default class StockerCarrierBar extends ParentObjectMixin(RectPath(Shape)
       CARRIER_FULL = 0,
       CARRIER_EMPTY = 0,
       CARRIER_EMPTY_EMPTY = 0
-    } = typeof this.data == 'object' ? this.data : {}
+    } = this.data && typeof this.data == 'object' ? this.data : {}
 
     this.setState({
       carrierFull: Number(CARRIER_FULL) || 0,

package/src/stocker.ts

@@ -47,6 +47,13 @@ export default class Stocker extends MCSTransport {
   }
 
   onchangeData(after: Record<string, any>, before: Record<string, any>): void {
+    /* MCSStatusMixin.onchangeData 의 statusColor → state.fillStyle 동기화 로직을
+     * 호출. 3D 경로에서는 mesh material 의 color 가 build 시점 한 번 결정되므로
+     * 데이터 변경 시 fillStyle 이 갱신되어야 MCSRealObject3D.onchange 의
+     * 'fillStyle in after' 분기를 타고 mesh rebuild 가 발생한다.
+     * (2D 는 render() 가 매 프레임 statusColor getter 를 직접 사용하므로 영향 없음.) */
+    super.onchangeData(after, before)
+
     /* non-identifiable component 즉, StockerCapacityBar 에게 데이터를 전달함 */
     this.components.filter(component => !component.isIdentifiable()).forEach(component => (component.data = this.data))
   }

package/src/templates/backdrop.ts

@@ -0,0 +1,30 @@
+const icon = new URL('../../icons/backdrop.png', import.meta.url).href
+
+export default {
+  type: 'backdrop',
+  description: '3D scene backdrop — 6-sided envelope (4 walls + floor + ceiling)',
+  group: ['etc'],
+  icon,
+  model: {
+    type: 'backdrop',
+    top: 0,
+    left: 0,
+    width: 3000,
+    height: 2400,
+    // depth seeded on creation as min(width, height) by Backdrop's
+    // `_syncFromRoot(seedDepth=true)`. Editable via property panel
+    // afterward — board-resize syncs won't override it.
+    fitToBoard: true,
+    alpha: 1,
+    // 6면 합성 상태. 비어있으면 backdrop 컴포넌트의 default 가 적용됨
+    // (벽 4면 = #dde2e8/0.35, 바닥 = #9c9c9c/1.0, 천장 = #e8e8ec/1.0).
+    faces: {
+      east: { fillStyle: '#dde2e8', visible: true, alpha: 0.35 },
+      west: { fillStyle: '#dde2e8', visible: true, alpha: 0.35 },
+      north: { fillStyle: '#dde2e8', visible: true, alpha: 0.35 },
+      south: { fillStyle: '#dde2e8', visible: true, alpha: 0.35 },
+      floor: { fillStyle: '#9c9c9c', visible: true, alpha: 1.0 },
+      ceiling: { fillStyle: '#e8e8ec', visible: true, alpha: 1.0 }
+    }
+  }
+}

package/src/templates/decal.ts

@@ -0,0 +1,21 @@
+const icon = new URL('../../icons/decal.png', import.meta.url).href
+
+export default {
+  type: 'decal',
+  description: 'flat surface decal (3D-only) — floor zone paint, path lanes, signage',
+  group: ['etc'],
+  icon,
+  model: {
+    type: 'decal',
+    top: 100,
+    left: 100,
+    width: 200,
+    height: 200,
+    zPos: 0,
+    depth: 0,
+    fillStyle: '#cccccc',
+    strokeStyle: '#999999',
+    lineWidth: 1,
+    alpha: 1
+  }
+}

package/src/templates/index.ts

@@ -17,9 +17,12 @@ import agvLine from './agv-line'
 import ohtLine from './oht-line'
 import conveyor from './conveyor'
 
+import Scanner from './scanner'
 import Node from './node'
 import DataSubscription from './data-subscription'
 import FloatingContainer from './floating-container'
+import Decal from './decal'
+import Backdrop from './backdrop'
 
 export default [
   StockerCapacityBar,
@@ -41,7 +44,10 @@ export default [
   Shelf,
   Port,
 
+  Scanner,
   Node,
   FloatingContainer,
-  DataSubscription
+  DataSubscription,
+  Decal,
+  Backdrop
 ]

package/src/templates/scanner.ts

@@ -0,0 +1,20 @@
+const icon = new URL('../../icons/equipment.png', import.meta.url).href
+
+export default {
+  type: 'Scanner',
+  description: 'Fixed mount barcode/QR scanner',
+  group: ['etc'],
+  icon,
+  model: {
+    type: 'Scanner',
+    x1: 100,
+    y1: 100,
+    x2: 130,
+    y2: 110,
+    x3: 100,
+    y3: 120,
+    strokeStyle: '#333',
+    fillStyle: 'red',
+    lineWidth: 1
+  }
+}

package/src/utils/get-value-on-ranges.ts

@@ -1,4 +1,4 @@
-export function getVaueOnRanges(value, param): any {
+export function getValueOnRanges(value, param): any {
   for (let range in param) {
     let [from, to]: (number | string)[] = range.split('~')
     let from_defined = !!from
@@ -8,14 +8,12 @@ export function getVaueOnRanges(value, param): any {
     to = parseFloat(to)
     value = Number(value) || 0
 
-    // from이나 to 둘 중 하나만 있는 경우 먼저 계산
     if (from_defined && !to_defined && value >= from) {
       return param[range]
-    } else if (!from_defined && to_defined && value < from) {
+    } else if (!from_defined && to_defined && value < to) {
       return param[range]
     }
 
-    // 소수점이 있으므로  from <= value < to 가 되야함
     if (value >= from && value < to) {
       return param[range]
     }

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

@@ -46,5 +46,20 @@
   "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.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"
 }

package/translations/ja.json

@@ -48,5 +48,20 @@
   "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.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面にコピー"
 }

package/translations/ko.json

@@ -49,5 +49,20 @@
   "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.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면에 복사"
 }

package/translations/ms.json

@@ -48,5 +48,20 @@
   "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.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"
 }

package/translations/zh.json

@@ -48,5 +48,20 @@
   "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.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面墙"
 }