From c2b56fc9401718620dd2a280557b8c716e4ad05a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 十二月 2024 17:49:41 +0800
Subject: [PATCH] 整体优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs | 100 ++++++++++++++++++++++++++++----------------------
1 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
index 49aa239..5188be6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
@@ -111,7 +111,7 @@
{//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
var visualListHelper = GetVisualListHelper();
var visual = visualListHelper.GetVisual(code);
- SelectVisual(visual, eVisualSource.Bimface);
+ SelectVisual(visual, eSimulationVisualSource.Bimface);
};
}
return _bimfaceCtrl;
@@ -148,7 +148,7 @@
{
var visualListHelper = GetVisualListHelper();
var visuals = visualListHelper.GetVisualList(codes);
- SelectVisual(visuals?.LastOrDefault(), eVisualSource.Q3d);
+ SelectVisual(visuals?.LastOrDefault(), eSimulationVisualSource.Q3d);
};
}
return _q3dCtrl;
@@ -183,7 +183,7 @@
_propertyCtrl.AllowEdit = false;
_propertyCtrl.HydroViewEvent += (visual) =>
{
- SelectVisual(visual, eVisualSource.Property);
+ SelectVisual(visual, eSimulationVisualSource.Property);
};
_propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
{ //寮鸿皟杩炴帴鑺傜偣
@@ -280,83 +280,74 @@
#region 閫夋嫨鏋勪欢
- //鍙鏉ユ簮
- protected enum eVisualSource
- {
- None,
- Bimface,
- Q3d,
- Property,
- List,
- Search,
- Monitor,
- Check,
- Calcu,
- Warning,
- }
-
//閫夋嫨鏋勪欢
private Yw.Model.HydroVisualInfo _visual = null;
//閫夋嫨鏋勪欢
- private void SelectVisual(HydroVisualInfo visual, eVisualSource source)
+ private void SelectVisual(HydroVisualInfo visual, eSimulationVisualSource source)
{
_visual = visual;
switch (source)
{
- case eVisualSource.None:
+ case eSimulationVisualSource.None:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
SetPropertyCtrl(visual);
}
break;
- case eVisualSource.Bimface:
+ case eSimulationVisualSource.Bimface:
{
SetPropertyCtrl(visual);
}
break;
- case eVisualSource.Q3d:
+ case eSimulationVisualSource.Q3d:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
SetPropertyCtrl(visual);
}
break;
- case eVisualSource.Property:
+ case eSimulationVisualSource.Property:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
}
break;
- case eVisualSource.List:
+ case eSimulationVisualSource.List:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
SetPropertyCtrl(visual);
}
break;
- case eVisualSource.Search:
+ case eSimulationVisualSource.Set:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
SetPropertyCtrl(visual);
}
break;
- case eVisualSource.Monitor:
+ case eSimulationVisualSource.Search:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
SetPropertyCtrl(visual);
}
break;
- case eVisualSource.Check:
+ case eSimulationVisualSource.Monitor:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
SetPropertyCtrl(visual);
}
break;
- case eVisualSource.Calcu:
+ case eSimulationVisualSource.Check:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
SetPropertyCtrl(visual);
}
break;
- case eVisualSource.Warning:
+ case eSimulationVisualSource.Calcu:
+ {
+ _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+ SetPropertyCtrl(visual);
+ }
+ break;
+ case eSimulationVisualSource.Warning:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
SetPropertyCtrl(visual);
@@ -367,7 +358,7 @@
}
//閫夋嫨鏋勪欢
- private void SelectVisual(string code, eVisualSource source)
+ private void SelectVisual(string code, eSimulationVisualSource source)
{
var visual = GetVisual(code);
SelectVisual(visual, source);
@@ -478,7 +469,7 @@
_visualListCtrl.Dock = DockStyle.Fill;
_visualListCtrl.HydroClickInfoEvent += (visual) =>
{
- SelectVisual(visual, eVisualSource.List);
+ SelectVisual(visual, eSimulationVisualSource.List);
};
}
return _visualListCtrl;
@@ -596,10 +587,30 @@
#region 涓�閿樉闅�
+ private List<string> _allDecoratorCodes = null;
+ //鑾峰彇瑁呴グ浠禼ode鍒楄〃
+ private async Task<List<string>> GetDecoratorCodes()
+ {
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
+ if (_allDecoratorCodes != null)
+ {
+ return default;
+ }
+ _allDecoratorCodes = await BLLFactory<Yw.BLL.HydroDecoratorInfo>.Instance.GetCodeListByModelID(_hydroInfo.ID, null);
+ if (_allDecoratorCodes == null)
+ {
+ _allDecoratorCodes = new List<string>();
+ }
+ return _allDecoratorCodes;
+ }
+
//璁剧疆瑁呴グ浠跺彲瑙佹��
private async void SetDecoratorVisible(bool isDecoratorVisible)
{
- var codes = _hydroInfo.Decorators?.Select(x => x.Code).Distinct().ToList();
+ var codes = await GetDecoratorCodes();
if (isDecoratorVisible)
{
await _bimfaceCtrl?.ShowComponents(codes);
@@ -635,12 +646,12 @@
_searchCtrl.InitialData(allVisualVmList);
_searchCtrl.HydroClickInfoEvent += (visual) =>
{
- SelectVisual(visual, eVisualSource.Check);
+ SelectVisual(visual, eSimulationVisualSource.Check);
};
_searchCtrl.HydroSearchInfoEvent += (list) =>
{
var visual = list?.FirstOrDefault();
- SelectVisual(visual, eVisualSource.Search);
+ SelectVisual(visual, eSimulationVisualSource.Search);
};
}
return _searchCtrl;
@@ -907,7 +918,7 @@
private async Task<List<HydroMonitorVmo>> GetMonitorList()
{
var helper = GetMonitorHelper();
- return await helper.Get();
+ return await helper.GetAll();
}
#endregion
@@ -924,7 +935,8 @@
{
var visualListHelper = GetVisualListHelper();
var monitorHelper = GetMonitorHelper();
- _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
+ var calcuResultHelper = GetCalcuResultHelper();
+ _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper, calcuResultHelper);
}
return _monitorValueHelper;
}
@@ -948,7 +960,7 @@
{
var visualListHelper = GetVisualListHelper();
var visual = visualListHelper.GetVisual(code);
- SelectVisual(visual, eVisualSource.Monitor);
+ SelectVisual(visual, eSimulationVisualSource.Monitor);
};
}
return _monitorValueListCtrl;
@@ -986,7 +998,7 @@
this.docPnlBottom.Height = 350;
}
var monitorValueHelper = GetMonitorValueHelper();
- var allMonitorValueList = await monitorValueHelper.Get();
+ var allMonitorValueList = await monitorValueHelper.GetAll();
monitorValueListCtrl.SetBindingData(allMonitorValueList);
}
@@ -1047,7 +1059,7 @@
{
var visualListHelper = GetVisualListHelper();
var visual = visualListHelper.GetVisual(code);
- SelectVisual(visual, eVisualSource.Check);
+ SelectVisual(visual, eSimulationVisualSource.Check);
};
}
return _checkCtrl;
@@ -1200,7 +1212,7 @@
{
var visualListHelper = GetVisualListHelper();
var visual = visualListHelper.GetVisual(code);
- SelectVisual(visual, eVisualSource.Warning);
+ SelectVisual(visual, eSimulationVisualSource.Warning);
};
}
return _calcuWarningCtrl;
@@ -1503,7 +1515,7 @@
}
_hydroInfo.UpdateWorkingInfo(_working.WorkingInfo);
var monitorValueHelper = GetMonitorValueHelper();
- var allMonitorValueList = await monitorValueHelper.Get();
+ var allMonitorValueList = await monitorValueHelper.GetAll();
allMonitorValueList.UpdateMonitorValue(_working.MonitorInfo);
var workingHelper = GetWorkingHelper();
@@ -1546,14 +1558,14 @@
{
if (sources.Count == 1)
{
- SelectVisual(sources[0], eVisualSource.None);
+ SelectVisual(sources[0], eSimulationVisualSource.None);
}
else
{
var source = sources.FirstOrDefault(x => x.Flags.Contains(HStation.Xhs.Flags.杩涘彛));
if (source != null)
{
- SelectVisual(source, eVisualSource.None);
+ SelectVisual(source, eSimulationVisualSource.None);
}
}
}
@@ -1632,7 +1644,7 @@
var dlg = new HydroSingleWorkingLossCurveDlg();
dlg.HydroClickEvent += (code) =>
{
- SelectVisual(code, eVisualSource.None);
+ SelectVisual(code, eSimulationVisualSource.None);
};
dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult, visual);
dlg.ShowDialog();
--
Gitblit v1.9.3