From f7bed326ef5948e76dd1a1b24a9ed10f5b2e5e4e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 15:59:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/02-operation/PumpOperationChart.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/02-operation/PumpOperationChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/02-operation/PumpOperationChart.cs
index 861dd54..361a259 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/02-operation/PumpOperationChart.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/02-operation/PumpOperationChart.cs
@@ -260,14 +260,14 @@
return;
}
- start_head ??= _coordinate.DispMinH();
+ start_head ??= _coordinate.DispMinH();
var equip_line = Yw.Geometry.EquipCurveHelper.CalcEquipCurve(_vm.CurveQH, _equip_pt, start_head.Value, out Yw.Geometry.Point2d sect_pt);
if (equip_line == null || sect_pt == null)
return;
_equip_line = equip_line;
_equip_sect_pt = sect_pt;
-
+
double flow = 0, head = 0;
double? eff = null, power = null;
flow = sect_pt.X;
@@ -282,12 +282,12 @@
eff = _vm.CurveQE.GetPointY(flow);
power = PumpCalcHelper.CalculateP(flow, head, eff.Value);
}
-
+
var design_pt_list = new List<PumpDesignPointViewModel>
{
new() {
- Id = _vm.Id + "棰濆畾",
- Name = _vm.Name + "(棰濆畾)",
+ Id = _vm.Id,
+ Name = _vm.Name,
Q = flow,
H = head,
E = eff,
@@ -295,12 +295,12 @@
Hz = _vm.RatedHz,
N = _vm.RatedN
}
- };
+ };
if (_vm.CurrentStatus)
{
var current_equip_line = Yw.Geometry.EquipCurveHelper.CalcEquipCurve(_vm.CurrentCurveQH, _equip_pt, start_head.Value, out Yw.Geometry.Point2d current_sect_pt);
- if ( current_sect_pt == null)
+ if (current_sect_pt == null)
return;
double current_flow = 0, current_head = 0;
double? current_eff = null, current_power = null;
@@ -315,7 +315,7 @@
{
current_eff = _vm.CurrentCurveQE.GetPointY(current_flow);
current_power = PumpCalcHelper.CalculateP(current_flow, current_head, current_eff.Value);
- }
+ }
design_pt_list.Add(new()
{
@@ -329,7 +329,7 @@
N = _vm.CurrentN
});
- }
+ }
this.DesignPointChangedEvent?.Invoke(design_pt_list);
UpdateChart(true);
@@ -560,7 +560,7 @@
}
//鍔熺巼
- if (_max_power > _min_power)
+ if (_max_power > _min_power && _qp_visible)
{
//璁＄畻鍒诲害
var labels = new List<CustomAxisLabel>();
@@ -782,7 +782,7 @@
series_qh.View = series_qh_view;
series_qh.Visible = true;
- var pt_qh_list = vm.CurveQH.GetPointList(12);
+ var pt_qh_list = vm.CurveQH.GetPointList(100);
for (int i = 0; i < pt_qh_list.Count; i++)
{
series_qh.Points.Add(new SeriesPoint(pt_qh_list[i].X, new double[] { pt_qh_list[i].Y }));
@@ -816,7 +816,7 @@
txt_qh.RuntimeMoving = true;
txt_qh.RuntimeResizing = false;
txt_qh.RuntimeRotation = false;
- txt_qh.Text = vm.Name;
+ txt_qh.Text = $"{vm.RatedN}({vm.RatedHz}hz)";
txt_qh.TextColor = PumpChartDisplay.CurveColorQH;
txt_qh.ShapePosition = position_qh;
txt_qh.Visible = _line_name_visible;
@@ -848,7 +848,7 @@
series_qe.Visible = _qe_visible;
- var pt_qe_list = vm.CurveQE.GetPointList(12);
+ var pt_qe_list = vm.CurveQE.GetPointList(100);
for (int i = 0; i < pt_qe_list.Count; i++)
{
series_qe.Points.Add(new SeriesPoint(pt_qe_list[i].X, new double[] { pt_qe_list[i].Y }));
@@ -881,7 +881,7 @@
series_qp.View = series_qp_view;
series_qp.Visible = _qp_visible;
- var pt_qp_list = vm.CurveQP.GetPointList(12);
+ var pt_qp_list = vm.CurveQP.GetPointList(100);
for (int i = 0; i < pt_qp_list.Count; i++)
{
series_qp.Points.Add(new SeriesPoint(pt_qp_list[i].X, new double[] { pt_qp_list[i].Y }));
@@ -917,7 +917,7 @@
series_qh.View = series_qh_view;
series_qh.Visible = true;
- var pt_qh_list = vm.CurrentCurveQH.GetPointList(12);
+ var pt_qh_list = vm.CurrentCurveQH.GetPointList(100);
for (int i = 0; i < pt_qh_list.Count; i++)
{
series_qh.Points.Add(new SeriesPoint(pt_qh_list[i].X, new double[] { pt_qh_list[i].Y }));
@@ -951,7 +951,7 @@
txt_qh.RuntimeMoving = true;
txt_qh.RuntimeResizing = false;
txt_qh.RuntimeRotation = false;
- txt_qh.Text = vm.Name;
+ txt_qh.Text = $"{vm.CurrentN}({vm.CurrentHz}hz)";
txt_qh.TextColor = PumpChartDisplay.CurveColorQH;
txt_qh.ShapePosition = position_qh;
txt_qh.Visible = _line_name_visible;
@@ -981,7 +981,7 @@
series_qe.View = series_qe_view;
series_qe.Visible = _qe_visible;
- var pt_qe_list = vm.CurrentCurveQE.GetPointList(12);
+ var pt_qe_list = vm.CurrentCurveQE.GetPointList(100);
for (int i = 0; i < pt_qe_list.Count; i++)
{
series_qe.Points.Add(new SeriesPoint(pt_qe_list[i].X, new double[] { pt_qe_list[i].Y }));
@@ -1013,7 +1013,7 @@
series_qp.View = series_qp_view;
series_qp.Visible = _qp_visible;
- var pt_qp_list = vm.CurrentCurveQP.GetPointList(12);
+ var pt_qp_list = vm.CurrentCurveQP.GetPointList(100);
for (int i = 0; i < pt_qp_list.Count; i++)
{
series_qp.Points.Add(new SeriesPoint(pt_qp_list[i].X, new double[] { pt_qp_list[i].Y }));
--
Gitblit v1.9.3