From 7507591ef45cfa8f1080f6dbf68b411edcc7f086 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期日, 03 十一月 2024 15:42:56 +0800
Subject: [PATCH] 水力存储优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 107 ++++++++++++++---------------------------------------
1 files changed, 29 insertions(+), 78 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 46c7174..174717e 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
@@ -15,8 +15,11 @@
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;
}
+
/// <summary>
/// 寮鸿皟杩炴帴缁勪欢浜嬩欢
@@ -27,12 +30,12 @@
//姘村姏淇℃伅鏂规硶
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;
@@ -96,70 +99,35 @@
this.hydroParterPropertyCtrl1.UpdateRows();
}
- //鏌ョ湅鏇茬嚎
- private void HydroParterPropertyCtrl1_ViewCurveEvent(Yw.Model.HydroParterInfo parterInfo, string curveType)
+ //閫夋嫨鏇茬嚎
+ private bool HydroParterPropertyCtrl1_SetCurveEvent(HydroParterPropertyViewModel propViewModel, string curveType)
{
var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
- return;
+ return false;
}
switch (curveType)
{
case Yw.WinFrmUI.HydroCurve.Pump:
{
- var pumpInfo = parterInfo as Yw.Model.HydroPumpInfo;
- var curveqh = hydroInfo.Curves?.Find(x => x.Code == pumpInfo.CurveQH);
- if (curveqh == null)
- {
- return;
- }
- var pumpId = string.IsNullOrEmpty(pumpInfo.DbId) ? 0 : Convert.ToInt64(pumpInfo.DbId);
- var curveId = string.IsNullOrEmpty(curveqh.DbId) ? 0 : Convert.ToInt64(curveqh.DbId);
- var speedRatio = pumpInfo.SpeedRatio;
- var dlg = new PumpPerform2dViewDlg();
- dlg.SetBindingData(pumpId, curveId, speedRatio);
- dlg.ShowDialog();
- }
- break;
-
- case Yw.WinFrmUI.HydroCurve.Valve:
- {
- }
- break;
-
- default: break;
- }
- }
-
- //閫夋嫨鏇茬嚎
- private bool HydroParterPropertyCtrl1_SetCurveEvent(HydroParterPropertyViewModel propViewModel, string curveType)
- {
- switch (curveType)
- {
- case Yw.WinFrmUI.HydroCurve.Pump:
- {
- var hydroInfo = _hydroInfoFunc?.Invoke();
- if (hydroInfo == null)
- {
- return false;
- }
var pumpInfo = hydroInfo.Pumps?.Find(x => x.Code == propViewModel.Code);
-
- var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo, _allHydroCalcuResultListFunc?.Invoke());
- var dlg = new PumpSingleMatchingDlg();
- dlg.SetBindingData(input);
- dlg.ReloadDataEvent += (rhs) =>
+ if (pumpInfo == null)
{
- var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
+ break;
+ }
+ var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo, _allHydroCalcuResultListFunc?.Invoke());
+ var dlg = new SinglePumpAnalyDlg();
+ dlg.SetBindindData(input);
+ dlg.ReloadDataEvent += (output) =>
+ {
+ var bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
if (bol)
{
- TipFormHelper.ShowSucceed("鍖归厤鎴愬姛");
+ propViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
+ this.hydroParterPropertyCtrl1.UpdateRows();
}
- else
- {
- TipFormHelper.ShowWarn("鍖归厤澶辫触");
- }
+ return bol;
};
dlg.ShowDialog();
return true;
@@ -246,34 +214,17 @@
}
var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo, _allHydroCalcuResultListFunc?.Invoke());
- if (string.IsNullOrEmpty(pumpInfo.DbId))
+ var dlg = new PumpSingleMatchingDlg();
+ dlg.SetBindingData(input);
+ dlg.ReloadDataEvent += (output) =>
{
- var dlg = new PumpSingleMatchingDlg();
- dlg.SetBindingData(input);
- dlg.ReloadDataEvent += (output) =>
+ bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
+ if (bol)
{
- bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
- if (bol)
- {
- propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
- }
- };
- dlg.ShowDialog();
- }
- else
- {
- var dlg = new PumpFullInfoViewDlg();
- dlg.SetBindindData(input);
- dlg.ReloadDataEvent += (output) =>
- {
- bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
- if (bol)
- {
- propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
- }
- };
- dlg.ShowDialog();
- }
+ propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
+ }
+ };
+ dlg.ShowDialog();
}
break;
case Yw.Hydro.ParterCatalog.Valve://闃�闂�
--
Gitblit v1.9.3