From d885c60b9f076cb89527b69cac370b3af65cafd0 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 13 一月 2025 13:37:03 +0800
Subject: [PATCH] 阀门曲线修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/01-view/ValveViewChart.cs | 58 +++++++++++++++--------------
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-core/PumpChartExtend.cs | 13 ++++++
WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/02-edit/ValveEditChart.cs | 10 +++--
3 files changed, 49 insertions(+), 32 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-core/PumpChartExtend.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-core/PumpChartExtend.cs
index a5b3b44..3da9ad3 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-core/PumpChartExtend.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-core/PumpChartExtend.cs
@@ -54,6 +54,19 @@
xyDiagram.AxisX.GridLines.MinorColor = Color.Silver;
xyDiagram.AxisY.GridLines.MinorColor = Color.Silver;
+
+ for (int i = 0; i < xyDiagram.SecondaryAxesX.Count; i++)
+ {
+ var axis = xyDiagram.SecondaryAxesX[i];
+ axis.GridLines.MinorColor = Color.Silver;
+ }
+
+ for (int i = 0; i < xyDiagram.SecondaryAxesY.Count; i++)
+ {
+ var axis = xyDiagram.SecondaryAxesY[i];
+ axis.GridLines.MinorColor = Color.Silver;
+ }
+
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/01-view/ValveViewChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/01-view/ValveViewChart.cs
index 4c34d55..fea3b18 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/01-view/ValveViewChart.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/01-view/ValveViewChart.cs
@@ -108,8 +108,10 @@
_axis_x_flow.Visibility = DefaultBoolean.False;
_axis_x_flow.GridLines.Visible = false;
+ _axis_x_flow.GridLines.Color = Color.Silver;
_axis_y_head_loss.Visibility = DefaultBoolean.False;
_axis_y_head_loss.GridLines.Visible = false;
+ _axis_y_head_loss.GridLines.Color = Color.Silver;
_axis_x_opening = _diagram.SecondaryAxesX[0];
_axis_x_opening.SetAxisXQDisplay();
@@ -118,8 +120,10 @@
_axis_x_opening.Visibility = DefaultBoolean.False;
_axis_x_opening.GridLines.Visible = false;
+ _axis_x_opening.GridLines.Color = Color.Silver;
_axis_y_k.Visibility = DefaultBoolean.False;
_axis_y_k.GridLines.Visible = false;
+ _axis_y_k.GridLines.Color = Color.Silver;
_const_line_x_flow = (ConstantLine)_axis_x_flow.ConstantLines.GetElementByName("ConstantLineFlow");
_const_line_x_flow.SetWorkPointLineDisplay();
@@ -138,8 +142,7 @@
_anno_txt_query_info = this.chartControl1.AnnotationRepository[0] as TextAnnotation;
_anno_txt_query_info.SetTextAnnoWorkPointDisplay();
_anno_txt_query_info.Visible = false;
-
- this.chartControl1.SetChartMonoColorDisplay();
+
}
/// <summary>
@@ -248,7 +251,7 @@
}
- AddPointSeries(vm.Color, axis_x, axis_y, pane, vm.DefPointList);
+ // AddPointSeries(vm.Color, axis_x, axis_y, pane, vm.DefPointList);
AddLineSeries(vm.Color, axis_x, axis_y, pane, vm.FitPointList);
if (!string.IsNullOrEmpty(vm.Name) && vm.CurveType == Ahart.eCurveType.QL)
@@ -265,6 +268,8 @@
SetChartAxis();
this.chartControl1.EndInit();
_initial_data = true;
+ SetAxisXFlowValue();
+ SetAxisXOpeningValue();
}
@@ -483,6 +488,7 @@
_axis_x_opening.GridLines.Visible = false;
_axis_y_k.Visibility = DefaultBoolean.False;
_axis_y_k.GridLines.Visible = false;
+
return;
}
@@ -526,6 +532,10 @@
}
else
{
+ _axis_x_flow.Visibility = DefaultBoolean.False;
+ _axis_x_flow.GridLines.Visible = false;
+ _axis_y_head_loss.Visibility = DefaultBoolean.False;
+ _axis_y_head_loss.GridLines.Visible = false;
_default_pane.Visibility = ChartElementVisibility.Hidden;
}
@@ -568,7 +578,11 @@
_bottom_pane.Visibility = ChartElementVisibility.Visible;
}
else
- {
+ {
+ _axis_x_opening.Visibility = DefaultBoolean.False;
+ _axis_x_opening.GridLines.Visible = false;
+ _axis_y_k.Visibility = DefaultBoolean.False;
+ _axis_y_k.GridLines.Visible = false;
_bottom_pane.Visibility = ChartElementVisibility.Hidden;
}
@@ -701,11 +715,7 @@
if (!_line_visible || !_exist_ql)
{
_const_line_x_flow.Visible = false;
- _const_line_x_flow.Title.Visible = false;
- _const_line_x_opening.Visible = false;
- _const_line_x_opening.Title.Visible = false;
- _const_line_y_k.Visible = false;
- _const_line_y_k.Title.Visible = false;
+ _const_line_x_flow.Title.Visible = false;
_anno_txt_query_info.Visible = false;
return;
}
@@ -713,10 +723,6 @@
{
_const_line_x_flow.Visible = true;
_const_line_x_flow.Title.Visible = true;
- _const_line_x_opening.Visible = true;
- _const_line_x_opening.Title.Visible = true;
- _const_line_y_k.Visible = true;
- _const_line_y_k.Title.Visible = true;
_anno_txt_query_info.Visible = true;
}
if (this.IsInvalidData())
@@ -739,26 +745,28 @@
var query_info_builder = new StringBuilder();
var x_value = x.Value;
- query_info_builder.AppendLine($"娴侀噺:{x_value:N2} ");
+ query_info_builder.AppendLine($"{x_value:N2} m鲁/h ");
var str_list = new List<(string, string)>();
foreach (var vm in vm_list)
{
var y_value = vm.FitPointList.GetInterPointsY(x_value)?.FirstOrDefault();
if (y_value.HasValue)
{
- str_list.Add((vm.Name, y_value.Value.ToString("N2")));
+ var name= string.IsNullOrEmpty(vm.Name) ? "榛樿" : vm.Name;
+ str_list.Add((name, y_value.Value.ToString("N2")));
}
}
for (int i = 0; i < str_list.Count; i++)
{
var str = str_list[i];
- if (i== str_list.Count-1)
- {
- query_info_builder.Append($"{str.Item1}:{str.Item2}");
+ var txt = $"{str.Item2} m [{str.Item1}]";
+ if (i == str_list.Count - 1)
+ {
+ query_info_builder.Append(txt);
}
else
- {
- query_info_builder.AppendLine($"{str.Item1}:{str.Item2}");
+ {
+ query_info_builder.AppendLine(txt);
}
}
@@ -778,24 +786,18 @@
{
if (!_line_visible || !_exist_ol)
{
- _const_line_x_flow.Visible = false;
- _const_line_x_flow.Title.Visible = false;
_const_line_x_opening.Visible = false;
_const_line_x_opening.Title.Visible = false;
_const_line_y_k.Visible = false;
- _const_line_y_k.Title.Visible = false;
- _anno_txt_query_info.Visible = false;
+ _const_line_y_k.Title.Visible = false;
return;
}
else
{
- _const_line_x_flow.Visible = true;
- _const_line_x_flow.Title.Visible = true;
_const_line_x_opening.Visible = true;
_const_line_x_opening.Title.Visible = true;
_const_line_y_k.Visible = true;
- _const_line_y_k.Title.Visible = true;
- _anno_txt_query_info.Visible = true;
+ _const_line_y_k.Title.Visible = true;
}
if (this.IsInvalidData())
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/02-edit/ValveEditChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/02-edit/ValveEditChart.cs
index a4b3863..2b19f55 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/02-edit/ValveEditChart.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/03-valve/02-edit/ValveEditChart.cs
@@ -427,7 +427,8 @@
var display_x_flow = _coordinate.QL.CoordMinX;
for (int i = 0; i < _coordinate.QL.GridNumberX + 1; i++)
{
- axis_x_flow_labels.Add(new CustomAxisLabel(display_x_flow.ToString("N0"), display_x_flow));
+ var x = _coordinate.QL.CoordSpaceX < 1 ? $"{display_x_flow:N1}" : $"{display_x_flow:N0}";
+ axis_x_flow_labels.Add(new CustomAxisLabel(x, display_x_flow));
display_x_flow = display_x_flow + _coordinate.QL.CoordSpaceX;
}
@@ -442,7 +443,7 @@
var display_y_head_loss = _coordinate.QL.CoordMinY + _coordinate.QL.CoordSpaceY * _coordinate.QL.StartLineNoY;
for (int i = _coordinate.QL.StartLineNoY; i < _coordinate.QL.EndLineNoY + 1; i++)
{
- var y = display_y_head_loss < 1 ? $"{display_y_head_loss:N1}" : $"{display_y_head_loss:N0}";
+ var y = _coordinate.QL.CoordSpaceY < 1 ? $"{display_y_head_loss:N1}" : $"{display_y_head_loss:N0}";
axis_y_head_loss_labels.Add(new CustomAxisLabel(y, display_y_head_loss));
display_y_head_loss = display_y_head_loss + _coordinate.QL.CoordSpaceY;
}
@@ -470,7 +471,8 @@
var display_x_opening = _coordinate.OL.CoordMinX;
for (int i = 0; i < _coordinate.OL.GridNumberX + 1; i++)
{
- axis_x_opening_labels.Add(new CustomAxisLabel(display_x_opening.ToString("N0"), display_x_opening));
+ var x = _coordinate.OL.CoordSpaceX < 1 ? $"{display_x_opening:N1}" : $"{display_x_opening:N0}";
+ axis_x_opening_labels.Add(new CustomAxisLabel(x, display_x_opening));
display_x_opening = display_x_opening + _coordinate.OL.CoordSpaceX;
}
@@ -484,7 +486,7 @@
var display_y_k_loss = _coordinate.OL.CoordMinY + _coordinate.OL.CoordSpaceY * _coordinate.OL.StartLineNoY;
for (int i = _coordinate.OL.StartLineNoY; i < _coordinate.OL.EndLineNoY + 1; i++)
{
- var y = display_y_k_loss < 1 ? $"{display_y_k_loss:N1}" : $"{display_y_k_loss:N0}";
+ var y = _coordinate.OL.CoordSpaceY < 1 ? $"{display_y_k_loss:N1}" : $"{display_y_k_loss:N0}";
axis_y_k_loss_labels.Add(new CustomAxisLabel(y, display_y_k_loss));
display_y_k_loss = display_y_k_loss + _coordinate.OL.CoordSpaceY;
}
--
Gitblit v1.9.3