diff --git a/SicUI/Controls/WaferCtrl.xaml b/SicUI/Controls/WaferCtrl.xaml index d124637a..ffbf27c3 100644 --- a/SicUI/Controls/WaferCtrl.xaml +++ b/SicUI/Controls/WaferCtrl.xaml @@ -35,7 +35,7 @@ ToolTip="{Binding ToolTip}" ToolTipService.ShowOnDisabled="True" TrayProcessCount="{Binding TrayProcessCount}" - TrayStatus="{Binding WaferTrayStatus}" + TrayStatus="{Binding TrayStatus}" ViewType="Top" WaferStatus="{Binding WaferStatus}"> diff --git a/SicUI/Models/LocalUIViewModelBase.cs b/SicUI/Models/LocalUIViewModelBase.cs index 4616120b..9377ee2b 100644 --- a/SicUI/Models/LocalUIViewModelBase.cs +++ b/SicUI/Models/LocalUIViewModelBase.cs @@ -203,7 +203,7 @@ namespace SicUI.Models { get { - if (ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers[0].WaferTrayStatus == 1) + if (ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers[0].TrayStatus == 1) { return Visibility.Visible; } @@ -215,7 +215,7 @@ namespace SicUI.Models { get { - if (ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].WaferTrayStatus == 1) + if (ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].TrayStatus == 1) { return Visibility.Visible; } @@ -227,7 +227,7 @@ namespace SicUI.Models { get { - if (ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers[0].WaferTrayStatus == 1) + if (ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers[0].TrayStatus == 1) { return Visibility.Visible; } @@ -239,7 +239,7 @@ namespace SicUI.Models { get { - if (ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers[0].WaferTrayStatus == 1) + if (ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers[0].TrayStatus == 1) { return Visibility.Visible; } @@ -251,7 +251,7 @@ namespace SicUI.Models { get { - if (ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers[0].WaferTrayStatus == 1) + if (ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers[0].TrayStatus == 1) { return Visibility.Visible; } @@ -263,7 +263,7 @@ namespace SicUI.Models { get { - if (ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers[0].WaferTrayStatus == 1) + if (ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers[0].TrayStatus == 1) { return Visibility.Visible; } diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index c9a4e389..ae2a144f 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ