From f7bed326ef5948e76dd1a1b24a9ed10f5b2e5e4e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 15:59:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/03-variable-speed/PumpVariableSpeedViewModel.cs | 55 +++++++++++++------------------------------------------
1 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/03-variable-speed/PumpVariableSpeedViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/03-variable-speed/PumpVariableSpeedViewModel.cs
index 8768e46..c26b0b3 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/03-variable-speed/PumpVariableSpeedViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/03-variable-speed/PumpVariableSpeedViewModel.cs
@@ -10,23 +10,19 @@
{
this.Id = rhs.Id;
this.Name = rhs.Name;
+ this.CurveName = rhs.CurveName;
this.RatedQ = rhs.RatedQ;
this.RatedH = rhs.RatedH;
this.RatedP = rhs.RatedP;
this.RatedN = rhs.RatedN;
- this.RatedHz = rhs.RatedHz;
- this.CurrentN = rhs.CurrentN;
- this.CurrentHz = rhs.CurrentHz;
- this.CurrentColor = rhs.CurrentColor;
+ this.RatedHz = rhs.RatedHz;
this.CurveQH = rhs.CurveQH;
this.CurveQE = rhs.CurveQE;
- this.CurveQP = rhs.CurveQP;
- this.CurrentCurveQH= rhs.CurrentCurveQH;
- this.CurrentCurveQE= rhs.CurrentCurveQE;
- this.CurrentCurveQP = rhs.CurrentCurveQP;
- this.EquipPoint = rhs.EquipPoint;
+ this.CurveQP = rhs.CurveQP;
+
}
+
/// <summary>
/// 鏍囪瘑
@@ -37,7 +33,7 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
+
/// <summary>
/// 鍚嶇О
/// </summary>
@@ -68,20 +64,6 @@
/// </summary>
public double RatedHz { get; set; }
- /// <summary>
- /// 褰撳墠杞��
- /// </summary>
- public double CurrentN { get; set; }
-
- /// <summary>
- /// 褰撳墠棰戠巼
- /// </summary>
- public double CurrentHz { get; set; }
-
- /// <summary>
- /// 褰撳墠棰滆壊
- /// </summary>
- public Color CurrentColor { get; set; }
/// <summary>
/// 娴侀噺鎵▼绾�
@@ -97,27 +79,16 @@
/// 娴侀噺鍔熺巼绾�
/// </summary>
public Yw.Geometry.CubicSpline2d CurveQP { get; set; }
+
+ /// <summary>
+ /// 鍙橀�熼」鍒楄〃
+ /// </summary>
+ public List<PumpVariableSpeedViewItemViewModel> Items { get; set; }
/// <summary>
- /// 褰撳墠娴侀噺鎵▼绾�
+ /// 棰滆壊
/// </summary>
- public Yw.Geometry.CubicSpline2d CurrentCurveQH { get; set; }
-
- /// <summary>
- /// 褰撳墠娴侀噺鏁堢巼绾�
- /// </summary>
- public Yw.Geometry.CubicSpline2d CurrentCurveQE { get; set; }
-
- /// <summary>
- /// 褰撳墠娴侀噺鍔熺巼绾�
- /// </summary>
- public Yw.Geometry.CubicSpline2d CurrentCurveQP { get; set; }
-
- /// <summary>
- /// 瑁呯疆鐐�
- /// </summary>
- public Yw.Geometry.Point2d EquipPoint { get; set; }
-
+ public Color Color { get; set; }
}
}
--
Gitblit v1.9.3