From 342fa8be89ce72d4a1f87fc857def22b41722dfc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期日, 03 十一月 2024 14:43:19 +0800
Subject: [PATCH] 曲线 问题修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoViewModel.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoViewModel.cs
index 78a629d..705cf58 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoViewModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.WinFrmUI.Phart
+锘縰sing System.ComponentModel.DataAnnotations;
+
+namespace Yw.WinFrmUI.Phart
{
public class PumpSerialParallelInfoViewModel: PumpSerialParallelViewModel
{
@@ -17,6 +19,10 @@
this.QueryP = rhs.QueryP;
this.QueryE = rhs.QueryE;
this.ExtendRatio = rhs.ExtendRatio;
+ this.IsDefault = rhs.IsDefault;
+ this.RunStatus = rhs.RunStatus;
+ this.CalcuQ = rhs.CalcuQ;
+ this.CalcuH = rhs.CalcuH;
this.Calc();
}
@@ -25,14 +31,16 @@
public string QueryH { get; set; }
public string QueryE { get; set; }
public string QueryP { get; set; }
- public double ExtendRatio { get; set; } = 100;
-
-
+ public double ExtendRatio { get; set; } = 100;
public Yw.Geometry.CubicSpline2d QhCalc { get; set; }
public Yw.Geometry.CubicSpline2d QeCalc { get; set; }
- public Yw.Geometry.CubicSpline2d QpCalc { get; set; }
-
- public bool IsDefault { get; set; }
+ public Yw.Geometry.CubicSpline2d QpCalc { get; set; }
+ public bool IsDefault { get; set; }
+ public bool RunStatus { get; set; }
+
+ public double? CalcuQ { get; set; }
+ public double? CalcuH { get; set; }
+ public double? ExtendFlow { get; set; }
public void Calc()
{
this.CurrentSpeed = Math.Round(this.CurrentHz / 50 * this.RatedSpeed);
@@ -50,6 +58,11 @@
if (this.QpCalc != null)
this.QpCalc.MaxX = this.QpCalc.MaxX * this.ExtendRatio / 100;
+ if (this.ExtendRatio>100)
+ {
+ this.ExtendFlow = this.Qh.MaxX;
+ }
+
}
--
Gitblit v1.9.3