From 294b81166f21e12247e784d6bf404f5f34b2ee19 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 19 二月 2025 12:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs | 44 +++++++++-----------------------------------
1 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs
index 27a2a08..7f09695 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs
@@ -45,26 +45,22 @@
colQ = new DevExpress.XtraGrid.Columns.GridColumn();
colL = new DevExpress.XtraGrid.Columns.GridColumn();
btnExcelFilePath = new DevExpress.XtraEditors.ButtonEdit();
- txtCurveCode = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
sidePanel1 = new DevExpress.XtraEditors.SidePanel();
- xtrPerform2dChart1 = new ValvePerform2dChart();
+ xtrPerform2dChart1 = new ValveViewChart();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)bindingSource1).BeginInit();
((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
((System.ComponentModel.ISupportInitialize)btnExcelFilePath.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)txtCurveCode.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
sidePanel1.SuspendLayout();
@@ -74,7 +70,6 @@
//
layoutControl1.Controls.Add(gridControl1);
layoutControl1.Controls.Add(btnExcelFilePath);
- layoutControl1.Controls.Add(txtCurveCode);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -87,10 +82,10 @@
// gridControl1
//
gridControl1.DataSource = bindingSource1;
- gridControl1.Location = new Point(0, 114);
+ gridControl1.Location = new Point(0, 90);
gridControl1.MainView = gridView1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(425, 546);
+ gridControl1.Size = new Size(425, 570);
gridControl1.TabIndex = 9;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -143,14 +138,6 @@
btnExcelFilePath.TabIndex = 18;
btnExcelFilePath.ButtonClick += btnExcelFilePath_ButtonClick;
//
- // txtCurveCode
- //
- txtCurveCode.Location = new Point(56, 60);
- txtCurveCode.Name = "txtCurveCode";
- txtCurveCode.Size = new Size(357, 20);
- txtCurveCode.StyleController = layoutControl1;
- txtCurveCode.TabIndex = 19;
- //
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -164,10 +151,10 @@
// layoutControlGroup1
//
layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6, layoutControlItem7 });
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(425, 92);
+ layoutControlGroup1.Size = new Size(425, 68);
layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup1.Text = "鏇茬嚎淇℃伅";
//
@@ -180,23 +167,14 @@
layoutControlItem6.Text = "Excel:";
layoutControlItem6.TextSize = new Size(32, 14);
//
- // layoutControlItem7
- //
- layoutControlItem7.Control = txtCurveCode;
- layoutControlItem7.Location = new Point(0, 26);
- layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(405, 24);
- layoutControlItem7.Text = "鍚嶇О:";
- layoutControlItem7.TextSize = new Size(32, 14);
- //
// layoutControlGroup2
//
layoutControlGroup2.GroupStyle = DevExpress.Utils.GroupStyle.Title;
layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3 });
- layoutControlGroup2.Location = new Point(0, 92);
+ layoutControlGroup2.Location = new Point(0, 68);
layoutControlGroup2.Name = "layoutControlGroup2";
layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup2.Size = new Size(425, 568);
+ layoutControlGroup2.Size = new Size(425, 592);
layoutControlGroup2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup2.Text = "鏇茬嚎瀹氫箟鐐�";
//
@@ -206,7 +184,7 @@
layoutControlItem3.Location = new Point(0, 0);
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem3.Size = new Size(425, 546);
+ layoutControlItem3.Size = new Size(425, 570);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
@@ -246,11 +224,9 @@
((System.ComponentModel.ISupportInitialize)bindingSource1).EndInit();
((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
((System.ComponentModel.ISupportInitialize)btnExcelFilePath.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)txtCurveCode.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
sidePanel1.ResumeLayout(false);
@@ -269,11 +245,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraEditors.ButtonEdit btnExcelFilePath;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraEditors.TextEdit txtCurveCode;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
private DevExpress.XtraEditors.SidePanel sidePanel1;
- private ValvePerform2dChart xtrPerform2dChart1;
+ private ValveViewChart xtrPerform2dChart1;
}
}
--
Gitblit v1.9.3