From 0a1bf56909464e938a68c29b26ab88ff51380fad Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:56:17 +0800
Subject: [PATCH] 能效分析水力图表 装置点显示文字
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationPumpAnalyChartCtrl.cs | 52 +++++++++++++++++++++-------------------------------
1 files changed, 21 insertions(+), 31 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 9b98a90..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;
@@ -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;
}
}
@@ -178,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;
}
}
@@ -229,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;
}
}
@@ -239,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;
}
}
@@ -298,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