From 57051b41eb245cd3dc68ed9167f492df5de9d04c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 九月 2024 15:35:59 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 05c3598..bb1af71 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -2,6 +2,7 @@
using HStation.WinFrmUI.Xhs;
using HStation.WinFrmUI.Xhs.Core;
using NPOI.SS.Formula.Functions;
+using Yw.WinFrmUI.HydroL2d;
namespace HStation.WinFrmUI
{
@@ -12,9 +13,9 @@
InitializeComponent();
this.PageTitle.Caption = "姘村姏妯℃嫙";
this.PageTitle.HeaderSvgImage = this.svgImg32[0];
- this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
}
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
@@ -53,7 +54,7 @@
.GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
_hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
}
- this.xhsProjectSimulationPropertyCtrl1.SetBindingData(_hydroInfo);
+ this.xhsProjectSimulationQ3dCtrl1.SetBindingData(_hydroInfo);
}
/// <summary>
@@ -70,7 +71,11 @@
await this.xhsProjectSimulationBimfaceCtrl1.SetBindingData(_project, _projectSite);
}
- #region 妯″瀷
+ //灞炴�ч潰鏉胯幏鍙栨按鍔涗俊鎭簨浠�
+ private Yw.Model.HydroModelInfo xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent()
+ {
+ return _hydroInfo;
+ }
//涓�閿樉闅�
private async void barBtnShowHide_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -95,10 +100,6 @@
}
}
- #endregion 妯″瀷
-
- #region 姘村姏
-
//姘村姏楠岃瘉
private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -106,6 +107,10 @@
{
return;
}
+ this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+
var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
_checkResult = netWork.Check();
if (_checkResult.Succeed)
@@ -124,6 +129,10 @@
{
return;
}
+ this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+
var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
_calcuResult = netWork.Calcu();
if (_calcuResult.Succeed)
@@ -132,24 +141,23 @@
TipFormHelper.ShowSucceed("璁＄畻鎴愬姛锛�");
return;
}
- var dlg = new XhsProjectSimulationHydroCalcuFailedDlg();
- dlg.SetBindingData(_calcuResult.FailedList);
- dlg.ShowDialog();
+ this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
}
//姘村姏鏋勪欢鍒楄〃
private void barBtnHydroParterList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new HydroParterListDlg();
- dlg.TopMost = true;
- dlg.HydroClickEvent += async (parter) =>
+ if (_hydroInfo == null)
{
- _parter = parter;
- await this.xhsProjectSimulationBimfaceCtrl1.SetSelectedComponents(new List<string>() { parter.Code });
- ShowProperty();
- };
- dlg.SetBindingData(_hydroInfo);
- dlg.Show();
+ return;
+ }
+ this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+
+ this.hydroParterListCtrl1.SetBindingData(_hydroInfo);
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
}
//瀵煎嚭姘村姏INP鏂囦欢
@@ -232,10 +240,6 @@
}
}
- #endregion 姘村姏
-
- #region 鏇村
-
//淇濆瓨
private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -250,12 +254,9 @@
return;
}
_hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
+ //this.xhsProjectSimulationPropertyCtrl1.SetBindingData(_hydroInfo);
TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
}
-
- #endregion 鏇村
-
- #region 鑷姩鍖归厤
//鑷姩鍖归厤
private void barBtnAllAutoMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -263,8 +264,6 @@
var dlg = new AssetsAutoMatchingMainDlg(new AssetsAutoMatchingInputViewModel());
dlg.ShowDialog();
}
-
- #endregion 鑷姩鍖归厤
private void BtnPerformChart_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -285,5 +284,14 @@
ShowProperty();
}
+ //姘村姏鏋勪欢鏄庣粏闈㈡澘鐐瑰嚮浜嬩欢
+ private async void hydroParterListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
+ {
+ _parter = parter;
+ await this.xhsProjectSimulationBimfaceCtrl1.SetSelectedComponents(new List<string>() { parter.Code });
+ ShowProperty();
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3