From 4cf5429a8d84a57974d3bf2ecf1eb8d650f396fd Mon Sep 17 00:00:00 2001 From: Tyrone CT Date: Wed, 15 Oct 2025 22:31:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=87=A0=E4=B8=AA?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E6=95=B0=E6=8D=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CapMachine.Wpf/LinDrive/ToomossLin.cs | 1 + CapMachine.Wpf/Models/CsvRecordModel.cs | 30 +++++++++++++++++++ CapMachine.Wpf/Models/CsvRecordModelMap.cs | 5 ++++ .../Models/LightChart/ChartManager.cs | 10 +++++++ CapMachine.Wpf/Services/DataRecordService.cs | 5 ++++ 5 files changed, 51 insertions(+) diff --git a/CapMachine.Wpf/LinDrive/ToomossLin.cs b/CapMachine.Wpf/LinDrive/ToomossLin.cs index fdf387c..bb43f30 100644 --- a/CapMachine.Wpf/LinDrive/ToomossLin.cs +++ b/CapMachine.Wpf/LinDrive/ToomossLin.cs @@ -974,6 +974,7 @@ namespace CapMachine.Wpf.LinDrive /// /// 循环更新调度表的指令数据 /// 定时更新数据到调度表中 + /// 被数值更新事件驱动的方法取代了 /// public void StartCycleUpdateCmd() { diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs index 10a37d9..5f1080c 100644 --- a/CapMachine.Wpf/Models/CsvRecordModel.cs +++ b/CapMachine.Wpf/Models/CsvRecordModel.cs @@ -355,6 +355,36 @@ namespace CapMachine.Wpf.Models [Name("吸气混合器出口压力[BarA]")] public double InhMixOutPress { get; set; } + /// + /// 气路阀前压力[BarA] + /// + [Name("气路阀前压力[BarA]")] + public double GasFrPress { get; set; } + + /// + /// 气路阀前温度[℃] + /// + [Name("气路阀前温度[℃]")] + public double GasFrTemp { get; set; } + + /// + /// 干度[%] + /// + [Name("干度[%]")] + public double Dryness { get; set; } + + /// + /// 过冷度[K] + /// + [Name("过冷度[K]")] + public double Subcooling { get; set; } + + /// + /// 过热度[K] + /// + [Name("过热度[K]")] + public double Superheat { get; set; } + /// /// 创建时间 /// diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs index 65b9433..0552a3a 100644 --- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs +++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs @@ -72,6 +72,11 @@ namespace CapMachine.Wpf.Models Map(m => m.SCCirWaterTemp).Name("S.C循环水温[℃]"); Map(m => m.EvapCirWaterTemp).Name("EVAP循环水温[℃]"); Map(m => m.InhMixOutPress).Name("吸气混合器出口压力[BarA]"); + Map(m => m.GasFrPress).Name("气路阀前压力[BarA]"); + Map(m => m.GasFrTemp).Name("气路阀前温度[℃]"); + Map(m => m.Dryness).Name("干度[%]"); + Map(m => m.Subcooling).Name("过冷度[K]"); + Map(m => m.Superheat).Name("过热度[K]"); Map(m => m.CreateTime).Name("时间"); diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs index 0f32d34..56c4471 100644 --- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs +++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs @@ -309,6 +309,16 @@ namespace CapMachine.Wpf.Models.LightChart return CurHistoryData.Select(a => new ChartPoint() { Value = a.EvapCirWaterTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "吸气混合器出口压力[BarA]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhMixOutPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "气路阀前压力[BarA]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.GasFrPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "气路阀前温度[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.GasFrTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "干度[%]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.Dryness, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "过冷度[K]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.Subcooling, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "过热度[K]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.Superheat, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); default: return CurHistoryData.Select(a => new ChartPoint() { Value = a.Speed, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); break; diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs index 6cc31ad..2bf8b08 100644 --- a/CapMachine.Wpf/Services/DataRecordService.cs +++ b/CapMachine.Wpf/Services/DataRecordService.cs @@ -159,6 +159,11 @@ namespace CapMachine.Wpf.Services new Columns(){ Name="EVAP循环水温[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="吸气混合器出口压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="气路阀前压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="气路阀前温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="干度[%]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="过冷度[K]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="过热度[K]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="创建时间",MapType="System.DateTime",IsIdentity=false,IsPrimary=false}, }