From dbcef6befb123066754141adef6dc3ef6653b6ce Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 02 十二月 2024 14:34:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoCtrl.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoCtrl.cs
index cbbdd76..8d0a404 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoCtrl.cs
@@ -40,14 +40,13 @@
var vm = new PumpSerialParallelInfoViewModel();
vm.Id = item.Id;
vm.Name = item.Name;
- vm.Color = item.Color;
- vm.IsBp = item.IsBp;
- vm.RatedSpeed = item.RatedSpeed;
- vm.CurrentSpeed = item.CurrentSpeed;
- vm.CurrentHz = Math.Round(item.CurrentSpeed / item.RatedSpeed * 50, 2);
- vm.Qh = new Geometry.CubicSpline2d(item.Qh);
- vm.Qe = new Geometry.CubicSpline2d(item.Qe);
- vm.Qp = new Geometry.CubicSpline2d(item.Qp);
+ vm.Color = item.Color;
+ vm.RatedN = item.RatedN;
+ vm.CurrentN = item.CurrentN;
+ vm.CurrentHz = Math.Round(item.CurrentN / item.RatedN * 50, 2);
+ vm.CurveQH = new Geometry.CubicSpline2d(item.CurveQH);
+ vm.CurveQE = new Geometry.CubicSpline2d(item.CurveQE);
+ vm.CurveQP = new Geometry.CubicSpline2d(item.CurveQP);
vm.ExtendRatio = 100;
vm.Calc();
_all_binding_list.Add(vm);
@@ -188,7 +187,7 @@
/// </summary>
/// <param name="id"></param>
/// <param name="query_pt"></param>
- public void SetQueryInfo(string id, PumpGroupPt query_pt)
+ public void SetQueryInfo(string id, PumpQueryPointViewModel query_pt)
{
if (query_pt == null)
return;
@@ -224,5 +223,6 @@
return _all_binding_list.Select(x => new PumpSerialParallelInfoViewModel(x)).ToList();
}
+
}
}
--
Gitblit v1.9.3