From 57051b41eb245cd3dc68ed9167f492df5de9d04c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 九月 2024 15:35:59 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/06-curve/HydroCurveViewCtrl.Designer.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/06-curve/HydroCurveViewCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/06-curve/HydroCurveViewCtrl.Designer.cs
index eeaa282..7f31309 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/06-curve/HydroCurveViewCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/06-curve/HydroCurveViewCtrl.Designer.cs
@@ -28,18 +28,22 @@
/// </summary>
private void InitializeComponent()
{
+ components = new Container();
DevExpress.XtraCharts.XYDiagram xyDiagram1 = new DevExpress.XtraCharts.XYDiagram();
DevExpress.XtraCharts.Series series1 = new DevExpress.XtraCharts.Series();
DevExpress.XtraCharts.SplineSeriesView splineSeriesView1 = new DevExpress.XtraCharts.SplineSeriesView();
chartControl1 = new DevExpress.XtraCharts.ChartControl();
+ hydroCurvePointViewModelBindingSource = new BindingSource(components);
((ISupportInitialize)chartControl1).BeginInit();
((ISupportInitialize)xyDiagram1).BeginInit();
((ISupportInitialize)series1).BeginInit();
((ISupportInitialize)splineSeriesView1).BeginInit();
+ ((ISupportInitialize)hydroCurvePointViewModelBindingSource).BeginInit();
SuspendLayout();
//
// chartControl1
//
+ chartControl1.DataSource = hydroCurvePointViewModelBindingSource;
xyDiagram1.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
xyDiagram1.AxisX.VisibleInPanesSerializable = "-1";
xyDiagram1.AxisY.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
@@ -50,8 +54,10 @@
chartControl1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.False;
chartControl1.Location = new Point(0, 0);
chartControl1.Name = "chartControl1";
- series1.Name = "SeriesPoint";
+ series1.ArgumentDataMember = "X";
+ series1.Name = "Series1";
series1.SeriesID = 2;
+ series1.ValueDataMembersSerializable = "Y";
series1.View = splineSeriesView1;
chartControl1.SeriesSerializable = new DevExpress.XtraCharts.Series[]
{
@@ -59,6 +65,10 @@
};
chartControl1.Size = new Size(749, 553);
chartControl1.TabIndex = 1;
+ //
+ // hydroCurvePointViewModelBindingSource
+ //
+ hydroCurvePointViewModelBindingSource.DataSource = typeof(HydroCurvePointViewModel);
//
// HydroCurveViewCtrl
//
@@ -71,11 +81,13 @@
((ISupportInitialize)splineSeriesView1).EndInit();
((ISupportInitialize)series1).EndInit();
((ISupportInitialize)chartControl1).EndInit();
+ ((ISupportInitialize)hydroCurvePointViewModelBindingSource).EndInit();
ResumeLayout(false);
}
#endregion
private DevExpress.XtraCharts.ChartControl chartControl1;
+ private BindingSource hydroCurvePointViewModelBindingSource;
}
}
--
Gitblit v1.9.3