From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Hydro/Yw.EPAnet.Core/02-hydraulic/HydraulicCore.cs | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/Hydro/Yw.EPAnet.Core/02-hydraulic/HydraulicCore.cs b/Hydro/Yw.EPAnet.Core/02-hydraulic/HydraulicCore.cs
index bd44374..2d6895e 100644
--- a/Hydro/Yw.EPAnet.Core/02-hydraulic/HydraulicCore.cs
+++ b/Hydro/Yw.EPAnet.Core/02-hydraulic/HydraulicCore.cs
@@ -601,16 +601,12 @@
#region 鍏朵粬
- /// <summary>
- /// 鑾峰彇绠＄綉鍏冧欢鏁�
- /// </summary>
- public int GetCount(eCountType countType, ref int count)
+ // 鑾峰彇绠＄綉鍏冧欢鏁�
+
+ public int getcount(int countcode, ref int count)
{
- if (!isWaterModelCalc)
- {
- return 0;
- }
- return HydraulicCoreBase.ENgetcount22(projectID, (int)countType, ref count);
+ if (!isWaterModelCalc) return 0;
+ return HydraulicCoreBase.ENgetcount22(projectID, countcode, ref count);
}
// 鑾峰彇閿欒淇℃伅
@@ -621,6 +617,23 @@
return HydraulicCoreBase.ENgeterror22(projectID, errcode, errmsg, nchar);
}
+
+ public string geterrormsg()
+ {
+ if (!isWaterModelCalc) return null;
+ var nchar = 10000;
+ StringBuilder errmsg = new StringBuilder();
+ //涓篹rrmsg鍒嗛厤鍐呭瓨
+ errmsg.Capacity = nchar;
+ var err= HydraulicCoreBase.ENgetErrorMsg22(projectID, errmsg, nchar);
+ string str = errmsg?.ToString();
+ if (string.IsNullOrEmpty(str)) return null;
+ var errlines = str.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+ //鎷兼帴errlines
+ return string.Join("\n", errlines);
+
+ }
+
// 杈撳嚭鏂囦欢淇℃伅
public int saveinpfile(string filename)
--
Gitblit v1.9.3