From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +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/01-property/XhsProjectSimulationPropertyCtrl.cs | 198 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 146 insertions(+), 52 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
index 5d8aa94..b02805d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
@@ -11,14 +11,21 @@
public XhsProjectSimulationPropertyCtrl()
{
InitializeComponent();
+ this.hydroVisualPropertyCtrl1.MatchingDbEvent += HydroParterPropertyCtrl1_MatchingDbEvent;
+ this.hydroVisualPropertyCtrl1.SetCurveEvent += HydroParterPropertyCtrl1_SetCurveEvent;
+ this.hydroVisualPropertyCtrl1.SetPatternEvent += HydroParterPropertyCtrl1_SetPatternEvent;
+ this.hydroVisualPropertyCtrl1.BlinkLinkParterEvent += HydroParterPropertyCtrl1_BlinkLinkParterEvent;
+ this.hydroVisualPropertyCtrl1.HydroViewEvent += HydroParterPropertyCtrl1_ViewParterEvent;
- this.hydroParterPropertyCtrl1.PropertyValueChangedEvent += HydroParterPropertyCtrl1_PropertyValueChangedEvent;
- this.hydroParterPropertyCtrl1.PropertyValueChangingEvent += HydroParterPropertyCtrl1_PropertyValueChangingEvent;
- this.hydroParterPropertyCtrl1.MatchingDbEvent += HydroParterPropertyCtrl1_MatchingDbEvent;
- this.hydroParterPropertyCtrl1.SetCurveEvent += HydroParterPropertyCtrl1_SetCurveEvent;
- this.hydroParterPropertyCtrl1.SetPatternEvent += HydroParterPropertyCtrl1_SetPatternEvent;
- this.hydroParterPropertyCtrl1.BlinkLinkParterEvent += HydroParterPropertyCtrl1_BlinkLinkParterEvent;
+ this.hydroVisualPropertyCtrl1.PropertyValueChangedEvent += HydroParterPropertyCtrl1_PropertyValueChangedEvent;
+ this.hydroVisualPropertyCtrl1.MarkPropertyValueChangedEvent += HydroParterPropertyCtrl1_MarkPropertyValueChangedEvent;
+ this.hydroVisualPropertyCtrl1.GradingPropertyValueChangedEvent += HydroParterPropertyCtrl1_GradingPropertyValueChangedEvent;
+ this.hydroVisualPropertyCtrl1.FlowDirectionPropertyValueChangedEvent += HydroParterPropertyCtrl1_FlowDirectionPropertyValueChangedEvent;
}
+
+
+
+
/// <summary>
@@ -28,81 +35,109 @@
/// </summary>
public event Action<string, string> BlinkLinkParterEvent;
+ /// <summary>
+ /// 灞炴�у�兼敼鍙樹簨浠�
+ /// </summary>
+ public event Action<Yw.Model.HydroVisualInfo> PropertyValueChangedEvent;
+
+ /// <summary>
+ /// 鏍囨敞灞炴�у�兼敼鍙樹簨浠�
+ /// </summary>
+ public event Action<Yw.Model.HydroVisualInfo> MarkPropertyValueChangedEvent;
+
+ /// <summary>
+ /// 鍒嗙骇灞炴�у�兼敼鍙樹簨浠�
+ /// </summary>
+ public event Action<Yw.Model.HydroVisualInfo> GradingPropertyValueChangedEvent;
+
+ /// <summary>
+ /// 娴佸悜灞炴�у�兼敼鍙樹簨浠�
+ /// </summary>
+ public event Action<Yw.Model.HydroVisualInfo> FlowDirectionPropertyValueChangedEvent;
+
+ /// <summary>
+ /// 鏌ョ湅鏋勪欢浜嬩欢
+ /// </summary>
+ public event Action<Yw.Model.HydroVisualInfo> ViewParterEvent;
+
//姘村姏淇℃伅鏂规硶
private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
- private Func<List<HydroCalcuResult>> _allHydroCalcuResultListFunc = null;
+ private Func<List<HydroCalcuVisualResult>> _allHydroCalcuResultListFunc = null;
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
- public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc, Func<List<HydroCalcuResult>> allHydroCalcuResultListFunc)
+ public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc, Func<List<HydroCalcuVisualResult>> allHydroCalcuResultListFunc)
{
_hydroInfoFunc = hydroInfoFunc;
_allHydroCalcuResultListFunc = allHydroCalcuResultListFunc;
- this.hydroParterPropertyCtrl1.InitialData(hydroInfoFunc);
}
- /// <summary>
- /// 閫夋嫨缁勪欢
- /// </summary>
- public void SelectParter(long id)
+ //鑾峰彇姘村姏淇℃伅
+ private Yw.Model.HydroModelInfo GetHydroInfo()
{
var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
- this.hydroParterPropertyCtrl1.SelectedObject = null;
- return;
+ this.hydroVisualPropertyCtrl1.SelectedObject = null;
+ return default;
}
- var allParterList = hydroInfo.GetAllParters();
- var parter = allParterList.Find(x => x.ID == id);
- var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, hydroInfo);
- this.hydroParterPropertyCtrl1.SelectedObject = vm;
+ return hydroInfo;
+ }
+
+
+ public HydroVisualViewModel SelectedObject
+ {
+ get { return this.hydroVisualPropertyCtrl1.SelectedObject; }
+ set { this.hydroVisualPropertyCtrl1.SelectedObject = value; }
}
/// <summary>
- /// 閫夋嫨缁勪欢
+ /// 鏇存柊琛岋紝鏍峰紡涓嶅彉
/// </summary>
- public void SelectParter(string code)
+ public void UpdateRows()
{
- var hydroInfo = _hydroInfoFunc?.Invoke();
- if (hydroInfo == null)
- {
- this.hydroParterPropertyCtrl1.SelectedObject = null;
- return;
- }
- var allParterList = hydroInfo.GetAllParters();
- var parter = allParterList.Find(x => x.Code == code);
- var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, hydroInfo);
- this.hydroParterPropertyCtrl1.SelectedObject = vm;
+ this.hydroVisualPropertyCtrl1?.UpdateRows();
}
/// <summary>
- /// 閫夋嫨缁勪欢
+ /// 閲嶆柊杞藉叆鏁版嵁
/// </summary>
- public void SelectParter(Yw.Model.HydroParterInfo parter, List<Yw.Model.HydroParterInfo> allParterList)
+ public void UpdateData()
{
- var hydroInfo = _hydroInfoFunc?.Invoke();
- if (hydroInfo == null)
+ this.hydroVisualPropertyCtrl1?.UpdateData();
+ }
+
+ /// <summary>
+ /// 鏇存柊灞炴��
+ /// </summary>
+ public void UpdateProperty()
+ {
+ var vm = this.hydroVisualPropertyCtrl1.SelectedObject;
+ if (vm == null)
{
- this.hydroParterPropertyCtrl1.SelectedObject = null;
return;
}
- var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, hydroInfo);
- this.hydroParterPropertyCtrl1.SelectedObject = vm;
+ vm.UpdateProperty();
+ this.hydroVisualPropertyCtrl1.UpdateRows();
}
/// <summary>
/// 鏇存柊璁＄畻灞炴��
/// </summary>
- public void UpdateCalcuProperty(Yw.WinFrmUI.HydroCalcuResult rhs)
+ public void UpdateCalcuProperty(Yw.WinFrmUI.HydroCalcuVisualResult calcuResult)
{
- var vm = this.hydroParterPropertyCtrl1.SelectedObject;
+ if (calcuResult == null)
+ {
+ return;
+ }
+ var vm = this.hydroVisualPropertyCtrl1.SelectedObject;
if (vm == null)
{
return;
}
- vm.UpdateCalcuProperty(rhs);
- this.hydroParterPropertyCtrl1.UpdateRows();
+ vm.UpdateCalcuProperty(calcuResult);
+ this.hydroVisualPropertyCtrl1.UpdateRows();
}
//閫夋嫨鏇茬嚎
@@ -130,8 +165,8 @@
var bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
if (bol)
{
- propViewModel.Update();
- this.hydroParterPropertyCtrl1.UpdateRows();
+ propViewModel.UpdateProperty();
+ this.hydroVisualPropertyCtrl1.UpdateRows();
}
return bol;
};
@@ -151,8 +186,8 @@
return false;
}
case Yw.WinFrmUI.HydroCurve.Valve:
- {
- return true;
+ {
+ return false;
}
case Yw.WinFrmUI.HydroCurve.ValveQL:
{
@@ -184,10 +219,49 @@
}
//灞炴�у彂鐢熸敼鍙�
- private bool HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroParterViewModel obj)
+ private void HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroVisualViewModel vm)
{
- return false;
+ if (vm == null)
+ {
+ return;
+ }
+ this.PropertyValueChangedEvent?.Invoke(vm.Vmo);
}
+
+ //鏍囨敞灞炴�у彂鐢熸敼鍙�
+ private void HydroParterPropertyCtrl1_MarkPropertyValueChangedEvent(HydroVisualViewModel vm)
+ {
+ if (vm == null)
+ {
+ return;
+ }
+ this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo);
+ }
+
+ //鍒嗙骇灞炴�у彂鐢熸敼鍙�
+ private void HydroParterPropertyCtrl1_GradingPropertyValueChangedEvent(HydroVisualViewModel vm)
+ {
+ if (vm == null)
+ {
+ return;
+ }
+ this.GradingPropertyValueChangedEvent?.Invoke(vm.Vmo);
+ }
+
+ //娴佸悜灞炴�у彂鐢熸敼鍙�
+ private void HydroParterPropertyCtrl1_FlowDirectionPropertyValueChangedEvent(HydroVisualViewModel vm)
+ {
+ if (vm == null)
+ {
+ return;
+ }
+ this.FlowDirectionPropertyValueChangedEvent?.Invoke(vm.Vmo);
+ }
+
+
+
+
+
//灞炴�ф鍦ㄥ彂鐢熸敼鍙�
private bool HydroParterPropertyCtrl1_PropertyValueChangingEvent(HydroParterViewModel arg)
@@ -208,7 +282,7 @@
{
return bol;
}
- var catalog = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogCode(propertyViewModel.Catalog);
+ var catalog = Yw.WinFrmUI.HydroParterCatalogHelper.GetCode(propertyViewModel.Catalog);
switch (catalog)
{
case Yw.Hydro.ParterCatalog.Pump://姘存车
@@ -227,7 +301,7 @@
bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
if (bol)
{
- propertyViewModel.Update();
+ propertyViewModel.UpdateProperty();
}
};
dlg.ShowDialog();
@@ -245,7 +319,12 @@
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (rhs) =>
{
- bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
+ var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
+ if (bol)
+ {
+ propertyViewModel.UpdateProperty();
+ this.hydroVisualPropertyCtrl1.UpdateRows();
+ }
};
dlg.ShowDialog();
}
@@ -266,7 +345,12 @@
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (output) =>
{
- bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
+ var bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
+ if (bol)
+ {
+ propertyViewModel.UpdateProperty();
+ this.hydroVisualPropertyCtrl1.UpdateRows();
+ }
};
dlg.ShowDialog();
}
@@ -298,6 +382,16 @@
this.BlinkLinkParterEvent?.Invoke(code, linkCode);
}
+ //鏌ョ湅鏋勪欢
+ private void HydroParterPropertyCtrl1_ViewParterEvent(HydroVisualViewModel vm)
+ {
+ if (vm == null)
+ {
+ return;
+ }
+ this.ViewParterEvent?.Invoke(vm.Vmo);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3