From 0fd4a678c2218c42d383e964a6b4aca975aa7b7a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 14:32:51 +0800
Subject: [PATCH] 图表修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpViewChart.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-view/PumpViewChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpViewChart.cs
similarity index 98%
rename from WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-view/PumpViewChart.cs
rename to WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpViewChart.cs
index c0a5858..e807c39 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-view/PumpViewChart.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/01-chart/PumpViewChart.cs
@@ -45,7 +45,7 @@
private List<Yw.Geometry.Point2d> _def_qe_pt_list;
private List<Yw.Geometry.Point2d> _def_qp_pt_list;
- private PumpGroupPt _work_point = new(0, 0, 0, 0, 0);
+ private PumpQueryPointViewModel _work_point = new();
private PumpCoordinate _coordinate;
private bool _equip_visible = true;
@@ -95,7 +95,7 @@
public event Action<PumpCoordinate> OnCurveCoordinateChanged;
- public event Action<PumpGroupPt> OnCalcQueryPoint = null;
+ public event Action<PumpQueryPointViewModel> OnCalcQueryPoint = null;
#endregion
@@ -189,7 +189,7 @@
{
var dis_min_h = _coordinate.DispMinH();
var equip_paras = EquipCurveHelper.CalcEquipCurve(_qh, _equip_pt, 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);
@@ -210,7 +210,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)
@@ -250,7 +250,7 @@
_def_qp_pt_list = null;
_coordinate = null;
- _work_point = new PumpGroupPt(0, 0, 0, 0, 0);
+ _work_point = new PumpQueryPointViewModel();
UpdateChart(false);
}
@@ -717,13 +717,13 @@
if (_qe != null)
{
_work_point.E = _qe.GetPointY(_work_point.Q);
- workInfoStringBuilder.AppendLine($"鏁堢巼:{_work_point.E.ToString("N1")} ");
+ workInfoStringBuilder.AppendLine($"鏁堢巼:{_work_point.E.Value.ToString("N1")} ");
}
if (_qp != null)
{
_work_point.P = _qp.GetPointY(_work_point.Q);
- workInfoStringBuilder.Append($"鍔熺巼:{_work_point.P.ToString("N1")} ");
+ workInfoStringBuilder.Append($"鍔熺巼:{_work_point.P.Value.ToString("N1")} ");
}
_query_flow_line.AxisValue = _work_point.Q;
--
Gitblit v1.9.3