From bc230c03cb961e8d5fb40131806fe795ecfbfa73 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 06 十一月 2024 15:07:00 +0800
Subject: [PATCH] 修改曲线id命名
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 124 ++++++++++++++++++++++++++++++++---------
1 files changed, 96 insertions(+), 28 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 6eee46b..be19733 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
@@ -13,12 +13,14 @@
InitializeComponent();
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.hydroParterPropertyCtrl1.ViewParterEvent += HydroParterPropertyCtrl1_ViewParterEvent;
}
+
+
/// <summary>
@@ -28,18 +30,39 @@
/// </summary>
public event Action<string, string> BlinkLinkParterEvent;
+ /// <summary>
+ /// 灞炴�у�兼敼鍙樹簨浠�
+ /// </summary>
+ public event Action<Yw.Model.HydroParterInfo> PropertyValueChangedEvent;
+
+ /// <summary>
+ /// 鏌ョ湅鏋勪欢浜嬩欢
+ /// </summary>
+ public event Action<Yw.Model.HydroParterInfo> ViewParterEvent;
+
//姘村姏淇℃伅鏂规硶
private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
- private Func<List<IHydroCalcuResult>> _allHydroCalcuResultListFunc = null;
+ private Func<List<HydroCalcuResult>> _allHydroCalcuResultListFunc = null;
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
- public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc, Func<List<IHydroCalcuResult>> allHydroCalcuResultListFunc)
+ public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc, Func<List<HydroCalcuResult>> allHydroCalcuResultListFunc)
{
_hydroInfoFunc = hydroInfoFunc;
_allHydroCalcuResultListFunc = allHydroCalcuResultListFunc;
- this.hydroParterPropertyCtrl1.InitialData(hydroInfoFunc);
+ }
+
+ //鑾峰彇姘村姏淇℃伅
+ private Yw.Model.HydroModelInfo GetHydroInfo()
+ {
+ var hydroInfo = _hydroInfoFunc?.Invoke();
+ if (hydroInfo == null)
+ {
+ this.hydroParterPropertyCtrl1.SelectedObject = null;
+ return default;
+ }
+ return hydroInfo;
}
/// <summary>
@@ -47,16 +70,14 @@
/// </summary>
public void SelectParter(long id)
{
- var hydroInfo = _hydroInfoFunc?.Invoke();
+ var hydroInfo = GetHydroInfo();
if (hydroInfo == null)
{
- this.hydroParterPropertyCtrl1.SelectedObject = null;
return;
}
var allParterList = hydroInfo.GetAllParters();
- var parter = allParterList.Find(x => x.ID == id);
- var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, allParterList);
- this.hydroParterPropertyCtrl1.SelectedObject = vm;
+ var parter = allParterList?.Find(x => x.ID == id);
+ SelectParter(parter);
}
/// <summary>
@@ -64,43 +85,75 @@
/// </summary>
public void SelectParter(string code)
{
- var hydroInfo = _hydroInfoFunc?.Invoke();
+ var hydroInfo = GetHydroInfo();
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, allParterList);
- this.hydroParterPropertyCtrl1.SelectedObject = vm;
+ var parter = allParterList?.Find(x => x.Code == code);
+ SelectParter(parter);
}
/// <summary>
/// 閫夋嫨缁勪欢
/// </summary>
- public void SelectParter(Yw.Model.HydroParterInfo parter, List<Yw.Model.HydroParterInfo> allParterList)
+ public void SelectParter(Yw.Model.HydroParterInfo parter)
{
- var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, allParterList);
- this.hydroParterPropertyCtrl1.SelectedObject = vm;
+ var hydroInfo = GetHydroInfo();
+ if (hydroInfo == null)
+ {
+ return;
+ }
+ if (parter != null)
+ {
+ var vm = Yw.WinFrmUI.HydroParterViewModelBuilder.CreateViewModel(parter, hydroInfo);
+ this.hydroParterPropertyCtrl1.SelectedObject = vm;
+ }
}
/// <summary>
- /// 鏇存柊璁＄畻灞炴��
+ /// 鍙栨秷閫夋嫨缁勪欢
/// </summary>
- public void UpdateCalcuProperty(Yw.WinFrmUI.IHydroCalcuResult rhs)
+ public void CancelSelectParter()
+ {
+ this.hydroParterPropertyCtrl1.SelectedObject = null;
+ }
+
+ /// <summary>
+ /// 鏇存柊灞炴��
+ /// </summary>
+ public void UpdateProperty()
{
var vm = this.hydroParterPropertyCtrl1.SelectedObject;
if (vm == null)
{
return;
}
- vm.UpdateCalcuProperty(rhs);
+ vm.UpdateProperty();
+ this.hydroParterPropertyCtrl1.UpdateRows();
+ }
+
+ /// <summary>
+ /// 鏇存柊璁＄畻灞炴��
+ /// </summary>
+ public void UpdateCalcuProperty(Yw.WinFrmUI.HydroCalcuResult calcuResult)
+ {
+ if (calcuResult == null)
+ {
+ return;
+ }
+ var vm = this.hydroParterPropertyCtrl1.SelectedObject;
+ if (vm == null)
+ {
+ return;
+ }
+ vm.UpdateCalcuProperty(calcuResult);
this.hydroParterPropertyCtrl1.UpdateRows();
}
//閫夋嫨鏇茬嚎
- private bool HydroParterPropertyCtrl1_SetCurveEvent(HydroParterPropertyViewModel propViewModel, string curveType)
+ private bool HydroParterPropertyCtrl1_SetCurveEvent(HydroParterViewModel propViewModel, string curveType)
{
var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
@@ -124,7 +177,8 @@
var bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
if (bol)
{
- propViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
+ propViewModel.UpdateProperty();
+ this.hydroParterPropertyCtrl1.UpdateRows();
}
return bol;
};
@@ -157,7 +211,7 @@
}
//閫夋嫨妯″紡
- private bool HydroParterPropertyCtrl1_SetPatternEvent(HydroParterPropertyViewModel propViewModel, string patternType)
+ private bool HydroParterPropertyCtrl1_SetPatternEvent(HydroParterViewModel propViewModel, string patternType)
{
switch (patternType)
{
@@ -177,19 +231,23 @@
}
//灞炴�у彂鐢熸敼鍙�
- private bool HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroParterPropertyViewModel obj)
+ private void HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroParterViewModel vm)
{
- return false;
+ if (vm == null)
+ {
+ return;
+ }
+ this.PropertyValueChangedEvent?.Invoke(vm.Vmo);
}
//灞炴�ф鍦ㄥ彂鐢熸敼鍙�
- private bool HydroParterPropertyCtrl1_PropertyValueChangingEvent(HydroParterPropertyViewModel arg)
+ private bool HydroParterPropertyCtrl1_PropertyValueChangingEvent(HydroParterViewModel arg)
{
return false;
}
//鍖归厤Db
- private bool HydroParterPropertyCtrl1_MatchingDbEvent(HydroParterPropertyViewModel propertyViewModel)
+ private bool HydroParterPropertyCtrl1_MatchingDbEvent(HydroParterViewModel propertyViewModel)
{
var bol = false;
if (propertyViewModel == null)
@@ -220,7 +278,7 @@
bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
if (bol)
{
- propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
+ propertyViewModel.UpdateProperty();
}
};
dlg.ShowDialog();
@@ -291,6 +349,16 @@
this.BlinkLinkParterEvent?.Invoke(code, linkCode);
}
+ //鏌ョ湅鏋勪欢
+ private void HydroParterPropertyCtrl1_ViewParterEvent(HydroParterViewModel vm)
+ {
+ if (vm == null)
+ {
+ return;
+ }
+ this.ViewParterEvent?.Invoke(vm.Vmo);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3