From 839d9f96be96108dc9ca9359b3db32596e7e2454 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 25 十一月 2024 22:09:18 +0800
Subject: [PATCH] 工况分析
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/04-set/SetHydroWorkingCtrl.cs | 146 +++++++++++++-----------------------------------
1 files changed, 39 insertions(+), 107 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/04-set/SetHydroWorkingCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/04-set/SetHydroWorkingCtrl.cs
index 22c64dd..c846af7 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/04-set/SetHydroWorkingCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/04-set/SetHydroWorkingCtrl.cs
@@ -19,15 +19,11 @@
/// </summary>
public event Action<Yw.Model.HydroVisualInfo> HydroViewEvent;
- //姘村姏淇℃伅
- private Yw.Model.HydroModelInfo _hydroInfo = null;
- //宸ュ喌
- private SetHydroWorkingViewModel _hydroWorking = null;
- //鍩虹鎺т欢
- private SetHydroWorkingBasicCtrl _basicCtrl = null;
- //鍙鎺т欢鍒楄〃
- private List<ISetHydroWorkingVisualCtrl> _visualCtrlList = null;
+ private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
+ private SetHydroWorkingViewModel _working = null;//宸ュ喌
+ //private SetHydroWorkingBasicCtrl _basicCtrl = null;//鍩虹鎺т欢
+ private List<ISetHydroWorkingVisualCtrl> _visualCtrlList = null;//鍙鎺т欢鍒楄〃
/// <summary>
/// 缁戝畾鏁版嵁
@@ -36,7 +32,7 @@
(
Yw.Model.HydroModelInfo hydroInfo,
List<HydroWorkingVmo> allWorkingList,
- List<HydroVisualMonitorValueViewModel> allMonitorList
+ List<HydroMonitorValueViewModel> allMonitorValueList
)
{
if (hydroInfo == null)
@@ -44,32 +40,29 @@
return;
}
_hydroInfo = hydroInfo;
- _hydroWorking = new SetHydroWorkingViewModel();
- var workingNames = allWorkingList?.Select(x => x.Name).Distinct().ToList();
- _hydroWorking.Name = Yw.Untity.UniqueHelper.CreateFromFirst("宸ュ喌", workingNames);
+ _working = new SetHydroWorkingViewModel(hydroInfo, allWorkingList, allMonitorValueList);
+ _visualCtrlList = new List<ISetHydroWorkingVisualCtrl>();
- #region 宸ュ喌淇℃伅
+ #region 淇℃伅
- var basicGroup = this.layoutControl1.AddGroup();
- basicGroup.Text = "宸ュ喌淇℃伅";
- basicGroup.ExpandButtonVisible = true;
- basicGroup.Expanded = false;
- basicGroup.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
- basicGroup.ExpandOnDoubleClick = true;
- var basicCtrl = new SetHydroWorkingBasicCtrl();
- basicCtrl.SetBindingData(_hydroWorking);
- var basicItem = basicGroup.AddItem("宸ュ喌淇℃伅", basicCtrl);
- basicItem.TextVisible = false;
- basicItem.Height = 120;
- basicGroup.BestFit();
- basicGroup.LayoutMode = LayoutMode.Regular;
- basicGroup.AllowBorderColorBlending = true;
- basicGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204);
- _basicCtrl = basicCtrl;
+ //var basicGroup = this.layoutControl1.AddGroup();
+ //basicGroup.Text = "宸ュ喌淇℃伅";
+ //basicGroup.ExpandButtonVisible = true;
+ //basicGroup.Expanded = false;
+ //basicGroup.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
+ //basicGroup.ExpandOnDoubleClick = true;
+ //var basicCtrl = new SetHydroWorkingBasicCtrl();
+ //basicCtrl.SetBindingData(_hydroWorking);
+ //var basicItem = basicGroup.AddItem("宸ュ喌淇℃伅", basicCtrl);
+ //basicItem.TextVisible = false;
+ //basicItem.Height = 120;
+ //basicGroup.BestFit();
+ //basicGroup.LayoutMode = LayoutMode.Regular;
+ //basicGroup.AllowBorderColorBlending = true;
+ //basicGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204);
+ //_basicCtrl = basicCtrl;
#endregion
-
- _visualCtrlList = new List<ISetHydroWorkingVisualCtrl>();
#region 姘村簱
@@ -86,7 +79,7 @@
var visualCtrl = new SetHydroWorkingReservoirCtrl();
visualCtrl.HydroViewEvent += x => this.HydroViewEvent?.Invoke(x);
var workingInfo = new HydroWorkingReservoirViewModel(visual);
- _hydroWorking.WorkingInfo.AppendWorking(workingInfo);
+ _working.WorkingInfo.AppendWorking(workingInfo);
visualCtrl.SetBindingData(visual, workingInfo);
var item = group.AddItem(visual.Name, visualCtrl);
item.TextVisible = false;
@@ -106,7 +99,8 @@
#region 姘存睜
- if (hydroInfo.Tanks != null && hydroInfo.Tanks.Count > 0)
+ var tanks = hydroInfo.GetAllTanks();
+ if (tanks != null && tanks.Count > 0)
{
var group = this.layoutControl1.AddGroup();
group.Text = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Tank);
@@ -114,45 +108,12 @@
group.Expanded = true;
group.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
group.ExpandOnDoubleClick = true;
- foreach (var visual in hydroInfo.Tanks)
+ foreach (var visual in tanks)
{
var visualCtrl = new SetHydroWorkingTankCtrl();
visualCtrl.HydroViewEvent += x => this.HydroViewEvent?.Invoke(x);
var workingInfo = new HydroWorkingTankViewModel(visual);
- _hydroWorking.WorkingInfo.AppendWorking(workingInfo);
- visualCtrl.SetBindingData(visual, workingInfo);
- var item = group.AddItem(visual.Name, visualCtrl);
- item.TextVisible = false;
- _visualCtrlList.Add(visualCtrl);
- }
- group.BestFit();
- group.LayoutMode = LayoutMode.Flow;
- group.AllowBorderColorBlending = true;
- group.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204);
- foreach (LayoutControlItem item in group.Items)
- {
- item.Size = new Size(200, 80);
- }
- }
-
- #endregion
-
- #region 姘寸
-
- if (hydroInfo.Waterboxs != null && hydroInfo.Waterboxs.Count > 0)
- {
- var group = this.layoutControl1.AddGroup();
- group.Text = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Waterbox);
- group.ExpandButtonVisible = true;
- group.Expanded = true;
- group.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
- group.ExpandOnDoubleClick = true;
- foreach (var visual in hydroInfo.Waterboxs)
- {
- var visualCtrl = new SetHydroWorkingWaterboxCtrl();
- visualCtrl.HydroViewEvent += x => this.HydroViewEvent?.Invoke(x);
- var workingInfo = new HydroWorkingWaterboxViewModel(visual);
- _hydroWorking.WorkingInfo.AppendWorking(workingInfo);
+ _working.WorkingInfo.AppendWorking(workingInfo);
visualCtrl.SetBindingData(visual, workingInfo);
var item = group.AddItem(visual.Name, visualCtrl);
item.TextVisible = false;
@@ -185,7 +146,7 @@
var visualCtrl = new SetHydroWorkingPumpCtrl();
visualCtrl.HydroViewEvent += x => this.HydroViewEvent?.Invoke(x);
var workingInfo = new HydroWorkingPumpViewModel(visual);
- _hydroWorking.WorkingInfo.AppendWorking(workingInfo);
+ _working.WorkingInfo.AppendWorking(workingInfo);
visualCtrl.SetBindingData(visual, workingInfo);
var item = group.AddItem(visual.Name, visualCtrl);
item.TextVisible = false;
@@ -207,46 +168,26 @@
if (hydroInfo.Valves != null && hydroInfo.Valves.Count > 0)
{
- var group = this.layoutControl1.AddGroup();
- group.Text = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve);
- group.ExpandButtonVisible = true;
- group.Expanded = true;
- group.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
- group.ExpandOnDoubleClick = true;
foreach (var visual in hydroInfo.Valves)
{
- var visualCtrl = new SetHydroWorkingValveCtrl();
- visualCtrl.HydroViewEvent += x => this.HydroViewEvent?.Invoke(x);
var workingInfo = new HydroWorkingValveViewModel(visual);
- _hydroWorking.WorkingInfo.AppendWorking(workingInfo);
- visualCtrl.SetBindingData(visual, workingInfo);
- var item = group.AddItem(visual.Name, visualCtrl);
- item.TextVisible = false;
- _visualCtrlList.Add(visualCtrl);
- }
- group.BestFit();
- group.LayoutMode = LayoutMode.Flow;
- group.AllowBorderColorBlending = true;
- group.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204);
- foreach (LayoutControlItem item in group.Items)
- {
- item.Size = new Size(200, 100);
+ _working.WorkingInfo.AppendWorking(workingInfo);
}
}
#endregion
- #region 鐩戞祴鍊�
+ #region 闃讳欢
- if (allMonitorList != null && allMonitorList.Count > 0)
+ var resistances = hydroInfo.GetAllResistances();
+ if (resistances != null && resistances.Count > 0)
{
- foreach (var monitor in allMonitorList)
+ foreach (var visual in resistances)
{
- var vm = new HydroWorkingMonitorViewModel(monitor);
- _hydroWorking.MonitorInfo.Add(vm);
+ var workingInfo = new HydroWorkingResistanceViewModel(visual);
+ _working.WorkingInfo.AppendWorking(workingInfo);
}
}
-
#endregion
@@ -262,21 +203,12 @@
{
return default;
}
- if (_hydroWorking == null)
- {
- return default;
- }
- if (_basicCtrl == null)
- {
- return default;
- }
- var vm = _basicCtrl.GetBindingData();
- if (vm == null)
+ if (_working == null)
{
return default;
}
_visualCtrlList?.ForEach(x => x.GetWorking());
- return _hydroWorking;
+ return _working;
}
--
Gitblit v1.9.3