From ca413cba3484fd271344c3bfb3021c7e028d1fe3 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 24 十二月 2024 14:41:07 +0800
Subject: [PATCH] 泵曲线视图更改
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/00-core/等效线/EqualParaCurveEListHelper.cs | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git "a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/00-core/\347\255\211\346\225\210\347\272\277/EqualParaCurveEListHelper.cs" "b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/00-core/\347\255\211\346\225\210\347\272\277/EqualParaCurveEListHelper.cs"
index 0ad7a72..c4d7064 100644
--- "a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/00-core/\347\255\211\346\225\210\347\272\277/EqualParaCurveEListHelper.cs"
+++ "b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/00-core/\347\255\211\346\225\210\347\272\277/EqualParaCurveEListHelper.cs"
@@ -1265,10 +1265,10 @@
-
+
//鐢熸垚绛夋晥绾�(鐞嗚鐩镐技鎹㈢畻璁＄畻)
public static List<CurveEqualEViewModel> CalcEqualParaCurveE(
- PumpCurveViewModel curveGroupExpress,
+ PumpCurveViewModel curveGroupExpress,
double maxValueD2,
double minValueD2,
double currentEta)
@@ -1320,8 +1320,8 @@
{
double simuValue2 = lastSplitValue - secondSplitSpace * j;
- simuCurveQH =(Yw.Pump.CurveQH) curveGroupExpress.CurveQH.ToNewByN(maxValueD2, simuValue2) ;
- simuCurveQE = (Yw.Pump.CurveQE)curveGroupExpress.CurveQE.ToNewByN(maxValueD2, simuValue2);
+ simuCurveQH = (Yw.Pump.CurveQH)curveGroupExpress.CurveQH.ToNewByN(maxValueD2, simuValue2);
+ simuCurveQE = (Yw.Pump.CurveQE)curveGroupExpress.CurveQE.ToNewByN(maxValueD2, simuValue2);
var equalEffPoints2 = simuCurveQE.FeatCurve.GetPointsX(currentEta);
if (equalEffPoints2 == null || equalEffPoints2.Count() == 0)
{//
@@ -1382,6 +1382,7 @@
CurveEqualEViewModel equalCurve = new CurveEqualEViewModel();
equalCurve.IsClosed = false;
equalCurve.DefinePoints = curveSmall;
+ equalCurve.Eff = currentEta;
equalCurves.Add(equalCurve);
}
else
@@ -1391,6 +1392,7 @@
CurveEqualEViewModel equalCurve = new CurveEqualEViewModel();
equalCurve.IsClosed = false;
equalCurve.DefinePoints = curveSmall;
+ equalCurve.Eff = currentEta;
equalCurves.Add(equalCurve);
}
if (!isMergeCurve)
@@ -1400,15 +1402,34 @@
CurveEqualEViewModel equalCurve = new CurveEqualEViewModel();
equalCurve.IsClosed = false;
equalCurve.DefinePoints = curveLarge;
+ equalCurve.Eff = currentEta;
equalCurves.Add(equalCurve);
}
}
}
return equalCurves;
+
}
-
-
+ //鐭ラ亾鍘熷閫熷害鍜屾敼鍙樺悗鐨勯�熷害,姹傚師濮嬫晥鐜噊riginE瀵瑰簲鏀瑰彉鍚庣殑鏁堢巼
+ public static double GetE(double originE, double originN, double changeN, bool correct)
+ {
+ //鍙橀�熷害鍏紡(P65椤�)
+ if (correct)
+ {
+ if (changeN >= originN)
+ return originE;//涓嶈兘澶勭悊杞�熷彉澶х殑鎯呭喌,涓嶇劧鏁堢巼鍙兘瓒呰繃100
+ double ratio = originN / changeN;
+ double bilv = Math.Pow(ratio, 0.17);
+ return originE * 100 / (originE + (100 - originE) * bilv);
+
+ }
+ else
+ {
+ return originE;
+ }
+ }
+
//鐢熸垚绛夋晥绾�(鐜版湁绛夋晥绾挎彃鍊艰绠�)
public static CurveEqualEViewModel CalcEqualParaCurveE2(
--
Gitblit v1.9.3