From 3b08b5c772ffc0c10644c1aaa9f7b2447582c858 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 14 十月 2024 17:50:24 +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 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 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 9ce556f..3c7865d 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
@@ -1,4 +1,5 @@
-锘縰sing HStation.WinFrmUI.Xhs;
+锘縰sing HStation.WinFrmUI.PhartRelation;
+using HStation.WinFrmUI.Xhs;
namespace HStation.WinFrmUI
{
@@ -11,12 +12,15 @@
{
InitializeComponent();
- this.hydroParterPropertyCtrl1.SelectCurveEvent += HydroParterPropertyCtrl1_SelectCurveEvent;
- this.hydroParterPropertyCtrl1.SelectPatternEvent += HydroParterPropertyCtrl1_SelectPatternEvent;
+ this.hydroParterPropertyCtrl1.ViewCurveEvent += HydroParterPropertyCtrl1_ViewCurveEvent;
+ this.hydroParterPropertyCtrl1.SetCurveEvent += HydroParterPropertyCtrl1_SetCurveEvent;
+ this.hydroParterPropertyCtrl1.SetPatternEvent += HydroParterPropertyCtrl1_SetPatternEvent;
this.hydroParterPropertyCtrl1.PropertyValueChangedEvent += HydroParterPropertyCtrl1_PropertyValueChangedEvent;
this.hydroParterPropertyCtrl1.PropertyValueChangingEvent += HydroParterPropertyCtrl1_PropertyValueChangingEvent;
this.hydroParterPropertyCtrl1.MatchingDbEvent += HydroParterPropertyCtrl1_MatchingDbEvent;
}
+
+
//姘村姏淇℃伅鏂规硶
private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
@@ -27,6 +31,7 @@
public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc)
{
_hydroInfoFunc = hydroInfoFunc;
+ this.hydroParterPropertyCtrl1.InitialData(hydroInfoFunc);
}
/// <summary>
@@ -86,8 +91,43 @@
this.hydroParterPropertyCtrl1.UpdateRows();
}
+ //鏌ョ湅鏇茬嚎
+ private void HydroParterPropertyCtrl1_ViewCurveEvent(Yw.Model.HydroParterInfo parterInfo, string curveType)
+ {
+ var hydroInfo = _hydroInfoFunc?.Invoke();
+ if (hydroInfo == null)
+ {
+ return;
+ }
+ 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 ?? 1;
+ var dlg = new PumpPerform2dViewDlg();
+ dlg.SetBindingData(pumpId, curveId, speedRatio);
+ dlg.ShowDialog();
+ }
+ break;
+ case Yw.WinFrmUI.HydroCurve.Valve:
+ {
+
+ }
+ break;
+ default: break;
+ }
+ }
+
//閫夋嫨鏇茬嚎
- private bool HydroParterPropertyCtrl1_SelectCurveEvent(HydroParterPropertyViewModel propViewModel, string curveType)
+ private bool HydroParterPropertyCtrl1_SetCurveEvent(HydroParterPropertyViewModel propViewModel, string curveType)
{
switch (curveType)
{
@@ -144,7 +184,7 @@
}
//閫夋嫨妯″紡
- private bool HydroParterPropertyCtrl1_SelectPatternEvent(HydroParterPropertyViewModel propViewModel, string patternType)
+ private bool HydroParterPropertyCtrl1_SetPatternEvent(HydroParterPropertyViewModel propViewModel, string patternType)
{
switch (patternType)
{
@@ -193,6 +233,14 @@
{
var pumpInfo = hydroInfo.Pumps?.Find(x => x.Code == parter.Code);
var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo);
+
+ if (input.DbId != string.Empty)
+ {
+ var detailDlg = new DetailInfo4DsDlg();
+ detailDlg.SetBindindData(input);
+ detailDlg.ShowDialog();
+ }
+
var dlg = new PumpSingleMatchingDlg();
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (rhs) =>
@@ -271,5 +319,7 @@
break;
}
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3