From dbcef6befb123066754141adef6dc3ef6653b6ce Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 02 十二月 2024 14:34:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpWorkChart.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-view/PumpWorkChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpWorkChart.cs
similarity index 98%
rename from WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-view/PumpWorkChart.cs
rename to WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpWorkChart.cs
index cb42624..b81a821 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-view/PumpWorkChart.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpWorkChart.cs
@@ -79,7 +79,7 @@
public event Action<PumpCoordinate> OnCurveCoordinateChanged;
- public event Action<string, PumpGroupPt> OnCalcQueryPoint = null;
+ public event Action<string, PumpQueryPointViewModel> OnCalcQueryPoint = null;
#endregion
@@ -146,7 +146,7 @@
{
var dis_min_h = _coordinate.DispMinH();
var equip_paras = EquipCurveHelper.CalcEquipCurve(_vm.QhCalc, _vm.WorkPoint, dis_min_h, out Yw.Geometry.Point2d sect_pt);
- if (equip_paras != null && equip_paras.EquipCurve.IsValid())
+ if (equip_paras != null && equip_paras.IsValid())
{
using Pen pen = new(Color.Black, 2);
pen.DashStyle = System.Drawing.Drawing2D.DashStyle.DashDotDot;
@@ -167,7 +167,7 @@
}
// 鍒涘缓GraphicsPath瀵硅薄锛屽苟娣诲姞鏍锋潯绾�
- var pts = equip_paras.EquipCurve.GetPointList().Select(x => new PointF((float)x.X, (float)x.Y)).ToArray();
+ var pts = equip_paras.GetPointList().Select(x => new PointF((float)x.X, (float)x.Y)).ToArray();
using var path = new System.Drawing.Drawing2D.GraphicsPath();
var g_pts = new List<PointF>();
foreach (var pt in pts)
@@ -552,7 +552,7 @@
}
_anno_txt_query_info.Visible = true;
- var work_pt = new PumpGroupPt(0, 0, 0, 0, 0);
+ var work_pt = new PumpQueryPointViewModel();
work_pt.Q = work_flow.Value;
work_pt.H = qh.GetPointY(work_flow.Value);
@@ -564,18 +564,18 @@
if (qp != null)
{
work_pt.P = qp.GetPointY(work_pt.Q);
- work_pt.E = PumpCalcHelper.CalculateE(work_pt.Q, work_pt.H, work_pt.P);
+ work_pt.E = PumpCalcHelper.CalculateE(work_pt.Q, work_pt.H, work_pt.P.Value);
}
else
{
work_pt.E = qe.GetPointY(work_pt.Q);
}
- work_info_str_builder.AppendLine($"鏁堢巼:{work_pt.E.ToString("N2")} ");
+ work_info_str_builder.AppendLine($"鏁堢巼:{work_pt.E.Value.ToString("N2")} ");
}
if (qp != null)
{
work_pt.P = qp.GetPointY(work_pt.Q);
- work_info_str_builder.Append($"鍔熺巼:{work_pt.P.ToString("N1")} ");
+ work_info_str_builder.Append($"鍔熺巼:{work_pt.P.Value.ToString("N1")} ");
}
_anno_txt_query_info.Text = work_info_str_builder.ToString();
--
Gitblit v1.9.3