From bfd1b73be85fd66ee37031eadcd4d09e7dafb52f Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 13 二月 2025 18:51:40 +0800
Subject: [PATCH] 开始增加构件分组功能
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationPumpAnalyChartCtrl.cs | 73 +++++++++++++++---------------------
1 files changed, 30 insertions(+), 43 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationPumpAnalyChartCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationPumpAnalyChartCtrl.cs
index edbe720..71fc5bf 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationPumpAnalyChartCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationPumpAnalyChartCtrl.cs
@@ -1,14 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Yw.Geometry;
+锘縰sing System.Data;
using Yw.Pump;
using Yw.Vmo;
using Yw.WinFrmUI.Phart;
@@ -119,10 +109,10 @@
vm.Id = _pumpInfo.Code;
vm.Name = _pumpInfo.Name;
vm.CurveName = $"棰濆畾鏇茬嚎({_pumpInfo.RatedHz}hz)";
- vm.RatedQ = _pumpInfo.RatedQ ?? 0;
- vm.RatedH = _pumpInfo.RatedH ?? 0;
+ vm.RatedQ = _pumpInfo.RatedQ;
+ vm.RatedH = _pumpInfo.RatedH;
vm.RatedP = _pumpInfo.RatedP;
- vm.RatedN = _pumpInfo.RatedN ?? 0;
+ vm.RatedN = _pumpInfo.RatedN;
vm.RatedHz = _pumpInfo.RatedHz;
vm.Color = Color.Black;
@@ -132,7 +122,7 @@
var qh_pts = curveqh.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
if (qh_pts != null && qh_pts.Count > 3)
{
- vm.CurveQH = new CubicSpline2d(qh_pts);
+ vm.CurveQH = qh_pts;
}
}
@@ -142,7 +132,7 @@
var qp_pts = curveqp.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
if (qp_pts != null && qp_pts.Count > 3)
{
- vm.CurveQP = new CubicSpline2d(qp_pts);
+ vm.CurveQP = qp_pts;
}
}
@@ -152,7 +142,7 @@
var qepts = curveqe.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
if (qepts != null && qepts.Count > 3)
{
- vm.CurveQE = new CubicSpline2d(qepts);
+ vm.CurveQE = qepts;
}
}
@@ -165,10 +155,7 @@
vmItem.Name = "杩愯";
vmItem.Hz = Math.Round(_pumpInfo.RatedHz * _pumpInfo.SpeedRatio, 1);
vmItem.Color = Color.Blue;
- if (_pumpInfo.RatedN.HasValue)
- {
- vmItem.N = Math.Round(_pumpInfo.RatedN.Value * _pumpInfo.SpeedRatio, 1);
- }
+ vmItem.N = Math.Round(_pumpInfo.RatedN * _pumpInfo.SpeedRatio, 1);
var calcuResult = _allCalcuResultVisualDict?.GetValue(_pumpInfo.Code) as HydroCalcuPumpResult;
if (calcuResult != null)
{
@@ -181,23 +168,23 @@
if (vm.CurveQH != null)
{
- var qh_pts = vm.CurveQH.GetPointList(20);
+ var qh_pts = vm.CurveQH;
var qh_run_pts = qh_pts.GetQHPointListByN(vm.RatedHz, vmItem.Hz);
- vmItem.CurveQH = new CubicSpline2d(qh_run_pts);
+ vmItem.CurveQH = qh_run_pts;
}
if (vm.CurveQP != null)
{
- var qp_pts = vm.CurveQP.GetPointList(20);
+ var qp_pts = vm.CurveQP;
var qp_run_pts = qp_pts.GetQPPointListByN(vm.RatedHz, vmItem.Hz);
- vmItem.CurveQP = new CubicSpline2d(qp_run_pts);
+ vmItem.CurveQP = qp_pts;
}
if (vm.CurveQE != null)
{
- var qe_pts = vm.CurveQE.GetPointList(20);
+ var qe_pts = vm.CurveQE;
var qe_run_pts = qe_pts.GetQEPointListByN(vm.RatedHz, vmItem.Hz);
- vmItem.CurveQE = new CubicSpline2d(qe_run_pts);
+ vmItem.CurveQE = qe_run_pts;
}
}
@@ -219,10 +206,10 @@
vm.Id = _pumpInfo.Code;
vm.Name = _pumpInfo.Name;
vm.CurveName = $"棰濆畾鏇茬嚎({_pumpInfo.RatedHz}hz)";
- vm.RatedQ = _pumpInfo.RatedQ ?? 0;
- vm.RatedH = _pumpInfo.RatedH ?? 0;
+ vm.RatedQ = _pumpInfo.RatedQ;
+ vm.RatedH = _pumpInfo.RatedH;
vm.RatedP = _pumpInfo.RatedP;
- vm.RatedN = _pumpInfo.RatedN ?? 0;
+ vm.RatedN = _pumpInfo.RatedN;
vm.RatedHz = _pumpInfo.RatedHz;
vm.Color = Color.Black;
@@ -232,7 +219,7 @@
var qh_pts = curveqh.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
if (qh_pts != null && qh_pts.Count > 3)
{
- vm.CurveQH = new CubicSpline2d(qh_pts);
+ vm.CurveQH = qh_pts;
}
}
@@ -242,17 +229,17 @@
var qp_pts = curveqp.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
if (qp_pts != null && qp_pts.Count > 3)
{
- vm.CurveQP = new CubicSpline2d(qp_pts);
+ vm.CurveQP = qp_pts;
}
}
var curveqe = _hydroInfo.Curves?.Find(x => x.Code == _pumpInfo.CurveQE);
if (curveqe != null)
{
- var qepts = curveqe.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
- if (qepts != null && qepts.Count > 3)
+ var qe_pts = curveqe.CurveData?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
+ if (qe_pts != null && qe_pts.Count > 3)
{
- vm.CurveQE = new CubicSpline2d(qepts);
+ vm.CurveQE = qe_pts;
}
}
@@ -273,10 +260,10 @@
vmItem.Name = working.Name;
vmItem.Hz = workingPumpInfo.CurrentHz;
vmItem.Color = HydroPumpCurveColorHelper.GetRandomColor(_allWorkingList.IndexOf(working));
- if (_pumpInfo.RatedN.HasValue)
+ if (_pumpInfo.RatedN > 0)
{
var speedRatio = workingPumpInfo.CurrentHz / _pumpInfo.RatedHz;
- vmItem.N = Math.Round(_pumpInfo.RatedN.Value * speedRatio, 1);
+ vmItem.N = Math.Round(_pumpInfo.RatedN * speedRatio, 1);
}
vmItem.CurveName = $"{working.Name}({vmItem.Hz}hz)";
if (_allWorkingCalcuResultDict == null)
@@ -301,23 +288,23 @@
if (vm.CurveQH != null)
{
- var qh_pts = vm.CurveQH.GetPointList(20);
+ var qh_pts = vm.CurveQH;
var qh_run_pts = qh_pts.GetQHPointListByN(vm.RatedHz, vmItem.Hz);
- vmItem.CurveQH = new CubicSpline2d(qh_run_pts);
+ vmItem.CurveQH = qh_run_pts;
}
if (vm.CurveQP != null)
{
- var qp_pts = vm.CurveQP.GetPointList(20);
+ var qp_pts = vm.CurveQP;
var qp_run_pts = qp_pts.GetQPPointListByN(vm.RatedHz, vmItem.Hz);
- vmItem.CurveQP = new CubicSpline2d(qp_run_pts);
+ vmItem.CurveQP = qp_run_pts;
}
if (vm.CurveQE != null)
{
- var qe_pts = vm.CurveQE.GetPointList(20);
+ var qe_pts = vm.CurveQE;
var qe_run_pts = qe_pts.GetQEPointListByN(vm.RatedHz, vmItem.Hz);
- vmItem.CurveQE = new CubicSpline2d(qe_run_pts);
+ vmItem.CurveQE = qe_run_pts;
}
}
}
--
Gitblit v1.9.3