From 764f83e55da4a23d9f042586aa92e292a6f429b6 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 15 十一月 2024 11:55:44 +0800
Subject: [PATCH] code

---
 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-pump-chart/01-chart/03-serial-parallel/PumpSerialParallelInfoViewModel.cs |   25 ++++++++++++++++++-------
 1 files changed, 18 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..08d784a 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
     { 
@@ -11,12 +13,17 @@
 
         public PumpSerialParallelInfoViewModel(PumpSerialParallelInfoViewModel rhs) : base(rhs)
         {
+            this.Code=rhs.Code;
             this.Color = rhs.Color;
             this.QueryQ = rhs.QueryQ;
             this.QueryH = rhs.QueryH;
             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 +32,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 +59,8 @@
             if (this.QpCalc != null)
                 this.QpCalc.MaxX = this.QpCalc.MaxX * this.ExtendRatio / 100;
 
+             
+            this.ExtendFlow = this.Qh.MaxX;
         }
 
 

--
Gitblit v1.9.3