diff --git a/SicRT/Config/System.sccfg b/SicRT/Config/System.sccfg index a161a1a..5cea1d7 100644 --- a/SicRT/Config/System.sccfg +++ b/SicRT/Config/System.sccfg @@ -979,24 +979,25 @@ - + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -1559,24 +1560,24 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/SicUI/Models/PMs/Converters/WaterTempDeviceDataToToolTipConverter.cs b/SicUI/Models/PMs/Converters/WaterTempDeviceDataToToolTipConverter.cs new file mode 100644 index 0000000..16a7830 --- /dev/null +++ b/SicUI/Models/PMs/Converters/WaterTempDeviceDataToToolTipConverter.cs @@ -0,0 +1,27 @@ +using System; +using System.Globalization; +using System.Windows.Data; +using Aitex.Core.Common.DeviceData; + +namespace SicUI.Models.PMs.Converters +{ + internal class WaterTempDeviceDataToToolTipConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is AITSensorAnalogData deviceData) + { + return deviceData.DisplayName; + } + else + { + return null; + } + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/SicUI/Models/PMs/PMOperationView.xaml b/SicUI/Models/PMs/PMOperationView.xaml index 6ce35fc..fcf290b 100644 --- a/SicUI/Models/PMs/PMOperationView.xaml +++ b/SicUI/Models/PMs/PMOperationView.xaml @@ -70,13 +70,14 @@ + - + diff --git a/SicUI/SicUI.csproj b/SicUI/SicUI.csproj index 431dd5b..982b4a5 100644 --- a/SicUI/SicUI.csproj +++ b/SicUI/SicUI.csproj @@ -280,6 +280,7 @@ if exist "$(ProjectDir)..\SicSetup\Packages\SicUI\PresetGroups" rd "$(ProjectDir ContinueSelectDialogView.xaml + PMAlarmView.xaml @@ -951,6 +952,7 @@ if exist "$(ProjectDir)..\SicSetup\Packages\SicUI\PresetGroups" rd "$(ProjectDir + diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index bb3ba4e..ac325e6 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll index b94d31a..1626b46 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll index 477478a..cd3e3cb 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll index 6c5906d..8e3bd04 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index fd5b6c1..7993966 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll index db25086..80fec8a 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ