설비 KPI 기능 수정 및 작업 조건 분석 데이터 오류 수정

This commit is contained in:
정영민
2025-04-08 08:29:46 +09:00
parent 8683464744
commit fa09aabd1e
5 changed files with 67 additions and 30 deletions

View File

@@ -12,24 +12,30 @@ public class HighLighterManager : MonoBehaviour, ISingle
var building = FindSingle<Building>();
machines = building.floors.SelectMany(f => f.machines).ToArray();
}
public void ClickKPIToHighlight(UI_MachineKPI clickKPI)
{
foreach(var machine in machines)
{
if(machine.machineKPI == clickKPI)
{
ActiveHighLighter(machine);
}
}
}
public void ClickNotKPIToHighlight(Machine highLightMachine)
{
ActiveHighLighter(highLightMachine);
ActiveMachineKPI(highLightMachine);
}
public void ActiveHighLighter(Machine highLightMachine)
{
foreach (var machine in machines)
{
machine.DeactiveHighLighter();
if (machine.machineKPI != null)
{
machine.machineKPI.Shrink();
}
}
currentMachine = highLightMachine;
currentMachine.ActiveHighLighter();
if (currentMachine.machineKPI != null)
{
currentMachine.machineKPI.Expand();
}
}
public void ResetAllHighLighter()
{
@@ -43,6 +49,21 @@ public class HighLighterManager : MonoBehaviour, ISingle
}
}
}
private void ActiveMachineKPI(Machine curentMachine)
{
foreach (var machine in machines)
{
if (machine.machineKPI != null)
{
machine.machineKPI.Shrink();
}
}
if (curentMachine.machineKPI != null)
{
curentMachine.machineKPI.Expand();
}
}
public void SetTargetPosToMachine(Machine machine)
{
OrbitalController controller = FindSingle<OrbitalController>();

View File

@@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -24,6 +25,8 @@ namespace CHN
public Vector3 originScale;
public float verticalSpacing = 100f;
public Action<UI_MachineKPI> onClickKPI;
[Range(0.1f, 0.8f)]
public float minScale;
[Range(0.5f, 1.5f)]
@@ -87,6 +90,7 @@ namespace CHN
current_MachineKPI = machineKPI;
current_MachineKPI.Expand();
current_MachineKPI.transform.SetAsLastSibling();
onClickKPI?.Invoke(current_MachineKPI);
}
private void Update()
{

View File

@@ -60,10 +60,10 @@ public class WorkConditionsManager : MonoBehaviour, ISingle
foreach (var row in workConditionsData.data.rows)
{
originPeakData.Add(ConvertStringToInt(row.C027));
originTemperatureData.Add(ConvertStringToInt(row.TEMP01));
originHumidityData.Add(ConvertStringToInt(row.HUMI01));
originCycleTimeData.Add(ConvertStringToInt(row.C045));
originPeakData.Add(ConvertStringToFloat(row.C027));
originTemperatureData.Add(ConvertStringToFloat(row.TEMP01));
originHumidityData.Add(ConvertStringToFloat(row.HUMI01));
originCycleTimeData.Add(ConvertStringToFloat(row.C045));
originChartLabels.Add(row._time);
}
@@ -78,9 +78,9 @@ public class WorkConditionsManager : MonoBehaviour, ISingle
//onSendChartLabels?.Invoke(mainChartLabels);
onCompleteLoadData?.Invoke(workConditionsData);
}
private int ConvertStringToInt(string stringData)
private float ConvertStringToFloat(string stringData)
{
int.TryParse(stringData, out var result);
float.TryParse(stringData, out var result);
return result;
}
public void ChangeMainChartData(string dataName)