From 4446901f8ecde9b6e593d871465e89662ad58965 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 10:06:58 +0800
Subject: [PATCH] 修改单独匹配命名
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs | 94 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 40 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs
index dd86a26..bd614cb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs
@@ -29,11 +29,16 @@
/// 姘村姏鐐瑰嚮浜嬩欢
/// </summary>
public event Action<Yw.Model.HydroParterInfo> HydroClickEvent;
+
/// <summary>
/// 姘村姏鏀瑰彉浜嬩欢
/// </summary>
public event Action<List<HydroParterInfo>> HydroChangedEvent;
-
+
+ /// <summary>
+ /// 姘村姏璁板綍鏀瑰彉浜嬩欢
+ /// </summary>
+ public event Action<SetSchemeParterRecord> HydroRecordChangedEvent;
/// <summary>
/// 鏄剧ず鏌ヨ闈㈡澘
@@ -57,8 +62,10 @@
//姘村姏淇℃伅
private Yw.Model.HydroModelInfo _hydroInfo = null;
+
//鎵�鏈夊垪琛�
private List<HydroPipeViewModel> _allList = null;
+
//鎵�鏈夌粦瀹氬垪琛�
private List<HydroPipeViewModel> _allBindingList = null;
@@ -67,7 +74,7 @@
/// </summary>
public void SetBindingData(HydroModelInfo hydroInfo)
{
- _hydroInfo=hydroInfo;
+ _hydroInfo = hydroInfo;
_allList = new List<HydroPipeViewModel>();
if (hydroInfo != null && hydroInfo.Pipes != null && hydroInfo.Pipes.Count > 0)
{
@@ -83,7 +90,7 @@
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuResult> allCalcuResultList)
+ public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuVisualResult> allCalcuResultList)
{
_allList = new List<HydroPipeViewModel>();
if (hydroInfo != null && hydroInfo.Pipes != null && hydroInfo.Pipes.Count > 0)
@@ -164,7 +171,7 @@
/// <summary>
/// 鏇存柊璁＄畻灞炴��
/// </summary>
- public void UpdateCalcuProperty(List<HydroCalcuResult> allCalcuResultList)
+ public void UpdateCalcuProperty(List<HydroCalcuVisualResult> allCalcuResultList)
{
if (allCalcuResultList != null && allCalcuResultList.Count > 0)
{
@@ -221,7 +228,7 @@
//璁剧疆
private void SelectChange()
- {
+ {
Search();
var row = this.gridView1.GetFocusedRow() as HydroPipeViewModel;
if (row == null)
@@ -229,45 +236,52 @@
XtraMessageBox.Show("鏃犲彲璁剧疆绠￠亾鏁版嵁");
return;
}
-
-
}
-
private void gridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
{
- var row = this.gridView1.GetRow(e.RowHandle) as HydroPipeViewModel;
- if (row == null)
- {
- return;
- }
+ /* var row = this.gridView1.GetRow(e.RowHandle) as HydroPipeViewModel;
+ if (row == null)
+ {
+ return;
+ }
- if (e.Column == this.colSelect)
- {
- var input = AssetsMatchingParasHelper.Create(_hydroInfo, row.Vmo, null);
- var dlg = new PipeSingMatchingDlg();
- dlg.SetBindingData(input);
- dlg.ReloadDataEvent += (output) =>
- {
- var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, output);
- if (bol)
- {
- row.UpdateProperty();
- this.gridView1.RefreshRow(e.RowHandle);
- this.HydroChangedEvent?.Invoke(new List<Yw.Model.HydroParterInfo>() { row.Vmo });
- }
- };
- dlg.ShowDialog();
- }
- else
- {
- this.HydroClickEvent?.Invoke(row.Vmo);
- }
+ if (e.Column == this.colSelect)
+ {
+ var input = AssetsMatchingParasHelper.Create(_hydroInfo, row.Vmo, null);
+ var dlg = new SimulationPipeSingleMatchingDlg();
+ dlg.SetBindingData(input);
+ dlg.ReloadDataEvent += (output) =>
+ {
+ var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, output);
+ if (bol)
+ {
+ row.UpdateProperty();
+ this.gridView1.RefreshRow(e.RowHandle);
+ this.HydroChangedEvent?.Invoke(new List<Yw.Model.HydroParterInfo>() { row.Vmo });
+
+ var record = new SetSchemeParterRecord();
+ record.Name = row.Vmo.Name;
+ record.Code = row.Vmo.Code;
+ record.Catalog = Yw.Hydro.ParterCatalog.Pipe;
+ record.MatchingModel = output;
+
+ record.Items = new List<SetSchemeParterRecordItem>() {
+ new() {Name="鍨嬪彿",BeforeValue=$"{output.ModelType}",AfterValue=$"{output.MatchingModelType}"},
+ new() {Name="鏉愭枡",BeforeValue=$"{output.Material}",AfterValue=$"{output.MatchingMaterial}"},
+ new() {Name="鐩村緞锛坢m锛�",BeforeValue=$"{output.Diameter}",AfterValue=$"{output.MatchingDiameter}"},
+ new() {Name="绮楃硻绯绘暟",BeforeValue=$"{output.Roughness}",AfterValue=$"{output.MatchingRoughness}"},
+ new() {Name="灞�闃荤郴鏁�",BeforeValue=$"{output.MinorLoss}",AfterValue=$"{output.MatchingMinorLoss}"},
+ };
+ this.HydroRecordChangedEvent?.Invoke(record);
+ }
+ };
+ dlg.ShowDialog();
+ }
+ else
+ {
+ this.HydroClickEvent?.Invoke(row.Vmo);
+ }*/
}
-
-
-
-
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3