From a5b25c4f314079d293bf159ed6f0d7dcbadadbb7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 10:46:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/13-translation/HydroTranslationMatchingViewModel.cs | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/13-translation/HydroTranslationMatchingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/13-translation/HydroTranslationMatchingViewModel.cs
index cbef6c9..bc1b3c7 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/13-translation/HydroTranslationMatchingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/13-translation/HydroTranslationMatchingViewModel.cs
@@ -15,19 +15,17 @@
/// </summary>
public HydroTranslationMatchingViewModel(Yw.Model.HydroTranslationInfo rhs, Yw.Model.HydroModelInfo hydroInfo)
{
- this.ID = rhs.ID;
this.Name = rhs.Name;
this.Code = rhs.Code;
this.DbLocked = rhs.DbLocked;
this.DbId = rhs.DbId;
this.ModelType = rhs.ModelType;
+ this.TranslationType = HydroTranslationTypeEnumHelper.GetTranslationType(rhs.TranslationType);
this.Material = rhs.Material;
- this.Diameter = rhs.Diameter;
this.StartDiameter = rhs.StartDiameter;
this.EndDiameter = rhs.EndDiameter;
this.Roughness = rhs.Roughness;
this.MinorLoss = rhs.MinorLoss;
- this.eAlgorithmType = eAlgorithmType.Hazen;
}
/// <summary>
@@ -35,10 +33,6 @@
/// </summary>
public HydroTranslationMatchingViewModel(HydroTranslationViewModel rhs) : this(rhs.Vmo, rhs.HydroInfo) { }
- /// <summary>
- /// ID
- /// </summary>
- public long ID { get; set; }
/// <summary>
/// 缂栫爜
@@ -66,14 +60,14 @@
public string ModelType { get; set; }
/// <summary>
+ /// 杩囨浮浠剁被鍨�
+ /// </summary>
+ public eTranslationType? TranslationType { get; set; }
+
+ /// <summary>
/// 鏉愯川
/// </summary>
public string Material { get; set; }
-
- /// <summary>
- /// 鐩村緞
- /// </summary>
- public double Diameter { get; set; }
/// <summary>
/// 涓婃父鐩村緞
@@ -96,11 +90,6 @@
public double MinorLoss { get; set; }
/// <summary>
- /// 绠楁硶绫诲瀷
- /// </summary>
- public eAlgorithmType eAlgorithmType { get; set; }
-
- /// <summary>
/// 鍖归厤鍨嬪彿
/// </summary>
public string MatchingModelType { get; set; }
@@ -111,14 +100,14 @@
public string MatchingDbId { get; set; }
/// <summary>
+ /// 鍖归厤杩囨浮浠剁被鍨�
+ /// </summary>
+ public eTranslationType? MatchingTranslationType { get; set; }
+
+ /// <summary>
/// 鍖归厤鏉愯川
/// </summary>
public string MatchingMaterial { get; set; }
-
- /// <summary>
- /// 鍖归厤鐩村緞
- /// </summary>
- public double? MatchingDiameter { get; set; }
/// <summary>
/// 鍖归厤涓婃父鐩村緞
--
Gitblit v1.9.3