From ca413cba3484fd271344c3bfb3021c7e028d1fe3 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 24 十二月 2024 14:41:07 +0800
Subject: [PATCH] 泵曲线视图更改
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.cs | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.cs
index 97258df..2ab77b5 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.cs
@@ -9,13 +9,18 @@
private Yw.Vmo.PhartDiagramExGraphListVmo _vmo = null;
private Yw.WinFrmUI.Phart.PumpCurveViewModel _vm = null;
-
+
+ /// <summary>
+ /// 鏁版嵁鍙樻洿浜嬩欢
+ /// </summary>
+ public event Action<Yw.Vmo.PhartDiagramExGraphListVmo> DataChangedEvent;
+
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
public void SetBindingData(Yw.Vmo.PhartDiagramExGraphListVmo vmo, double nr)
{
- _vmo= vmo;
+ _vmo = vmo;
if (vmo == null)
{
ClearBindingData();
@@ -31,7 +36,7 @@
if (vm_def == null)
return;
- var vm_v_speed_list = vmo.GetVariableSpeedPumpCurveViewMdoelList();
+ var vm_v_speed_list = vmo.GetVariableSpeedPumpCurveViewMdoelList();
var vm_e_eff_list = vmo.GetCurveEqualEViewMdoelList();
var vm = new Yw.WinFrmUI.Phart.PumpCurveViewModel();
@@ -54,32 +59,29 @@
if (curve_qe != null && curve_qe.IsValid())
{
var max_eff = curve_qe.GetPointList().Max(x => x.Y);
- var eff_list = EqualParaCurveEListHelper.CalcEqualParaCurveE(vm_def, 50, 30, max_eff);
+ var eff_list = EqualParaCurveEListHelper.CalcEqualParaCurveE(vm_def, 50, 30, max_eff - 1);
if (eff_list != null && eff_list.Any())
{
vm.EqualEffList = new List<Yw.WinFrmUI.Phart.PumpCurveEqualEffViewModel>();
foreach (var item in eff_list)
{
+ var def_pt_list = item.DefinePoints;
var eff_vm = new Yw.WinFrmUI.Phart.PumpCurveEqualEffViewModel();
eff_vm.Id = Guid.NewGuid().ToString();
- eff_vm.CurveName = item.Eff.ToString();
+ eff_vm.CurveName = $"{item.Eff:N1}";
eff_vm.Color = Color.DarkGreen;
eff_vm.CurveEqualEff = item.DefinePoints;
eff_vm.Tension = item.Tension;
eff_vm.IsClosed = item.IsClosed;
vm.EqualEffList.Add(eff_vm);
}
- }
+ }
}
-
}
-
-
- //vm.VariableSpeedList = new List<Yw.WinFrmUI.Phart.PumpChartVariableSpeedViewModel>();
-
- //vm.EqualPowerList = new List<Yw.WinFrmUI.Phart.PumpChartEqualPowerViewModel>();
+ //vm.VariableSpeedList = new List<Yw.WinFrmUI.Phart.PumpChartVariableSpeedViewModel>();
+ //vm.EqualPowerList = new List<Yw.WinFrmUI.Phart.PumpChartEqualPowerViewModel>();
//for (int eff = 30; eff < 90; eff += 1)
//{
// var ve = new Yw.WinFrmUI.Phart.PumpChartEqualEffViewModel();
--
Gitblit v1.9.3