From 6ff9103fa26f8023961a59151aa3f8d47aa29a1a Mon Sep 17 00:00:00 2001 From: Tyrone CT Date: Wed, 1 Jan 2025 20:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SV=E5=92=8CMV=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/LightChart/ChartRtSeries.cs | 86 +++++++------- CapMachine.Wpf/Models/Tag/ITag.cs | 15 ++- CapMachine.Wpf/Models/Tag/Tag.cs | 55 +++++++-- CapMachine.Wpf/Services/DataRecordService.cs | 2 +- .../Services/MachineRtDataService.cs | 18 +-- CapMachine.Wpf/Services/PPCService.cs | 16 +-- CapMachine.Wpf/Views/HistoryDataView.xaml | 96 +++++++-------- CapMachine.Wpf/Views/MonitorView.xaml | 34 +++--- CapMachine.Wpf/Views/ProConfigView.xaml | 82 ++++++++----- CapMachine.Wpf/Views/RealTimeChartView.xaml | 112 +++++++++--------- 10 files changed, 287 insertions(+), 229 deletions(-) diff --git a/CapMachine.Wpf/Models/LightChart/ChartRtSeries.cs b/CapMachine.Wpf/Models/LightChart/ChartRtSeries.cs index 55781a0..32fc63d 100644 --- a/CapMachine.Wpf/Models/LightChart/ChartRtSeries.cs +++ b/CapMachine.Wpf/Models/LightChart/ChartRtSeries.cs @@ -40,12 +40,12 @@ namespace CapMachine.Wpf.Models.LightChart AddSeries(configChart.Name!, configChart.ConfigChartYAxis!); //初始化字符串 - ValueEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - LeftCursorEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - RightCursorEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - MinEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - MaxEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - AveEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); + ValueEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + LeftCursorEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + RightCursorEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + MinEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + MaxEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + AveEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); } public ChartRtSeries(LightningChart Chart, ChartColor ChartColor, ObservableCollection listchartRtSeries, HistoryConfigChart configChart, ConfigService configService, short decimalPoint) { @@ -63,12 +63,12 @@ namespace CapMachine.Wpf.Models.LightChart AddSeries(configChart.Name!, configChart.ConfigChartYAxis!); //初始化字符串 - ValueEngValueStr= Math.Round(0.00, DecimalPoint).ToString(); - LeftCursorEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - RightCursorEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - MinEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - MaxEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); - AveEngValueStr = Math.Round(0.00, DecimalPoint).ToString(); + ValueEngPvValueStr= Math.Round(0.00, DecimalPoint).ToString(); + LeftCursorEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + RightCursorEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + MinEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + MaxEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); + AveEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString(); } @@ -98,18 +98,18 @@ namespace CapMachine.Wpf.Models.LightChart { _Value = value; RaisePropertyChanged(); - ValueEngValueStr = Math.Round(value, DecimalPoint).ToString(); + ValueEngPvValueStr = Math.Round(value, DecimalPoint).ToString(); } } } - private string _ValueEngValueStr; + private string _ValueEngPvValueStr; /// - /// ValueEngValueStr 值 工程值的字符串 + /// ValueEngPvValueStr 值 工程值的字符串 /// - public string ValueEngValueStr + public string ValueEngPvValueStr { - get { return _ValueEngValueStr; } - set { _ValueEngValueStr = value; RaisePropertyChanged(); } + get { return _ValueEngPvValueStr; } + set { _ValueEngPvValueStr = value; RaisePropertyChanged(); } } /// @@ -171,18 +171,18 @@ namespace CapMachine.Wpf.Models.LightChart { _LeftCursorValue = value; RaisePropertyChanged(); - LeftCursorEngValueStr = Math.Round(value, DecimalPoint).ToString(); + LeftCursorEngPvValueStr = Math.Round(value, DecimalPoint).ToString(); } } } - private string _LeftCursorEngValueStr; + private string _LeftCursorEngPvValueStr; /// /// LeftCursor 左游标值 工程值的字符串 /// - public string LeftCursorEngValueStr + public string LeftCursorEngPvValueStr { - get { return _LeftCursorEngValueStr; } - set { _LeftCursorEngValueStr = value; RaisePropertyChanged(); } + get { return _LeftCursorEngPvValueStr; } + set { _LeftCursorEngPvValueStr = value; RaisePropertyChanged(); } } @@ -200,18 +200,18 @@ namespace CapMachine.Wpf.Models.LightChart { _RightCursorValue = value; RaisePropertyChanged(); - RightCursorEngValueStr = Math.Round(value, DecimalPoint).ToString(); + RightCursorEngPvValueStr = Math.Round(value, DecimalPoint).ToString(); } } } - private string _RightCursorEngValueStr; + private string _RightCursorEngPvValueStr; /// /// RightCursor 右游标值 工程值的字符串 /// - public string RightCursorEngValueStr + public string RightCursorEngPvValueStr { - get { return _RightCursorEngValueStr; } - set { _RightCursorEngValueStr = value; RaisePropertyChanged(); } + get { return _RightCursorEngPvValueStr; } + set { _RightCursorEngPvValueStr = value; RaisePropertyChanged(); } } @@ -229,18 +229,18 @@ namespace CapMachine.Wpf.Models.LightChart { _MinValue = value; RaisePropertyChanged(); - MinEngValueStr = Math.Round(value, DecimalPoint).ToString(); + MinEngPvValueStr = Math.Round(value, DecimalPoint).ToString(); } } } - private string _MinEngValueStr; + private string _MinEngPvValueStr; /// /// Min 最小值 工程值的字符串 /// - public string MinEngValueStr + public string MinEngPvValueStr { - get { return _MinEngValueStr; } - set { _MinEngValueStr = value; RaisePropertyChanged(); } + get { return _MinEngPvValueStr; } + set { _MinEngPvValueStr = value; RaisePropertyChanged(); } } private double _MaxValue; @@ -256,18 +256,18 @@ namespace CapMachine.Wpf.Models.LightChart { _MaxValue = value; RaisePropertyChanged(); - MaxEngValueStr = Math.Round(value, DecimalPoint).ToString(); + MaxEngPvValueStr = Math.Round(value, DecimalPoint).ToString(); } } } - private string _MaxEngValueStr; + private string _MaxEngPvValueStr; /// /// Max 最大值 工程值的字符串 /// - public string MaxEngValueStr + public string MaxEngPvValueStr { - get { return _MaxEngValueStr; } - set { _MaxEngValueStr = value; RaisePropertyChanged(); } + get { return _MaxEngPvValueStr; } + set { _MaxEngPvValueStr = value; RaisePropertyChanged(); } } @@ -284,18 +284,18 @@ namespace CapMachine.Wpf.Models.LightChart { _AveValue = value; RaisePropertyChanged(); - AveEngValueStr = Math.Round(value, DecimalPoint).ToString(); + AveEngPvValueStr = Math.Round(value, DecimalPoint).ToString(); } } } - private string _AveEngValueStr; + private string _AveEngPvValueStr; /// /// Ave 平均值 工程值的字符串 /// - public string AveEngValueStr + public string AveEngPvValueStr { - get { return _AveEngValueStr; } - set { _AveEngValueStr = value; RaisePropertyChanged(); } + get { return _AveEngPvValueStr; } + set { _AveEngPvValueStr = value; RaisePropertyChanged(); } } #endregion diff --git a/CapMachine.Wpf/Models/Tag/ITag.cs b/CapMachine.Wpf/Models/Tag/ITag.cs index 41f63a4..a7d5cbe 100644 --- a/CapMachine.Wpf/Models/Tag/ITag.cs +++ b/CapMachine.Wpf/Models/Tag/ITag.cs @@ -34,12 +34,12 @@ namespace CapMachine.Wpf.Models.Tag /// /// 工程值 PV /// - double EngValue { get; set; } + double EngPvValue { get; set; } /// /// 工程值的字符串 PV /// - string EngValueStr { get; set; } + string EngPvValueStr { get; set; } /// /// 工程值 Sv @@ -51,6 +51,17 @@ namespace CapMachine.Wpf.Models.Tag /// string EngSvValueStr { get; set; } + /// + /// 工程值 Mv + /// + double EngMvValue { get; set; } + + /// + /// 工程值的字符串 Mv + /// + string EngMvValueStr { get; set; } + + /// /// MV /// diff --git a/CapMachine.Wpf/Models/Tag/Tag.cs b/CapMachine.Wpf/Models/Tag/Tag.cs index aa2e3b9..fc4ade9 100644 --- a/CapMachine.Wpf/Models/Tag/Tag.cs +++ b/CapMachine.Wpf/Models/Tag/Tag.cs @@ -177,16 +177,16 @@ namespace CapMachine.Wpf.Models.Tag set { _AutoHandState = value; RaisePropertyChanged(); } } - private double _EngSVValue; + private double _EngSvValue; /// /// 工程值 SV /// - public double EngSVValue + public double EngSvValue { - get { return _EngSVValue; } + get { return _EngSvValue; } set { - _EngSVValue = value; + _EngSvValue = value; if (TagValue.IsShow) { RaisePropertyChanged(); @@ -206,32 +206,61 @@ namespace CapMachine.Wpf.Models.Tag } - private double _EngValue; + private double _EngPvValue; /// /// 工程值 PV /// - public double EngValue + public double EngPvValue { - get { return _EngValue; } + get { return _EngPvValue; } set { - _EngValue = value; + _EngPvValue = value; if (TagValue.IsShow) { RaisePropertyChanged(); } - EngValueStr = Math.Round(value, DecimalPoint).ToString(); + EngPvValueStr = Math.Round(value, DecimalPoint).ToString(); } } - private string _EngValueStr; + private string _EngPvValueStr; /// /// 工程值的字符串 /// - public string EngValueStr + public string EngPvValueStr { - get { return _EngValueStr; } - set { _EngValueStr = value; RaisePropertyChanged(); } + get { return _EngPvValueStr; } + set { _EngPvValueStr = value; RaisePropertyChanged(); } + } + + + private double _EngMvValue; + /// + /// 工程值 MV + /// + public double EngMvValue + { + get { return _EngMvValue; } + set + { + _EngMvValue = value; + if (TagValue.IsShow) + { + RaisePropertyChanged(); + } + EngMvValueStr = Math.Round(value, DecimalPoint).ToString(); + } + } + + private string _EngMvValueStr; + /// + /// 工程值的字符串 MV + /// + public string EngMvValueStr + { + get { return _EngMvValueStr; } + set { _EngMvValueStr = value; RaisePropertyChanged(); } } diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs index aad145f..e071932 100644 --- a/CapMachine.Wpf/Services/DataRecordService.cs +++ b/CapMachine.Wpf/Services/DataRecordService.cs @@ -434,7 +434,7 @@ namespace CapMachine.Wpf.Services //CycleTimer.Stop(); //先关闭定时器 var DataInfo = MachineRtDataService.TagManger.DicTags - .ToDictionary(kvp => kvp.Key, kvp => (object)kvp.Value.EngValue); + .ToDictionary(kvp => kvp.Key, kvp => (object)kvp.Value.EngPvValue); DataInfo.Add("创建时间", DateTime.Now); var RecordData = new RecordChannelData() diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs index 06c664d..4089b01 100644 --- a/CapMachine.Wpf/Services/MachineRtDataService.cs +++ b/CapMachine.Wpf/Services/MachineRtDataService.cs @@ -181,7 +181,7 @@ namespace CapMachine.Wpf.Services Unit = "rpm", PVAddress = "VW100",//地址信息 SVAddress = "VW200", - MVAddress = "VW250", + MVAddress = "VW242", IsMeter = true, AutoHandSwitchAddress = "VW240", Precision = 1, @@ -201,7 +201,7 @@ namespace CapMachine.Wpf.Services Unit = "MpaA", PVAddress = "VW102",//地址信息 SVAddress = "VW202", - MVAddress = "VW252", + MVAddress = "VW246", IsMeter = true, AutoHandSwitchAddress = "VW244", Precision = 1000, @@ -221,7 +221,7 @@ namespace CapMachine.Wpf.Services Unit = "MpaA", PVAddress = "VW104",//地址信息 SVAddress = "VW204", - MVAddress = "VW254", + MVAddress = "VW250", IsMeter = true, AutoHandSwitchAddress = "VW248", Precision = 1000, @@ -241,7 +241,7 @@ namespace CapMachine.Wpf.Services Unit = "℃", PVAddress = "VW106",//地址信息 SVAddress = "VW206", - MVAddress = "VW256", + MVAddress = "VW254", IsMeter = true, AutoHandSwitchAddress = "VW252", Precision = 10, @@ -281,7 +281,7 @@ namespace CapMachine.Wpf.Services Unit = "℃", PVAddress = "VW110",//地址信息 SVAddress = "VW210", - MVAddress = "VW260", + MVAddress = "VW262", IsMeter = true, AutoHandSwitchAddress = "VW260", Precision = 10, @@ -954,7 +954,7 @@ namespace CapMachine.Wpf.Services { //case ConstShortType: // //TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value = SiemensDrive.ReadInt16(itemTag.Value.Address).Content; - // TagManger.GetTagByName(itemTag.Value.Name).EngValue = TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision; + // TagManger.GetTagByName(itemTag.Value.Name).EngPvValue = TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision; // break; case ConstShortType: @@ -962,7 +962,7 @@ namespace CapMachine.Wpf.Services ////仿真数据 //TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value = (short)Random.Next(1, 100); - //TagManger.GetTagByName(itemTag.Value.Name).EngValue = (short)Random.Next(1, 100) * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision; + //TagManger.GetTagByName(itemTag.Value.Name).EngPvValue = (short)Random.Next(1, 100) * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision; //LinkState = false; //PLC 数据 @@ -972,7 +972,7 @@ namespace CapMachine.Wpf.Services if (OperateResultShort.IsSuccess) { TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value = SiemensDrive.ReadInt16(itemTag.Value.PVAddress).Content; - TagManger.GetTagByName(itemTag.Value.Name).EngValue = TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision; + TagManger.GetTagByName(itemTag.Value.Name).EngPvValue = TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision; LinkState = true; } else @@ -987,7 +987,7 @@ namespace CapMachine.Wpf.Services if (OperateResultSVShort.IsSuccess) { TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value = OperateResultSVShort.Content; - TagManger.GetTagByName(itemTag.Value.Name).EngSVValue = TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision; + TagManger.GetTagByName(itemTag.Value.Name).EngSvValue = TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision; LinkState = true; } else diff --git a/CapMachine.Wpf/Services/PPCService.cs b/CapMachine.Wpf/Services/PPCService.cs index 26294b8..88ec389 100644 --- a/CapMachine.Wpf/Services/PPCService.cs +++ b/CapMachine.Wpf/Services/PPCService.cs @@ -195,21 +195,21 @@ namespace CapMachine.Wpf.Services IRefProp64.WMOLdll(x, ref wm); //p = Convert.ToDouble(textBox2.Text) * 1000.0;//textBox2 Comp.吸气压力（Mpa） - p = (InhPressTag.EngValue) * 1000.0;//textBox2 Comp.吸气压力（Mpa） + p = (InhPressTag.EngPvValue) * 1000.0;//textBox2 Comp.吸气压力（Mpa） kph = 1; - p1 = (TxvFrPressTag.EngValue) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa） + p1 = (TxvFrPressTag.EngPvValue) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa） //p1 = Convert.ToDouble(textBox3.Text) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa） IRefProp64.SATPdll(ref p, x, ref kph, ref te, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen); if (iErr == 0) - Superheat = InhTempTag.EngValue - (te - 273.15); + Superheat = InhTempTag.EngPvValue - (te - 273.15); //textBox5.Text = String.Format("{0:n4}", Convert.ToDouble(textBox1.Text) - (te - 273.15));//textBox1 Comp.吸气温度（℃） else Superheat = 0; IRefProp64.SATPdll(ref p1, x, ref kph, ref te1, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen); if (iErr == 0) - Subcool = TxvFrTempTag.EngValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃） + Subcool = TxvFrTempTag.EngPvValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃） //GuoLengDu = (te1 - 273.15) - ListKRLogCellValue.Find(a => a.Name == "膨胀阀前温度").Value;//textBox4 Evap.膨胀阀前温度（℃） //textBox6.Text = String.Format("{0:n4}", Convert.ToDouble(textBox4.Text) - (te1 - 273.15));//textBox4 Evap.膨胀阀前温度（℃） else @@ -294,11 +294,11 @@ namespace CapMachine.Wpf.Services //p = Convert.ToDouble(textBox2.Text) * 1000.0;//textBox2 Comp.吸气压力（Mpa） //p = (ListRtKPMeter.Find(a => a.MeterName == "吸入压力").RtPV) * 1000.0;//textBox2 Comp.吸气压力（Mpa） - p = (InhPressTag.EngValue) * 1000.0;//textBox2 Comp.吸气压力（Mpa） + p = (InhPressTag.EngPvValue) * 1000.0;//textBox2 Comp.吸气压力（Mpa） kph = 1; //p1 = (ListKRLogCellValue.Find(a => a.Name == "膨胀阀前压力").Value) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa） - p1 = (TxvFrPressTag.EngValue) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa） + p1 = (TxvFrPressTag.EngPvValue) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa） //p1 = Convert.ToDouble(textBox3.Text) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa） @@ -307,7 +307,7 @@ namespace CapMachine.Wpf.Services if (iErr == 0) //GuoReDu = ListRtKPMeter.Find(a => a.MeterName == "吸入温度").RtPV - (te - 273.15); - Superheat = InhTempTag.EngValue - (te - 273.15); + Superheat = InhTempTag.EngPvValue - (te - 273.15); //textBox5.Text = String.Format("{0:n4}", Convert.ToDouble(textBox1.Text) - (te - 273.15));//textBox1 Comp.吸气温度（℃） else Superheat = 0; @@ -315,7 +315,7 @@ namespace CapMachine.Wpf.Services IRefProp64.SATPdll(ref p1, x, ref kph, ref te1, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen); if (iErr == 0) //GuoLengDu = ListKRLogCellValue.Find(a => a.Name == "膨胀阀前温度").Value - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃） - Subcool = TxvFrTempTag.EngValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃） + Subcool = TxvFrTempTag.EngPvValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃） //textBox6.Text = String.Format("{0:n4}", Convert.ToDouble(textBox4.Text) - (te1 - 273.15));//textBox4 Evap.膨胀阀前温度（℃） diff --git a/CapMachine.Wpf/Views/HistoryDataView.xaml b/CapMachine.Wpf/Views/HistoryDataView.xaml index f03da83..f45f270 100644 --- a/CapMachine.Wpf/Views/HistoryDataView.xaml +++ b/CapMachine.Wpf/Views/HistoryDataView.xaml @@ -658,7 +658,7 @@ - + @@ -686,23 +686,23 @@ @@ -753,7 +753,7 @@ - + @@ -781,23 +781,23 @@ @@ -912,7 +912,7 @@ - + @@ -940,23 +940,23 @@ @@ -1071,7 +1071,7 @@ - + @@ -1099,23 +1099,23 @@ @@ -1230,7 +1230,7 @@ - + @@ -1258,23 +1258,23 @@ @@ -1389,7 +1389,7 @@ - + @@ -1417,23 +1417,23 @@ @@ -1548,7 +1548,7 @@ - + @@ -1576,23 +1576,23 @@ @@ -1707,7 +1707,7 @@ - + @@ -1735,23 +1735,23 @@ diff --git a/CapMachine.Wpf/Views/MonitorView.xaml b/CapMachine.Wpf/Views/MonitorView.xaml index 6c46c50..2e10947 100644 --- a/CapMachine.Wpf/Views/MonitorView.xaml +++ b/CapMachine.Wpf/Views/MonitorView.xaml @@ -169,7 +169,7 @@ AutoHandState="False" HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}" MeterName="{Binding NameNoUnit}" - PVValue="{Binding EngValue}" + PVValue="{Binding EngPvValue}" SVValue="{Binding EngSVValue}" Unit="{Binding Unit}" /> @@ -924,7 +924,7 @@ VerticalAlignment="Top" CellTitle="转速" CellUnit="{Binding SpeedTag.Unit}" - CellValue="{Binding SpeedTag.EngValueStr}" /> + CellValue="{Binding SpeedTag.EngPvValueStr}" /> + CellValue="{Binding ComCapBusVolTag.EngPvValueStr}" /> + CellValue="{Binding ComCapBusCurTag.EngPvValueStr}" /> + CellValue="{Binding ComCapPwTag.EngPvValueStr}" /> + CellValue="{Binding ExPressTag.EngPvValueStr}" /> + CellValue="{Binding ExTempTag.EngPvValueStr}" /> + CellValue="{Binding InhPressTag.EngPvValueStr}" /> + CellValue="{Binding InhTempTag.EngPvValueStr}" /> + CellValue="{Binding TxvFrTempTag.EngPvValueStr}" /> + CellValue="{Binding TxvFrPressTag.EngPvValueStr}" /> + CellValue="{Binding OS2TempTag.EngPvValueStr}" /> + CellValue="{Binding Cond1TempTag.EngPvValueStr}" /> + CellValue="{Binding CondInTempTag.EngPvValueStr}" /> - - + + @@ -594,23 +594,23 @@ @@ -725,8 +725,8 @@ - - + + @@ -753,23 +753,23 @@ @@ -884,8 +884,8 @@ - - + + @@ -912,23 +912,23 @@ @@ -1043,8 +1043,8 @@ - - + + @@ -1071,23 +1071,23 @@ @@ -1202,8 +1202,8 @@ - - + + @@ -1230,23 +1230,23 @@ @@ -1361,8 +1361,8 @@ - - + + @@ -1389,23 +1389,23 @@ @@ -1520,8 +1520,8 @@ - - + + @@ -1548,23 +1548,23 @@ @@ -1679,8 +1679,8 @@ - - + + @@ -1707,23 +1707,23 @@