[정영민] 설비 겹침 정렬 기능 수정
26.03.11 설비 겹침 기능 수정
This commit is contained in:
@@ -14,8 +14,6 @@ namespace AZTECHWB
|
||||
{
|
||||
public RectTransform rectTransform;
|
||||
public CompleteInfo data;
|
||||
private List<CompleteInfo> alarmInfos = new();
|
||||
|
||||
public RectTransform Default_KPI;
|
||||
public RectTransform Expand_KPI;
|
||||
|
||||
@@ -38,12 +36,17 @@ namespace AZTECHWB
|
||||
public bool isInteractable;
|
||||
public bool isExpand;
|
||||
|
||||
[HideInInspector] public Transform targetTransform;
|
||||
[HideInInspector] public Vector2 screenPosition;
|
||||
[HideInInspector] public float distanceToCamera;
|
||||
|
||||
public Action<MachineStatusItem> onClickIcon;
|
||||
|
||||
public void Init(string itemName)
|
||||
public void Init(Machine machine)
|
||||
{
|
||||
isInteractable = true;
|
||||
gameObject.name = itemName;
|
||||
gameObject.name = machine.machineName;
|
||||
targetTransform = machine.transform;
|
||||
|
||||
rectTransform = GetComponent<RectTransform>();
|
||||
transform.TryGetComponentInChildren(nameof(Default_KPI), out Default_KPI);
|
||||
@@ -57,29 +60,25 @@ namespace AZTECHWB
|
||||
transform.TryGetComponentInChildren(nameof(Default_Alarm), out Default_Alarm);
|
||||
transform.TryGetComponentInChildren(nameof(Expand_Alarm), out Expand_Alarm);
|
||||
|
||||
//eorate
|
||||
transform.TryGetComponentInChildren(nameof(pvp), out pvp);
|
||||
transform.TryGetComponentInChildren(nameof(workcd), out workcd);
|
||||
//porate
|
||||
transform.TryGetComponentInChildren(nameof(goodqtyrate), out goodqtyrate);
|
||||
transform.TryGetComponentInChildren(nameof(workdt), out workdt);
|
||||
transform.TryGetComponentInChildren(nameof(wordno), out wordno);
|
||||
}
|
||||
|
||||
public void SetData(CompleteInfo data, string machineName)
|
||||
public void SetData(CompleteInfo data)
|
||||
{
|
||||
this.data = data;
|
||||
|
||||
//eorate.SetText(PercentCalculate(data.eorate).ToString() + "%");
|
||||
pvp.SetText(PercentCalculate(data.pvp).ToString() + "%");
|
||||
workcd.SetText(SetTextData(data.workcd));
|
||||
goodqtyrate.SetText(DecimalPointPercentCalculate(data.goodqtyrate).ToString() + "%");
|
||||
//porate.SetText(PercentCalculate(data.porate).ToString() + "%");
|
||||
workdt.SetText(CorrectionTime(data.workdt, "yyyy-MM-dd"));
|
||||
wordno.SetText(SetTextData(data.wordno));
|
||||
|
||||
DefaultMachineName.SetText(SetNameData(data.worknm, machineName));
|
||||
ExpandMachineName.SetText(SetNameData(data.worknm, machineName));
|
||||
DefaultMachineName.SetText(SetNameData(data.worknm));
|
||||
ExpandMachineName.SetText(SetNameData(data.worknm));
|
||||
|
||||
Default_Status.color = SetStatusColor(data.statusnm);
|
||||
Expand_Status.color = SetStatusColor(data.statusnm);
|
||||
@@ -87,27 +86,11 @@ namespace AZTECHWB
|
||||
DefaultMachineName.color = SetStatusColor(data.statusnm) == Color.gray ? Color.gray : DefaultMachineName.color;
|
||||
ExpandMachineName.color = SetStatusColor(data.statusnm) == Color.gray ? Color.gray : ExpandMachineName.color;
|
||||
}
|
||||
//public void SetAlarmData(List<CompleteInfo> alarmInfos)
|
||||
//{
|
||||
// if (alarmInfos != null || alarmInfos.Count != 0)
|
||||
// {
|
||||
// this.alarmInfos = alarmInfos;
|
||||
// var isAlarm = alarmInfos.Any(a => a.state.Trim().Equals("SET", StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
// Default_Alarm.gameObject.SetActive(isAlarm);
|
||||
// Expand_Alarm.gameObject.SetActive(isAlarm);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Default_Alarm.gameObject.SetActive(false);
|
||||
// Expand_Alarm.gameObject.SetActive(false);
|
||||
// }
|
||||
//}
|
||||
private string SetNameData(string value, string machineName)
|
||||
private string SetNameData(string value)
|
||||
{
|
||||
if (!CheckDataExists(value))
|
||||
{
|
||||
return machineName;
|
||||
return gameObject.name;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
@@ -224,6 +207,13 @@ namespace AZTECHWB
|
||||
isExpand = false;
|
||||
}
|
||||
}
|
||||
|
||||
public Vector2 GetSize()
|
||||
{
|
||||
Vector2 baseSize = rectTransform.sizeDelta;
|
||||
float scale = transform.localScale.x; // UpdateScales에서 적용한 스케일
|
||||
return baseSize * scale;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user