From 0a1bf56909464e938a68c29b26ab88ff51380fad Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:56:17 +0800
Subject: [PATCH] 能效分析水力图表 装置点显示文字
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs
index 8916b69..9d86942 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs
@@ -15,7 +15,6 @@
/// </summary>
public HydroElbowMatchingViewModel(Yw.Model.HydroElbowInfo rhs, Yw.Model.HydroModelInfo hydroInfo)
{
- this.ID = rhs.ID;
this.Name = rhs.Name;
this.Code = rhs.Code;
this.DbLocked = rhs.DbLocked;
@@ -24,30 +23,15 @@
this.Material = rhs.Material;
this.Caliber = rhs.Caliber;
this.MinorLoss = rhs.MinorLoss;
- this.BendingAngle = rhs.BendingAngle.HasValue ? (int)rhs.BendingAngle.Value : null;
+ this.BendingAngle = (int)rhs.BendingAngle;
this.ElbowType = HydroElbowTypeEnumHelper.GetElbowType(rhs.ElbowType);
}
/// <summary>
///
/// </summary>
- public HydroElbowMatchingViewModel(Yw.Model.HydroElbowInfo rhs, Yw.Model.HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult) : this(rhs, hydroInfo)
- {
+ public HydroElbowMatchingViewModel(HydroElbowViewModel rhs) : this(rhs.Vmo, rhs.HydroInfo) { }
- }
-
- /// <summary>
- ///
- /// </summary>
- public HydroElbowMatchingViewModel(HydroElbowViewModel rhs) : this(rhs.Vmo, rhs.HydroInfo)
- {
-
- }
-
- /// <summary>
- /// ID
- /// </summary>
- public long ID { get; set; }
/// <summary>
/// 缂栫爜
@@ -82,17 +66,17 @@
/// <summary>
/// 鍙ｅ緞
/// </summary>
- public double? Caliber { get; set; }
+ public double Caliber { get; set; }
/// <summary>
/// 鎹熷け绯绘暟
/// </summary>
- public double? MinorLoss { get; set; }
+ public double MinorLoss { get; set; }
/// <summary>
/// 寮洸瑙掑害
/// </summary>
- public int? BendingAngle { get; set; }
+ public int BendingAngle { get; set; }
/// <summary>
/// 寮ご绫诲瀷
--
Gitblit v1.9.3