From 94ebf14787ea1c67b6a6139a2b19e3693b809625 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 28 三月 2025 14:24:45 +0800
Subject: [PATCH] 模拟计算
---
WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 54 insertions(+), 35 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs
index 07ef700..413d556 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs
@@ -13,7 +13,8 @@
_curveLowerPressure = l;
_curveAveragePressure = a;
};
-
+
+
}
@@ -52,27 +53,8 @@
}
- //璁＄畻
- private void barBtnCalc_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
-
- if (_facility == null)
- {
- TipFormHelper.ShowWarn("璇烽�夋嫨璁炬柦!");
- return;
- }
-
-
- var file_path = _facility.ModelPath;
- var minDemand = 0; // 鏈�灏忔�婚渶姘撮噺(m鲁/h)
- var maxDemand = _facility.MaxWaterDemand ?? 45; // 鏈�澶ф�婚渶姘撮噺(m鲁/h)
- var calcCount = 1000; // 璁＄畻娆℃暟
- var maxHeight = 22.5; //椤舵ゼ鏍囬珮
- var requiredEndPressure = _facility.TerminalPressure ?? 15; //闈欏帇
- CalcSystemCurve(file_path, minDemand, maxDemand, maxHeight, requiredEndPressure, calcCount);
-
- }
-
+ #region 璁＄畻
+
/// <summary>
/// 璁＄畻绯荤粺鏇茬嚎
/// </summary>
@@ -86,7 +68,6 @@
string inpFilePath,
double minDemand,
double maxDemand,
- //double reservoirElevation,
double maxHeight,
double requiredEndPressure,
int calcCount)
@@ -195,12 +176,61 @@
if ((int)code > 100)
{
var msg = code.GetDisplayText();
+ //TipFormHelper.ShowError(msg);
throw new Exception(msg);
}
}
}
+ //璁＄畻
+ private void barBtnCalc_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+
+ if (_facility == null)
+ {
+ TipFormHelper.ShowWarn("璇烽�夋嫨璁炬柦!");
+ return;
+ }
+
+
+ var file_path = _facility.ModelPath;
+ var minDemand = 0; // 鏈�灏忔�婚渶姘撮噺(m鲁/h)
+ var maxDemand = _facility.MaxWaterDemand ?? 45; // 鏈�澶ф�婚渶姘撮噺(m鲁/h)
+ var calcCount = 1000; // 璁＄畻娆℃暟
+ var maxHeight = 22.5; //椤舵ゼ鏍囬珮
+ var requiredEndPressure = _facility.TerminalPressure ?? 15; //闈欏帇
+ CalcSystemCurve(file_path, minDemand, maxDemand, maxHeight, requiredEndPressure, calcCount);
+ }
+ #endregion
+
+ #region 妯℃嫙璁＄畻
+
+ //妯℃嫙璁＄畻
+ private void barBtnSimulationCalc_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if (_facility==null)
+ {
+ return;
+ }
+ if (_curveAveragePressure==null)
+ {
+ TipFormHelper.ShowWarn("璇峰厛璁＄畻鏇茬嚎锛�");
+ return;
+ }
+ var page = new SimulationSchedulePage();
+ page.Dock = DockStyle.Fill;
+ page.InitialData(_facility, _curveUpperPressure, _curveLowerPressure, _curveAveragePressure);
+ var dlg = new XtraForm();
+ dlg.Text = "妯℃嫙璁＄畻";
+ dlg.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
+ dlg.Controls.Add(page);
+ dlg.StartPosition = FormStartPosition.CenterScreen;
+ dlg.WindowState = FormWindowState.Maximized;
+ dlg.ShowDialog();
+
+ }
+ #endregion
/// <summary>
/// 鍒锋柊鏁版嵁
@@ -211,18 +241,7 @@
InitialDataSource();
}
- private void barButtonItem1_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- var page=new SimulationSchedulePage();
- page.Dock= DockStyle.Fill;
- page.InitialData(_facility, _curveUpperPressure, _curveLowerPressure, _curveAveragePressure);
- var dlg=new XtraForm();
- dlg.Controls.Add(page);
- dlg.StartPosition= FormStartPosition.CenterScreen;
- dlg.WindowState = FormWindowState.Maximized;
- dlg.ShowDialog();
-
- }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3