From 907a1579fecf2c160852cf99b3ea77c08eb481cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 17 十二月 2024 09:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs
index c176938..b301adb 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs
@@ -18,20 +18,6 @@
}
-
- /// <summary>
- /// 璁＄畻鍘嬪姏
- /// </summary>
- [Category("璁＄畻缁撴灉")]
- [DisplayName("璁＄畻鍘嬪姏")]
- [Display(Name = "璁＄畻鍘嬪姏(m)")]
- [DisplayUnit("m")]
- [HydroCalcuPro]
- [PropertyOrder(11001)]
- [ShowEditor(false)]
- [Browsable(true)]
- public double? CalcuPr { get; set; }
-
/// <summary>
///
/// </summary>
@@ -43,17 +29,6 @@
}
- /// <summary>
- /// 鏇存柊璁＄畻灞炴��
- /// </summary>
- public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
- {
- base.UpdateCalcuProperty(rhs);
- if (rhs is HydroCalcuPressmeterResult calcuPressmeterProperty)
- {
- this.CalcuPr = calcuPressmeterProperty.CalcuPr.HasValue ? Math.Round(calcuPressmeterProperty.CalcuPr.Value, 2) : null;
- }
- }
}
}
--
Gitblit v1.9.3