From 0f99d4d12f2eae29bbe343f4b3131f2faeccda5d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:20 +0800
Subject: [PATCH] 泵曲线修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.cs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.cs
index 068ce69..ad122da 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraEditors;
+using Yw.Ahart;
namespace Yw.WinFrmUI.Phart
{
@@ -341,18 +342,35 @@
if (!bol)
{
- this.pumpViewChart1.ClearBindingData();
+ this.pumpViewChart1.Clear();
}
else
{
- var vm = new PumpCurveViewModel();
- vm.CurveQH = _def_qh_pt_list;
- vm.CurveQE = _def_qe_pt_list;
- vm.CurveQP = _def_qp_pt_list;
- this.pumpViewChart1.SetBindingData(vm);
+ var list = new List<Yw.WinFrmUI.Phart.PumpViewChartViewModel>();
+ list.Add(GetViewModel(_def_qh_pt_list, Yw.Ahart.eCurveType.QH));
+ if (_def_qe_pt_list != null && _def_qe_pt_list.Any())
+ list.Add(GetViewModel(_def_qe_pt_list, Yw.Ahart.eCurveType.QE));
+ if (_def_qp_pt_list != null && _def_qp_pt_list.Any())
+ list.Add(GetViewModel(_def_qp_pt_list, Yw.Ahart.eCurveType.QP));
+ this.pumpViewChart1.SetBindingData(list);
}
}
+ private Yw.WinFrmUI.Phart.PumpViewChartViewModel GetViewModel(List<Yw.Geometry.Point2d> pt_list,Yw.Ahart.eCurveType curve_type)
+ {
+ var last_pt = pt_list.Last();
+ var vm = new Yw.WinFrmUI.Phart.PumpViewChartViewModel();
+ vm.Id = Guid.NewGuid().ToString();
+ vm.Hz = 50;
+ vm.N = Convert.ToDouble(this.barTxtN.EditValue);
+ vm.CurveType = curve_type;
+ vm.FeatType = eFeatType.Cubic;
+ vm.DefPointList = pt_list;
+ vm.FitPointList = pt_list;
+ vm.GraphParas = "";
+ return vm;
+ }
+
//鐢熸垚
private void barBtnCreate_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
--
Gitblit v1.9.3