From b0944e2f380a3d538e6cc740673ea49c67abfebf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 22 十月 2024 16:33:45 +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 | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
index 407b6e4..604c01a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
@@ -28,6 +28,7 @@
{
InitData(pump_mian_id, null);
}
+
}
//鍒锋柊灞炴�у��
@@ -38,7 +39,7 @@
private Yw.Geometry.CubicSpline2d _qh, _qe, _qp;
private Yw.Geometry.Point2d _work_pt;
- private double _rated_speed;
+ private double _rated_speed=50;
private async void InitData(long pump_main_id, Yw.Geometry.Point2d work_pt)
{
@@ -84,37 +85,49 @@
var qe = new Yw.Geometry.CubicSpline2d(points_qe);
var qp = new Yw.Geometry.CubicSpline2d(points_qp);
- InitChart(qh, qe, qp, work_pt, pump_main.RatedSpeed);
+ InitChart(qh, qe, qp, work_pt, pump_main.RatedSpeed, pump_main.RatedSpeed, 50);
+
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="qh">娴侀噺鎵▼绾�</param>
+ /// <param name="qe">娴侀噺鏁堢巼绾�</param>
+ /// <param name="qp">娴侀噺鍔熺巼绾�</param>
+ /// <param name="work_pt">宸ヤ綔鐐�</param>
+ /// <param name="rated_spped">棰濆畾杞��</param>
+ /// <param name="current_speed">褰撳墠杞��</param>
+ /// <param name="current_hz">褰撳墠棰戠巼</param>
public void InitChart(
Yw.Geometry.CubicSpline2d qh,
Yw.Geometry.CubicSpline2d qe,
Yw.Geometry.CubicSpline2d qp,
Yw.Geometry.Point2d work_pt,
- double rated_speed)
+ double rated_spped,
+ double current_speed,
+ double current_hz)
{
_qh = qh;
_qe = qe;
_qp = qp;
_work_pt = work_pt;
- _rated_speed = rated_speed;
+ _rated_speed = rated_spped;
this.pumpPerformCompareChart1.SetBindingData(_qh, _qe, _qp);
if (work_pt != null)
{
- var calc_speed = PumpCalcHelper.GetSimuValue(qh, work_pt, rated_speed);
- var calc_hz = calc_speed / rated_speed * 50;
+ var calc_hz = PumpCalcHelper.GetSimuValue(qh, work_pt, _rated_speed);
calc_hz = Math.Round(calc_hz, 1);
this.pumpPerformCompareInfoCtrl1.SetDesignPoint(work_pt, calc_hz);
}
var vm_vs = new Yw.WinFrmUI.Phart.PumpVariableSpeedInfoViewModel();
vm_vs.Id = Guid.NewGuid().ToString();
- vm_vs.Name = rated_speed.ToString();
- vm_vs.RatedSpeed = rated_speed;
- vm_vs.CurrentSpeed = rated_speed;
- vm_vs.CurrentHz = 50;
+ vm_vs.Name = current_hz.ToString();
+ vm_vs.RatedSpeed = _rated_speed;
+ vm_vs.CurrentSpeed = current_speed;
+ vm_vs.CurrentHz = current_hz;
vm_vs.Qh = _qh;
vm_vs.Qe = _qe;
vm_vs.Qp = _qp;
--
Gitblit v1.9.3