From 28999ee3f86d70c5be79f6f6a686c59e56bcad32 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 24 十二月 2024 21:22:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 54 ++++++++++++++++++++++++------------------------------
1 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 9c91753..b6a8882 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -1,4 +1,5 @@
锘縰sing Castle.Core.Logging;
+using DevExpress.CodeParser;
using DevExpress.Diagram.Core.Native;
using DevExpress.Mvvm.Native;
using DevExpress.Utils.MVVM;
@@ -236,13 +237,13 @@
}
if (_bimfaceCtrl == null)
{
- var overlay = this.ShowOverlay();
_bimfaceCtrl = new SimulationBimfaceCtrl();
_bimfaceCtrl.Dock = DockStyle.Fill;
+ WaitFormHelper.ShowWaitForm(this.FindForm(), "姝ｅ湪鍔犺浇妯″瀷锛岃绋嶅悗...");
await _bimfaceCtrl.InitialData(_project, _projectSite);
_bimfaceCtrl.LoadCompletedEvent += () =>
{//view鍔犺浇瀹屾垚浜嬩欢
- overlay.Close();
+ WaitFormHelper.HideWaitForm();
this.barCkDecorator.Checked = false;
this.barCkGrading.Checked = true;
};
@@ -320,6 +321,7 @@
_propertyCtrl = new SimulationPropertyCtrl();
_propertyCtrl.Dock = DockStyle.Fill;
_propertyCtrl.AllowEdit = true;
+ _propertyCtrl.CalcuResult = () => GetCalcuResult();
_propertyCtrl.HydroViewEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Property);
@@ -809,6 +811,7 @@
#region 涓�閿樉闅�
private List<string> _allDecoratorCodes = null;
+
//鑾峰彇瑁呴グ浠禼ode鍒楄〃
private async Task<List<string>> GetDecoratorCodes()
{
@@ -816,11 +819,10 @@
{
return default;
}
- if (_allDecoratorCodes != null)
+ if (_allDecoratorCodes == null)
{
- return default;
+ _allDecoratorCodes = await BLLFactory<Yw.BLL.HydroDecoratorInfo>.Instance.GetCodeListByModelID(_hydroInfo.ID, null);
}
- _allDecoratorCodes = await BLLFactory<Yw.BLL.HydroDecoratorInfo>.Instance.GetCodeListByModelID(_hydroInfo.ID, null);
if (_allDecoratorCodes == null)
{
_allDecoratorCodes = new List<string>();
@@ -1709,11 +1711,11 @@
private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var flowEffectHelper = await GetFlowEffectHelper();
- flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
- flowEffectHelper.Set();
+ //flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
+ //flowEffectHelper.Set();
}
- #endregion 姘存祦鍔ㄧ敾
+ #endregion
#region 鐩戞祴鐐�
@@ -1752,7 +1754,7 @@
return await helper.GetAnalyseList();
}
- #endregion
+ #endregion 鐩戞祴鐐�
#region 鐩戞祴鍊�
@@ -1805,7 +1807,7 @@
}
}
- #endregion
+ #endregion 鐩戞祴鍊�
#region 浼犳劅鍣ㄦ祴鐐�
@@ -1848,7 +1850,7 @@
SetMonitorDockingList(_visual);
}
- #endregion
+ #endregion 浼犳劅鍣ㄦ祴鐐�
#region 浼犳劅鍣ㄦ祴鍊�
@@ -1913,7 +1915,7 @@
ShowMonitorDockingValueListCtrl();
}
- #endregion
+ #endregion 浼犳劅鍣ㄦ祴鍊�
#region 鍒嗘瀽娴嬬偣
@@ -1929,7 +1931,7 @@
return;
}
var monitorHelper = GetMonitorHelper();
- var allMonitorList = await monitorHelper.GetAll();
+ var allMonitorList = await monitorHelper.GetAnalyseList();
var dlg = new SetHydroMonitorAnalyseListDlg();
dlg.ReloadDataEvent += async (list) =>
{
@@ -1952,7 +1954,7 @@
SetMonitorAnalyseList(_visual);
}
- #endregion
+ #endregion 鍒嗘瀽娴嬬偣
#region 娴嬬偣鏍囪
@@ -1979,7 +1981,7 @@
monitorMarkerHelper.Set();
}
- #endregion
+ #endregion 娴嬬偣鏍囪
#region 妯″瀷妫�鏌�
@@ -2248,7 +2250,7 @@
#endregion 璁＄畻鏍囩
- #endregion
+ #endregion 妯″瀷璁＄畻
#region 瀵煎嚭INP
@@ -2496,7 +2498,7 @@
{
return;
}
- var reportHelper = new SimulationWorkingReportHelper();
+ var reportHelper = new HStation.ReportFile.SimulationWorkingReportHelper();
reportHelper.Create(fileName, vm);
TipFormHelper.ShowInfo("瀵煎嚭鎴愬姛锛�");
};
@@ -2569,7 +2571,7 @@
AddWorking();
}
- #endregion
+ #endregion 褰撳墠宸ュ喌
#region 閫夋嫨宸ュ喌
@@ -2691,7 +2693,7 @@
this.docPnlBottom.Text = "鐩戞祴鍒嗘瀽";
this.docPnlBottom.Height = 350;
}
- var allMontorList = await GetMonitorList();
+ var allMontorList = await GetMonitorAnalyseList();
if (allWorkingList == null || allWorkingList.Count < 1)
{
monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, GetCalcuResult());
@@ -2708,7 +2710,7 @@
ShowMonitorAnalyListCtrl();
}
- #endregion
+ #endregion 鐩戞祴鍒嗘瀽
#region 宸ュ喌鍒嗘瀽
@@ -2811,8 +2813,6 @@
}
}
-
-
//鎹熷け缁熻
private void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -2885,7 +2885,7 @@
}
}
- #endregion
+ #endregion 宸ュ喌鍒嗘瀽
#region 鎹熷け鏇茬嚎
@@ -2985,7 +2985,7 @@
}
}
- #endregion
+ #endregion 鎹熷け鏇茬嚎
#region 鏂规绠＄悊
@@ -3061,11 +3061,5 @@
}
#endregion 鏂规绠＄悊
-
-
-
-
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3