From 0fd4a678c2218c42d383e964a6b4aca975aa7b7a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 14:32:51 +0800
Subject: [PATCH] 图表修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/00-core/01-calculate/PumpDimensionlessCurvesHelper.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/00-core/01-calculate/PumpDimensionlessCurvesHelper.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/00-core/01-calculate/PumpDimensionlessCurvesHelper.cs
index 972a88d..8609da8 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/00-core/01-calculate/PumpDimensionlessCurvesHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/00-core/01-calculate/PumpDimensionlessCurvesHelper.cs
@@ -117,7 +117,7 @@
//璁＄畻(甯︿慨姝� )
- static public bool CalcPoints(PumpGroupPt ratedParas, double n,
+ static public bool CalcPoints(PumpQueryPointViewModel ratedParas, double n,
ref List<Yw.Geometry.Point2d> pt_qh_list,
ref List<Yw.Geometry.Point2d> pt_qe_list,
ref List<Yw.Geometry.Point2d> pt_qp_list,
@@ -237,8 +237,8 @@
}
- static public bool CalcPoints(PumpGroupPt ratedParas, double n,
- ref List<PumpGroupPt> correctPoints, bool isSxp, int stageNumber)
+ static public bool CalcPoints(PumpQueryPointViewModel ratedParas, double n,
+ ref List<PumpQueryPointViewModel> correctPoints, bool isSxp, int stageNumber)
{
List<Yw.Geometry.Point2d> pt_qh_list = null;
List<Yw.Geometry.Point2d> pt_qe_list = null;
@@ -249,12 +249,12 @@
return false;
int iCout = pt_qh_list.Count;
- correctPoints = new List<PumpGroupPt>();
+ correctPoints = new List<PumpQueryPointViewModel>();
for (int i = 0; i < iCout; i++)
{
- correctPoints.Add(new PumpGroupPt()
+ correctPoints.Add(new PumpQueryPointViewModel()
{
- ID = i,
+ Id = i.ToString(),
Q = pt_qh_list[i].X,
H = pt_qh_list[i].Y,
E = pt_qe_list[i].Y,
@@ -266,7 +266,7 @@
}
//璁＄畻(甯︿慨姝�)
- static public bool CalcPoints(PumpGroupPt ratedParas, double n, double? K0,
+ static public bool CalcPoints(PumpQueryPointViewModel ratedParas, double n, double? K0,
ref List<Yw.Geometry.Point2d> pt_qh_list,
ref List<Yw.Geometry.Point2d> pt_qe_list,
ref List<Yw.Geometry.Point2d> pt_qp_list,
@@ -355,7 +355,7 @@
}
//鍘熷(涓嶄慨姝�)
- private static bool Create(PumpGroupPt ratedParas1, double n,
+ private static bool Create(PumpQueryPointViewModel ratedParas1, double n,
ref List<Yw.Geometry.Point2d> pt_qh_list, ref List<Yw.Geometry.Point2d> pt_qe_list, ref List<Yw.Geometry.Point2d> pt_qp_list, ref List<Yw.Geometry.Point2d> pointsNPSH, bool isSxp, int stageNumber)
{
pt_qh_list = null;
@@ -377,8 +377,8 @@
int count = 0;
int i = 0;
- double calcP = ratedParas1.P;
- double calcE = ratedParas1.E;
+ double calcP = ratedParas1.P.Value;
+ double calcE = ratedParas1.E.Value;
double calcQ = ratedParas1.Q;
if (isSxp)
calcQ = ratedParas1.Q / 2;
--
Gitblit v1.9.3