From 422bb59e2c51524096faaafbe7cabccdc3efb701 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 21:45:10 +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/11-pump/02-feat/SimulationSinglePumpFeatCtrl.cs | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/02-feat/SimulationSinglePumpFeatCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/02-feat/SimulationSinglePumpFeatCtrl.cs
index 5040227..03b7389 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/02-feat/SimulationSinglePumpFeatCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/02-feat/SimulationSinglePumpFeatCtrl.cs
@@ -12,6 +12,7 @@
using System.Windows.Forms;
using Yw.Geometry;
using Yw.Pump;
+using Yw.Vmo;
using Yw.WinFrmUI.Phart;
namespace HStation.WinFrmUI
@@ -35,12 +36,19 @@
private Yw.Model.HydroModelInfo _hydroInfo = null;
private Yw.Model.HydroPumpInfo _pumpInfo = null;
+ private HydroCalcuResult _calcuResult = null;
+ private double _head = 0;//
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPumpInfo pumpInfo)
+ public void SetBindingData
+ (
+ Yw.Model.HydroModelInfo hydroInfo,
+ Yw.Model.HydroPumpInfo pumpInfo,
+ HydroCalcuResult calcuResult
+ )
{
if (hydroInfo == null)
{
@@ -52,10 +60,32 @@
}
_hydroInfo = hydroInfo;
_pumpInfo = pumpInfo;
+ _calcuResult = calcuResult;
+ _head = _hydroInfo.GetHead();
this.hydroSinglePumpListExtendGridCtrl1.SetBindingData(pumpInfo);
var allStateList = this.hydroSinglePumpListExtendGridCtrl1.GetStateList();
var vm = CreateViewModel(allStateList);
this.pumpOperationChart1.SetBindingData(vm);
+ if (calcuResult != null)
+ {
+ var allCalcuVisualDict = calcuResult.GetVisualDict();
+ var calcuVisualResult = allCalcuVisualDict?.GetValue(pumpInfo.Code) as HydroCalcuPumpResult;
+ if (calcuVisualResult != null)
+ {
+ if (calcuVisualResult.CalcuQ.HasValue)
+ {
+ this.txtDesignQ.EditValue = Math.Round(calcuVisualResult.CalcuQ.Value, 1);
+ }
+ if (calcuVisualResult.CalcuH.HasValue)
+ {
+ this.txtDesignH.EditValue = Math.Round(calcuVisualResult.CalcuH.Value, 2);
+ }
+ if (calcuVisualResult.CalcuQ.HasValue && calcuVisualResult.CalcuH.HasValue)
+ {
+ Design();
+ }
+ }
+ }
}
//鐘舵�佹敼鍙樹簨浠�
@@ -184,6 +214,12 @@
//璁捐鐐�
private void btnDesign_Click(object sender, EventArgs e)
{
+ Design();
+ }
+
+ //璁捐
+ private void Design()
+ {
var qtext = this.txtDesignQ.Text.Trim();
if (string.IsNullOrEmpty(qtext))
{
@@ -198,7 +234,7 @@
}
var q = double.Parse(qtext);
var h = double.Parse(htext);
- this.pumpOperationChart1.SetDesignPoint(q, h);
+ this.pumpOperationChart1.SetDesignPoint(q, h, _head);
}
/// <summary>
--
Gitblit v1.9.3