From 5fcc843704ca90c742b578aa5898acf0097f753b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 24 十月 2024 10:15:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
index 604c01a..218bff1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
@@ -208,16 +208,15 @@
#endregion 鏇茬嚎
#region 鍙橀�熸洸绾�
-
- this.pumpVariableSpeedInfoCtrl1.SetEvent += (id, qh, qe, qp) =>
+
+ this.pumpVariableSpeedInfoCtrl1.SetEvent += (id, hz, ex_ratio, qh, qe, qp) =>
{
- this.pumpVariableSpeedChart1.Set(id, qh, qe, qp);
+ this.pumpVariableSpeedChart1.Set(id, hz, ex_ratio, qh, qe, qp);
ResetSectPointGrid();
};
-
- this.pumpVariableSpeedInfoCtrl1.SetInfoEvent += (id, name, color) =>
+ this.pumpVariableSpeedInfoCtrl1.SetInfoEvent += (id, color) =>
{
- this.pumpVariableSpeedChart1.SetInfo(id, name, color);
+ this.pumpVariableSpeedChart1.SetInfo(id, color);
ResetSectPointGrid();
};
@@ -241,7 +240,7 @@
this.pumpVariableSpeedInfoCtrl1.SetDesignPointEvent += (q, h) =>
{
- this.pumpVariableSpeedChart1.SetDesignPt(new Yw.Geometry.Point2d(q, h));
+ this.pumpVariableSpeedChart1.SetDesignPt(q,h);
ResetSectPointGrid();
};
--
Gitblit v1.9.3