From 920315563b014498ed9ad11f29d69638bc2223ca Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 21 十二月 2024 11:15:55 +0800
Subject: [PATCH] 导入修改
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs
index 5606ac3..1702841 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs
@@ -3,7 +3,7 @@
/// <summary>
/// 杩炴帴浠跺睘鎬ц鍥�
/// </summary>
- public class HydroCouplingViewModel : HydroJunctionViewModel
+ public class HydroCouplingViewModel : HydroJunctionViewModel, IHydroCalcuCouplingResult
{
/// <summary>
///
@@ -19,8 +19,6 @@
this.UpdatePropStatus(nameof(this.Material), rhs, nameof(rhs.Material));
this.Caliber = rhs.Caliber;
this.UpdatePropStatus(nameof(this.Caliber), rhs, nameof(rhs.Caliber));
-
- this.Vmo = rhs;
}
@@ -46,24 +44,51 @@
public double? Caliber { get; set; }
/// <summary>
- ///
+ /// 灞�閮ㄦ崯澶�
/// </summary>
- [Browsable(false)]
- public new Yw.Model.HydroCouplingInfo Vmo { get; set; }
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ崯澶�")]
+ [DisplayUnit("m")]
+ [Display(Name = "灞�閮ㄦ崯澶�(m)")]
+ [HydroCalcuPro]
+ [PropertyOrder(19001)]
+ [ShowEditor(false)]
+ [Browsable(true)]
+ public override double? CalcuMinorLoss { get; set; }
/// <summary>
///
/// </summary>
- public override void Update()
+ [Browsable(false)]
+ public new Yw.Model.HydroCouplingInfo Vmo
{
- base.Update();
+ get { return _vmo as Yw.Model.HydroCouplingInfo; }
+ set { _vmo = value; }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public override void UpdateProperty()
+ {
+ base.UpdateProperty();
this.Material = this.Vmo.Material;
this.UpdatePropStatus(nameof(this.Material), this.Vmo, nameof(this.Vmo.Material));
this.Caliber = this.Vmo.Caliber;
this.UpdatePropStatus(nameof(this.Caliber), this.Vmo, nameof(this.Vmo.Caliber));
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ public override void UpdateVmoProperty()
+ {
+ base.UpdateVmoProperty();
+ this.Vmo.Material = this.Material;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.Material), this, nameof(this.Material));
+ this.Vmo.Caliber = this.Caliber;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.Caliber), this, nameof(this.Caliber));
+ }
--
Gitblit v1.9.3