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/03-calcu/03-node/02-junction/04-instrument/02-pressmeter/HydroCalcuPressmeterResult.cs | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/02-pressmeter/HydroCalcuPressmeterResult.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/02-junction/04-instrument/02-pressmeter/HydroCalcuPressmeterResult.cs
similarity index 63%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/02-pressmeter/HydroCalcuPressmeterResult.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/02-junction/04-instrument/02-pressmeter/HydroCalcuPressmeterResult.cs
index 9771875..37a42af 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/02-pressmeter/HydroCalcuPressmeterResult.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/03-node/02-junction/04-instrument/02-pressmeter/HydroCalcuPressmeterResult.cs
@@ -3,7 +3,7 @@
/// <summary>
///
/// </summary>
- public class HydroCalcuPressmeterResult : HydroCalcuNodeResult, IHydroCalcuPressmeterResult
+ public class HydroCalcuPressmeterResult : HydroCalcuInstrumentResult, IHydroCalcuPressmeterResult
{
/// <summary>
///
@@ -38,23 +38,34 @@
/// <summary>
///
/// </summary>
- public HydroCalcuPressmeterResult(IHydroCalcuPressmeterResult rhs) : base(rhs)
- {
- this.CalcuPr = rhs.CalcuPr;
- }
+ public HydroCalcuPressmeterResult(IHydroCalcuJunctionResult rhs) : base(rhs) { }
/// <summary>
///
/// </summary>
- public HydroCalcuPressmeterResult(HydroCalcuPressmeterResult rhs) : base(rhs)
- {
- this.CalcuPr = rhs.CalcuPr;
- }
+ public HydroCalcuPressmeterResult(HydroCalcuJunctionResult rhs) : base(rhs) { }
/// <summary>
- /// 璁＄畻鍘嬪姏(m)
+ ///
/// </summary>
- public double? CalcuPr { get; set; }
+ public HydroCalcuPressmeterResult(IHydroCalcuInstrumentResult rhs) : base(rhs) { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public HydroCalcuPressmeterResult(HydroCalcuInstrumentResult rhs) : base(rhs) { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public HydroCalcuPressmeterResult(IHydroCalcuPressmeterResult rhs) : base(rhs) { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public HydroCalcuPressmeterResult(HydroCalcuPressmeterResult rhs) : base(rhs) { }
+
+
--
Gitblit v1.9.3