From a8623d825ce7cc32f4cd6f34f739def27315ef66 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1N1NK8A\\auvkk" Date: Wed, 19 Apr 2023 15:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E6=B0=B4=E6=B8=A9=E8=AE=BE=E7=BD=AE=E4=B8=AD?= =?UTF-8?q?=E7=9A=84SpareTemp=E9=A1=B9=E7=9B=AE=E3=80=82=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96PM=E6=B0=B4=E6=B8=A9=E6=8A=A5=E8=AD=A6=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C=EF=BC=8C=E5=BD=93?= =?UTF-8?q?=E8=B6=85=E6=B8=A9=E6=8A=A5=E8=AD=A6=E8=A7=A6=E5=8F=91=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=B0=B4=E6=B8=A9=E9=A2=9C=E8=89=B2=E6=A0=87=E9=BB=84?= =?UTF-8?q?=E6=88=96=E6=A0=87=E7=BA=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SicRT/Config/System.sccfg | 2 - SicUI/Models/PMs/PMOperationView.xaml | 271 ++++++++++------------- SicUI/Models/PMs/PMOperationViewModel.cs | 52 ++--- 3 files changed, 142 insertions(+), 183 deletions(-) diff --git a/SicRT/Config/System.sccfg b/SicRT/Config/System.sccfg index 6dda9c5..a161a1a 100644 --- a/SicRT/Config/System.sccfg +++ b/SicRT/Config/System.sccfg @@ -996,7 +996,6 @@ - @@ -1577,7 +1576,6 @@ - diff --git a/SicUI/Models/PMs/PMOperationView.xaml b/SicUI/Models/PMs/PMOperationView.xaml index 9ddd3eb..6ce35fc 100644 --- a/SicUI/Models/PMs/PMOperationView.xaml +++ b/SicUI/Models/PMs/PMOperationView.xaml @@ -66,6 +66,81 @@ Black #00ae9d + + + + + DataContext="{Binding SHFlowTemp}" + Style="{StaticResource WaterTempBackground}"> + Style="{StaticResource WaterTempForeground}" /> + DataContext="{Binding ChamberTopFlowTemp}" + Style="{StaticResource WaterTempBackground}"> + Style="{StaticResource WaterTempForeground}"/> @@ -1373,18 +1432,10 @@ + DataContext="{Binding ChamberMid1FlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> @@ -1421,18 +1472,10 @@ + DataContext="{Binding ChamberMid2FlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> @@ -1469,18 +1512,10 @@ + DataContext="{Binding ChamberBottomFlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> + DataContext="{Binding ChamberBottomPlateTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> + DataContext="{Binding PowerRod1FlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> @@ -1682,18 +1701,10 @@ + DataContext="{Binding PowerRod2FlowTemp}" + Style="{StaticResource WaterTempBackground}"> + Style="{StaticResource WaterTempForeground}"/> + DataContext="{Binding ForelineFlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> @@ -1774,18 +1777,10 @@ + DataContext="{Binding ElectrodeWFlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> @@ -1820,18 +1815,10 @@ + DataContext="{Binding TMPumpFlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> @@ -1867,18 +1854,10 @@ + DataContext="{Binding TMTopLidFlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> - + Style="{StaticResource WaterTempBackground}" > + + DataContext="{Binding TransformerFlowTemp}" + Style="{StaticResource WaterTempBackground}" > + Style="{StaticResource WaterTempForeground}" /> diff --git a/SicUI/Models/PMs/PMOperationViewModel.cs b/SicUI/Models/PMs/PMOperationViewModel.cs index 2682a41..3ed4376 100644 --- a/SicUI/Models/PMs/PMOperationViewModel.cs +++ b/SicUI/Models/PMs/PMOperationViewModel.cs @@ -512,44 +512,44 @@ namespace SicUI.Models.PMs #region Water Temp Data - [Subscription("SHFlowTemp.Value")] - public float SHFlowTemp { get; set; } + [Subscription("SHFlowTemp.DeviceData")] + public AITSensorAnalogData SHFlowTemp { get; set; } - [Subscription("ChamTopFlowTemp.Value")] - public float ChamberTopFlowTemp { get; set; } + [Subscription("ChamTopFlowTemp.DeviceData")] + public AITSensorAnalogData ChamberTopFlowTemp { get; set; } - [Subscription("ChamMiddleFlow1Temp.Value")] - public float ChamberMid1FlowTemp { get; set; } + [Subscription("ChamMiddleFlow1Temp.DeviceData")] + public AITSensorAnalogData ChamberMid1FlowTemp { get; set; } - [Subscription("ChamMiddleFlow2Temp.Value")] - public float ChamberMid2FlowTemp { get; set; } + [Subscription("ChamMiddleFlow2Temp.DeviceData")] + public AITSensorAnalogData ChamberMid2FlowTemp { get; set; } - [Subscription("ChamBottomFlowTemp.Value")] - public float ChamberBottomFlowTemp { get; set; } + [Subscription("ChamBottomFlowTemp.DeviceData")] + public AITSensorAnalogData ChamberBottomFlowTemp { get; set; } - [Subscription("ChamBottomPlateTemp.Value")] - public float ChamberBottomPlateTemp { get; set; } + [Subscription("ChamBottomPlateTemp.DeviceData")] + public AITSensorAnalogData ChamberBottomPlateTemp { get; set; } - [Subscription("PowerRod1FlowTemp.Value")] - public float PowerRod1FlowTemp { get; set; } + [Subscription("PowerRod1FlowTemp.DeviceData")] + public AITSensorAnalogData PowerRod1FlowTemp { get; set; } - [Subscription("PowerRod2FlowTemp.Value")] - public float PowerRod2FlowTemp { get; set; } + [Subscription("PowerRod2FlowTemp.DeviceData")] + public AITSensorAnalogData PowerRod2FlowTemp { get; set; } - [Subscription("ForelineFlowTemp.Value")] - public float ForelineFlowTemp { get; set; } + [Subscription("ForelineFlowTemp.DeviceData")] + public AITSensorAnalogData ForelineFlowTemp { get; set; } - [Subscription("ElectrodeWFlowTemp.Value")] - public float ElectrodeWFlowTemp { get; set; } + [Subscription("ElectrodeWFlowTemp.DeviceData")] + public AITSensorAnalogData ElectrodeWFlowTemp { get; set; } - [Subscription("TMPumpFlowTemp.Value")] - public float TMPumpFlowTemp { get; set; } + [Subscription("TMPumpFlowTemp.DeviceData")] + public AITSensorAnalogData TMPumpFlowTemp { get; set; } - [Subscription("TMTopLidFlowTemp.Value")] - public float TMTopLidFlowTemp { get; set; } + [Subscription("TMTopLidFlowTemp.DeviceData")] + public AITSensorAnalogData TMTopLidFlowTemp { get; set; } - [Subscription("TransformerFlowTemp.Value")] - public float TransformerFlowTemp { get; set; } + [Subscription("TransformerFlowTemp.DeviceData")] + public AITSensorAnalogData TransformerFlowTemp { get; set; } [Subscription("SensorSHFlowSW.Value")] public bool FlowSW1 { get; set; }