From 5f41b0bc190c8f7ba9b4f6d015b48b2a6039b7f8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 19 十二月 2024 16:43:39 +0800
Subject: [PATCH] 入参
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs
index 69d7170..1cdf644 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs
@@ -128,11 +128,9 @@
//璁剧疆鎴愮櫧鏉垮潗鏍�
_coordinate = new UniversalCoordinate();
_coordinate.GridNumberX = 30;
- _coordinate.GridNumberY = 16;
- //鏄剧ず鐨勫潗鏍囩嚎鍙�
+ _coordinate.GridNumberY = 16;
_coordinate.StartLineNoY = 10;
- _coordinate.EndLineNoY = 15;
- //鍧愭爣鏈�灏忓�煎拰闂撮殧
+ _coordinate.EndLineNoY = 15;
_coordinate.CoordMinX = 0; _coordinate.CoordSpaceX = 1000;
_coordinate.CoordMinY = 10; _coordinate.CoordSpaceY = 100;
}
@@ -226,7 +224,9 @@
/// </summary>
public void SetBindingData(List<Yw.Geometry.Point2d> pt_list, string caption = "", string coordinate = null, Color? color = null)
{
- _pt_list = pt_list;
+ _pt_list = pt_list;
+ _coordinate = UniversalCoordinate.ToModel(coordinate);
+
this.chartControl1.BeginInit();
this.chartControl1.Series.Clear();
this.chartControl1.AnnotationRepository.Clear();
@@ -241,27 +241,33 @@
if (color == null)
color = PumpChartDisplay.CurveColorQH;
- AddLineSeries(caption, color.Value, _axis_x, _axis_y, _default_pane, pt_list);
+ AddLineSeries( color.Value, _axis_x, _axis_y, _default_pane, pt_list);
if (!string.IsNullOrEmpty(caption))
{
- AddAnnotation(caption, caption, color.Value, _axis_y, _default_pane, pt_list.Last());
+ AddAnnotation( caption, color.Value, _axis_y, _default_pane, pt_list.Last());
}
- _coordinate = UniversalCoordinate.ToModel(coordinate);
if (_coordinate == null)
- {
SetCoordinate();
- }
SetChartAxis();
this.chartControl1.EndInit();
_initial_data = true;
}
+ //鏄惁鏄棤鏁堟暟鎹�
+ private bool IsInvalidData()
+ {
+ if (_pt_list == null || !_pt_list.Any())
+ {
+ return true;
+ }
+ return false;
+ }
#region Add Chart Data
- private void AddPointSeries(string id, Color color, AxisXBase axis_x, AxisYBase axis_y, XYDiagramPaneBase pane, List<Yw.Geometry.Point2d> pt_list)
+ private void AddPointSeries( Color color, AxisXBase axis_x, AxisYBase axis_y, XYDiagramPaneBase pane, List<Yw.Geometry.Point2d> pt_list)
{
if (pt_list == null || !pt_list.Any())
return;
@@ -277,8 +283,7 @@
view.Pane = pane;
var series_pt_list = pt_list.Select(x => x.ToSeriesPoint()).ToArray();
- var series = new DevExpress.XtraCharts.Series();
- series.Tag = id;
+ var series = new DevExpress.XtraCharts.Series();
series.ShowInLegend = false;
series.ArgumentScaleType = DevExpress.XtraCharts.ScaleType.Numerical;
series.LabelsVisibility = DevExpress.Utils.DefaultBoolean.False;
@@ -293,7 +298,7 @@
this.chartControl1.Series.Add(series);
}
- private void AddLineSeries(string id, Color color, AxisXBase axis_x, AxisYBase axis_y, XYDiagramPaneBase pane, List<Yw.Geometry.Point2d> pt_list, DashStyle dash = DashStyle.Solid)
+ private void AddLineSeries( Color color, AxisXBase axis_x, AxisYBase axis_y, XYDiagramPaneBase pane, List<Yw.Geometry.Point2d> pt_list, DashStyle dash = DashStyle.Solid)
{
if (pt_list == null || !pt_list.Any())
return;
@@ -311,8 +316,7 @@
view.Pane = pane;
var series_pt_list = pt_list.Select(x => x.ToSeriesPoint()).ToArray();
- var series = new DevExpress.XtraCharts.Series();
- series.Tag = id;
+ var series = new DevExpress.XtraCharts.Series();
series.ShowInLegend = false;
series.ArgumentScaleType = DevExpress.XtraCharts.ScaleType.Numerical;
series.LabelsVisibility = DevExpress.Utils.DefaultBoolean.False;
@@ -326,7 +330,7 @@
this.chartControl1.Series.Add(series);
}
- private void AddAnnotation(string id, string caption, Color color, AxisYBase axis_y, XYDiagramPaneBase pane, Yw.Geometry.Point2d pt, double angle = -10)
+ private void AddAnnotation(string caption, Color color, AxisYBase axis_y, XYDiagramPaneBase pane, Yw.Geometry.Point2d pt, double angle = -10)
{
if (pt == null)
return;
@@ -348,8 +352,7 @@
text_annotation.AutoWidth = true;
text_annotation.BackColor = System.Drawing.Color.Transparent;
text_annotation.Border.Color = color;
- text_annotation.ConnectorStyle = DevExpress.XtraCharts.AnnotationConnectorStyle.Line;
- text_annotation.Tag = id;
+ text_annotation.ConnectorStyle = DevExpress.XtraCharts.AnnotationConnectorStyle.Line;
text_annotation.Padding.Bottom = 1;
text_annotation.Padding.Left = 1;
text_annotation.Padding.Right = 1;
@@ -379,9 +382,8 @@
/// 璁剧疆鍧愭爣
/// </summary>
private void SetCoordinate()
- {
-
- if (_pt_list == null || !_pt_list.Any())
+ {
+ if (IsInvalidData())
{
InitialCoordinate();
return;
@@ -407,7 +409,7 @@
/// </summary>
private void SetChartAxis()
{
- if (_coordinate == null)
+ if (_coordinate == null || IsInvalidData())
{
_axis_x.Visibility = DefaultBoolean.False;
_axis_x.GridLines.Visible = false;
@@ -478,7 +480,7 @@
_const_line_y.Visible = true;
_const_line_y.Title.Visible = true;
}
- if (_pt_list == null || !_pt_list.Any())
+ if (this.IsInvalidData())
return;
var min_x = _pt_list.Min(x => x.X);
@@ -512,7 +514,7 @@
{
if (!_line_visible)
return;
- if (_pt_list == null || !_pt_list.Any())
+ if (IsInvalidData())
return;
var min_y = _pt_list.Min(x => x.Y);
--
Gitblit v1.9.3