From 04ef5d66b53eff9175c2cb6dafda8b65872b9f52 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 15 一月 2025 22:52:27 +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-view/PumpViewChart.cs | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-view/PumpViewChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-view/PumpViewChart.cs
index 222759f..feb1a9d 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-view/PumpViewChart.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-view/PumpViewChart.cs
@@ -63,6 +63,7 @@
_line_visible = value;
_const_line_x.Visible = value;
_const_line_y.Visible = value;
+ _anno_txt_query_info.Visible = value;
SetAxisXValue();
}
}
@@ -94,7 +95,10 @@
{
this.chartControl1.SetChartDisplay();
this.chartControl1.RuntimeHitTesting = true;
- this.chartControl1.AnimationStartMode = ChartAnimationMode.OnLoad;
+ //this.chartControl1.AnimationStartMode = ChartAnimationMode.OnLoad;
+ //this.chartControl1.SeriesSelectionMode = SeriesSelectionMode.Series;
+ //this.chartControl1.SelectionMode = ElementSelectionMode.Single;
+
this.chartControl1.ObjectHotTracked += new DevExpress.XtraCharts.HotTrackEventHandler(this.chartControl1_ObjectHotTracked);
this.chartControl1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chartControl1_MouseMove);
this.chartControl1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.chartControl1_MouseUp);
@@ -117,6 +121,7 @@
_axis_y_power = _diagram.SecondaryAxesY.GetAxisByName("AxisYPower");
_axis_y_power.SetSecondaryAxisYQPDisplay();
+
_const_line_x = (ConstantLine)_diagram.AxisX.ConstantLines.GetElementByName("ConstantLineX");
_const_line_x.SetWorkPointLineDisplay();
@@ -133,8 +138,14 @@
_axis_y_power.GridLines.Visible = false;
_const_line_x.Visible = false;
- _const_line_y.Visible = false;
+ _const_line_y.Visible = false;
+
+ _anno_txt_query_info = this.chartControl1.AnnotationRepository[0] as TextAnnotation;
+ _anno_txt_query_info.SetTextAnnoWorkPointDisplay();
+ _anno_txt_query_info.Visible = false;
}
+
+
/// <summary>
/// 鍒濆鍖栧潗鏍囪酱
@@ -257,8 +268,13 @@
private void chartControl1_Resize(object sender, EventArgs e)
{
+ var x = this.chartControl1.Location.X + this.chartControl1.Width;
+ var y = this.chartControl1.Location.Y + 100;
+ (_anno_txt_query_info.AnchorPoint as ChartAnchorPoint).X = x;
+ (_anno_txt_query_info.AnchorPoint as ChartAnchorPoint).Y = y;
}
+
private void ChartControl1_CustomPaint(object sender, CustomPaintEventArgs e)
{
@@ -901,6 +917,7 @@
_const_line_x.Title.Visible = false;
_const_line_y.Visible = false;
_const_line_y.Title.Visible = false;
+ _anno_txt_query_info.Visible = false;
return;
}
else
@@ -909,6 +926,7 @@
_const_line_x.Title.Visible = true;
_const_line_y.Visible = true;
_const_line_y.Title.Visible = true;
+ _anno_txt_query_info.Visible = true;
}
if (this.IsInvalidData())
return;
@@ -937,6 +955,15 @@
_const_line_y.AxisValue = y_value;
_const_line_y.Title.Text = $"{y_value:N1}";
+
+ var query_info_builder = new StringBuilder();
+ query_info_builder.AppendLine($"{x_value:N2} m鲁/h ");
+ query_info_builder.AppendLine($"{y_value:N2} m");
+
+ _anno_txt_query_info.Text = query_info_builder.ToString();
+ _anno_txt_query_info.AutoSize = true;
+ _anno_txt_query_info.Visible = true;
+
}
/// <summary>
--
Gitblit v1.9.3