From b59d9e9a62dd2cea04be784880cf454364003e1e Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:43:26 +0800
Subject: [PATCH] 增加计算局部损失和沿程损失
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.cs | 113 +++++++++++++++++++-------------------------------------
1 files changed, 39 insertions(+), 74 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.cs
index 3c60005..74a3803 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.cs
@@ -8,7 +8,6 @@
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
this.layoutControl1.SetupLayoutControl();
this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent;
- InitialLinkStatus();
}
/// <summary>
@@ -17,104 +16,70 @@
public event Action<List<Yw.Model.HydroPipeInfo>> ReloadDataEvent;
//鎵�鏈夐儴浠跺垪琛�
- private List<Yw.Model.HydroPipeInfo> _allParterList = null;
+ private List<Yw.Model.HydroPipeInfo> _allVisualList = null;
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroPipeInfo parter)
+ public void SetBindingData(Yw.Model.HydroPipeInfo visual)
{
- var allParterList = parter == null ? null : new List<Yw.Model.HydroPipeInfo>() { parter };
+ var allParterList = visual == null ? null : new List<Yw.Model.HydroPipeInfo>() { visual };
this.SetBindingData(allParterList);
}
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(List<Yw.Model.HydroPipeInfo> allParterList)
+ public void SetBindingData(List<Yw.Model.HydroPipeInfo> allVisualList)
{
- _allParterList = allParterList;
- if (_allParterList != null && _allParterList.Count == 1)
+ _allVisualList = allVisualList;
+ if (_allVisualList != null && _allVisualList.Count == 1)
{
- var parter = _allParterList.First();
- this.imgCmbLinkStatus.EditValue = parter.LinkStatus;
- this.txtMaterial.EditValue = parter.Material;
- this.txtDiameter.EditValue = parter.Diameter;
- this.txtLength.EditValue = parter.Length;
- this.txtRoughness.EditValue = parter.Roughness;
- this.txtMinorLoss.EditValue = parter.MinorLoss;
+ var visual = _allVisualList.First();
+ this.txtMaterial.EditValue = visual.Material;
+ this.txtDiameter.EditValue = visual.Diameter;
+ this.txtLength.EditValue = visual.Length;
+ this.txtRoughness.EditValue = visual.Roughness;
+ this.txtMinorLoss.EditValue = visual.MinorLoss;
}
- }
-
- //鍒濆鍖栫娈电姸鎬�
- private void InitialLinkStatus()
- {
- this.imgCmbLinkStatus.Properties.BeginUpdate();
- this.imgCmbLinkStatus.Properties.Items.Clear();
- this.imgCmbLinkStatus.Properties.Items.Add(HydroLinkStatusHelper.GetStatusName(Yw.Hydro.LinkStatus.Open), Yw.Hydro.LinkStatus.Open, -1);
- this.imgCmbLinkStatus.Properties.Items.Add(HydroLinkStatusHelper.GetStatusName(Yw.Hydro.LinkStatus.Closed), Yw.Hydro.LinkStatus.Closed, -1);
- this.imgCmbLinkStatus.Properties.EndUpdate();
- }
-
- //楠岃瘉
- private bool Valid()
- {
- this.dxErrorProvider1.ClearErrors();
- if (this.imgCmbLinkStatus.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.imgCmbLinkStatus, "蹇呴�夐」");
- return false;
- }
- if (this.txtDiameter.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtDiameter, "蹇呭～椤�");
- return false;
- }
- if (this.txtLength.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtLength, "蹇呭～椤�");
- return false;
- }
- if (this.txtRoughness.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtRoughness, "蹇呭～椤�");
- return false;
- }
- if (this.txtMinorLoss.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtMinorLoss, "蹇呭～椤�");
- return false;
- }
- return true;
}
//纭畾
private void GeneralOkAndCancelCtrl1_OkEvent()
{
- if (_allParterList == null || _allParterList.Count < 1)
+ if (_allVisualList == null || _allVisualList.Count < 1)
{
return;
}
- if (!Valid())
- {
- return;
- }
- var linkStatus = this.imgCmbLinkStatus.EditValue.ToString();
var material = this.txtMaterial.Text.Trim();
- var diameter = double.Parse(this.txtDiameter.EditValue.ToString());
- var length = double.Parse(this.txtLength.EditValue.ToString());
- var roughness = double.Parse(this.txtRoughness.EditValue.ToString());
- var minoroLoss = double.Parse(this.txtMinorLoss.EditValue.ToString());
- _allParterList.ForEach(x =>
+ double? diameter = this.txtDiameter.EditValue == null ? null : double.Parse(this.txtDiameter.EditValue.ToString());
+ double? length = this.txtLength.EditValue == null ? null : double.Parse(this.txtLength.EditValue.ToString());
+ double? roughness = this.txtRoughness.EditValue == null ? null : double.Parse(this.txtRoughness.EditValue.ToString());
+ double? minorLoss = this.txtMinorLoss.EditValue == null ? null : double.Parse(this.txtMinorLoss.EditValue.ToString());
+ _allVisualList.ForEach(x =>
{
- x.LinkStatus = linkStatus;
- x.Material = material;
- x.Diameter = diameter;
- x.Length = length;
- x.Roughness = roughness;
- x.MinorLoss = minoroLoss;
+ if (!string.IsNullOrEmpty(material))
+ {
+ x.Material = material;
+ }
+ if (diameter.HasValue)
+ {
+ x.Diameter = diameter.Value;
+ }
+ if (length.HasValue)
+ {
+ x.Length = length.Value;
+ }
+ if (roughness.HasValue)
+ {
+ x.Roughness = roughness.Value;
+ }
+ if (minorLoss.HasValue)
+ {
+ x.MinorLoss = minorLoss.Value;
+ }
});
- this.ReloadDataEvent?.Invoke(_allParterList);
+ this.ReloadDataEvent?.Invoke(_allVisualList);
this.DialogResult = DialogResult.OK;
this.Close();
}
--
Gitblit v1.9.3