From a5f3c47ee959183e3059fc6672b4b07f99eb9c1a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 06 十一月 2024 15:28:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs | 127 +++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 52 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs
index 59424e3..ce5740c 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs
@@ -30,15 +30,13 @@
{
components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(XhsPumpMainPhartPanel));
- xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.XtrPerform2dChart();
+ xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.PumpPerformChart();
sidePanel2 = new SidePanel();
xhsPumpMainPhartListCtrl1 = new XhsPumpMainPhartListCtrl();
sidePanel1 = new SidePanel();
tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
tabNavigationPage1 = new DevExpress.XtraBars.Navigation.TabNavigationPage();
- simpleButton2 = new SimpleButton();
- tabNavigationPage2 = new DevExpress.XtraBars.Navigation.TabNavigationPage();
- simpleButton3 = new SimpleButton();
+ pumpPerformInfoCtrl1 = new Yw.WinFrmUI.Phart.PumpPerformInfoCtrl();
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
BtnAdd = new DevExpress.XtraBars.BarButtonItem();
BtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -54,18 +52,21 @@
barBtnAddText = new DevExpress.XtraBars.BarButtonItem();
barBtnUpdateimportance = new DevExpress.XtraBars.BarButtonItem();
barBtnOtherName = new DevExpress.XtraBars.BarButtonItem();
+ barBtnEditChart = new DevExpress.XtraBars.BarButtonItem();
+ barBtnImportByOnePoint = new DevExpress.XtraBars.BarButtonItem();
+ barBtnVariableSpeed = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ barBtnCopyAndExpand = new DevExpress.XtraBars.BarButtonItem();
sidePanel2.SuspendLayout();
sidePanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
tabNavigationPage1.SuspendLayout();
- tabNavigationPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
@@ -78,8 +79,9 @@
xtrPerform2dChart1.Dock = DockStyle.Fill;
xtrPerform2dChart1.LineVisible = false;
xtrPerform2dChart1.Location = new Point(235, 148);
+ xtrPerform2dChart1.Margin = new Padding(1, 2, 1, 2);
xtrPerform2dChart1.Name = "xtrPerform2dChart1";
- xtrPerform2dChart1.Size = new Size(553, 656);
+ xtrPerform2dChart1.Size = new Size(325, 657);
xtrPerform2dChart1.TabIndex = 1;
//
// sidePanel2
@@ -88,7 +90,7 @@
sidePanel2.Dock = DockStyle.Fill;
sidePanel2.Location = new Point(0, 0);
sidePanel2.Name = "sidePanel2";
- sidePanel2.Size = new Size(234, 622);
+ sidePanel2.Size = new Size(234, 623);
sidePanel2.TabIndex = 4;
sidePanel2.Text = "sidePanel2";
//
@@ -98,76 +100,59 @@
xhsPumpMainPhartListCtrl1.Appearance.Options.UseBackColor = true;
xhsPumpMainPhartListCtrl1.Dock = DockStyle.Fill;
xhsPumpMainPhartListCtrl1.Location = new Point(0, 0);
- xhsPumpMainPhartListCtrl1.Margin = new Padding(4, 5, 4, 5);
+ xhsPumpMainPhartListCtrl1.Margin = new Padding(6, 8, 6, 8);
xhsPumpMainPhartListCtrl1.Name = "xhsPumpMainPhartListCtrl1";
- xhsPumpMainPhartListCtrl1.Size = new Size(234, 622);
+ xhsPumpMainPhartListCtrl1.Size = new Size(234, 623);
xhsPumpMainPhartListCtrl1.TabIndex = 0;
//
// sidePanel1
//
sidePanel1.Controls.Add(tabPane1);
sidePanel1.Dock = DockStyle.Right;
- sidePanel1.Location = new Point(788, 148);
+ sidePanel1.Location = new Point(560, 148);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(272, 656);
+ sidePanel1.Size = new Size(500, 657);
sidePanel1.TabIndex = 3;
sidePanel1.Text = "sidePanel1";
//
// tabPane1
//
tabPane1.Controls.Add(tabNavigationPage1);
- tabPane1.Controls.Add(tabNavigationPage2);
- tabPane1.Dock = DockStyle.Top;
- tabPane1.Location = new Point(0, 0);
+ tabPane1.Dock = DockStyle.Fill;
+ tabPane1.Location = new Point(1, 0);
tabPane1.Name = "tabPane1";
- tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabNavigationPage1, tabNavigationPage2 });
- tabPane1.RegularSize = new Size(272, 656);
+ tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabNavigationPage1 });
+ tabPane1.RegularSize = new Size(499, 657);
tabPane1.SelectedPage = tabNavigationPage1;
- tabPane1.Size = new Size(272, 656);
+ tabPane1.Size = new Size(499, 657);
tabPane1.TabIndex = 0;
tabPane1.Text = "tabPane1";
//
// tabNavigationPage1
//
tabNavigationPage1.Caption = "杩愯鍙傛暟";
- tabNavigationPage1.Controls.Add(simpleButton2);
+ tabNavigationPage1.Controls.Add(pumpPerformInfoCtrl1);
tabNavigationPage1.Name = "tabNavigationPage1";
- tabNavigationPage1.Size = new Size(272, 607);
+ tabNavigationPage1.Size = new Size(499, 608);
//
- // simpleButton2
+ // pumpPerformInfoCtrl1
//
- simpleButton2.Dock = DockStyle.Fill;
- simpleButton2.Location = new Point(0, 0);
- simpleButton2.Name = "simpleButton2";
- simpleButton2.Size = new Size(272, 607);
- simpleButton2.TabIndex = 0;
- simpleButton2.Text = "寰呰ˉ鍏�";
- //
- // tabNavigationPage2
- //
- tabNavigationPage2.Caption = "灞炴��";
- tabNavigationPage2.Controls.Add(simpleButton3);
- tabNavigationPage2.Name = "tabNavigationPage2";
- tabNavigationPage2.Size = new Size(271, 607);
- //
- // simpleButton3
- //
- simpleButton3.Dock = DockStyle.Fill;
- simpleButton3.Location = new Point(0, 0);
- simpleButton3.Name = "simpleButton3";
- simpleButton3.Size = new Size(271, 607);
- simpleButton3.TabIndex = 0;
- simpleButton3.Text = "寰呰ˉ鍏�";
+ pumpPerformInfoCtrl1.Dock = DockStyle.Fill;
+ pumpPerformInfoCtrl1.Location = new Point(0, 0);
+ pumpPerformInfoCtrl1.Margin = new Padding(1, 2, 1, 2);
+ pumpPerformInfoCtrl1.Name = "pumpPerformInfoCtrl1";
+ pumpPerformInfoCtrl1.Size = new Size(499, 608);
+ pumpPerformInfoCtrl1.TabIndex = 0;
//
// ribbonControl1
//
ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, barBtnEditPumpCurve, BarBtnEidtPumpPart, barCheckItem1, barBtnImportByExcel, barBtnImportByPicture, barButtonItem3, barButtonItem4, barBtnDelete, barBtnAddText, barBtnUpdateimportance, barBtnOtherName });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, barBtnEditPumpCurve, BarBtnEidtPumpPart, barCheckItem1, barBtnImportByExcel, barBtnImportByPicture, barButtonItem3, barButtonItem4, barBtnDelete, barBtnAddText, barBtnUpdateimportance, barBtnOtherName, barBtnEditChart, barBtnImportByOnePoint, barBtnVariableSpeed, barBtnCopyAndExpand });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.Margin = new Padding(4, 5, 4, 5);
- ribbonControl1.MaxItemId = 31;
+ ribbonControl1.MaxItemId = 35;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.OptionsMenuMinWidth = 471;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
@@ -276,6 +261,30 @@
barBtnOtherName.Name = "barBtnOtherName";
barBtnOtherName.ItemClick += barBtnOtherName_ItemClick;
//
+ // barBtnEditChart
+ //
+ barBtnEditChart.Caption = "缂栬緫";
+ barBtnEditChart.Id = 31;
+ barBtnEditChart.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditChart.ImageOptions.SvgImage");
+ barBtnEditChart.Name = "barBtnEditChart";
+ barBtnEditChart.ItemClick += barBtnEditChart_ItemClick;
+ //
+ // barBtnImportByOnePoint
+ //
+ barBtnImportByOnePoint.Caption = "鍗曠偣";
+ barBtnImportByOnePoint.Id = 32;
+ barBtnImportByOnePoint.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnImportByOnePoint.ImageOptions.SvgImage");
+ barBtnImportByOnePoint.Name = "barBtnImportByOnePoint";
+ barBtnImportByOnePoint.ItemClick += barBtnImportByOnePoint_ItemClick;
+ //
+ // barBtnVariableSpeed
+ //
+ barBtnVariableSpeed.Caption = "鍙橀��";
+ barBtnVariableSpeed.Id = 33;
+ barBtnVariableSpeed.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnVariableSpeed.ImageOptions.SvgImage");
+ barBtnVariableSpeed.Name = "barBtnVariableSpeed";
+ barBtnVariableSpeed.ItemClick += barBtnVariableSpeed_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 });
@@ -286,13 +295,17 @@
//
ribbonPageGroup1.ItemLinks.Add(barBtnImportByExcel, true);
ribbonPageGroup1.ItemLinks.Add(barBtnImportByPicture);
+ ribbonPageGroup1.ItemLinks.Add(barBtnImportByOnePoint);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "瀵煎叆";
//
// ribbonPageGroup2
//
+ ribbonPageGroup2.ItemLinks.Add(barBtnEditChart);
ribbonPageGroup2.ItemLinks.Add(barBtnOtherName);
ribbonPageGroup2.ItemLinks.Add(barBtnUpdateimportance);
+ ribbonPageGroup2.ItemLinks.Add(barBtnCopyAndExpand, true);
+ ribbonPageGroup2.ItemLinks.Add(barBtnVariableSpeed);
ribbonPageGroup2.ItemLinks.Add(barBtnDelete, true);
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "鎿嶄綔";
@@ -313,7 +326,7 @@
dockPanel1.Location = new Point(0, 148);
dockPanel1.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(235, 200);
- dockPanel1.Size = new Size(235, 656);
+ dockPanel1.Size = new Size(235, 657);
dockPanel1.Text = "鏇茬嚎鍒楄〃";
//
// dockPanel1_Container
@@ -321,8 +334,17 @@
dockPanel1_Container.Controls.Add(sidePanel2);
dockPanel1_Container.Location = new Point(0, 34);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(234, 622);
+ dockPanel1_Container.Size = new Size(234, 623);
dockPanel1_Container.TabIndex = 0;
+ //
+ // barBtnCopyAndExpand
+ //
+ barBtnCopyAndExpand.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True;
+ barBtnCopyAndExpand.Caption = "澶嶅埗-寤堕暱";
+ barBtnCopyAndExpand.Id = 34;
+ barBtnCopyAndExpand.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExpandAndSave.ImageOptions.SvgImage");
+ barBtnCopyAndExpand.Name = "barBtnCopyAndExpand";
+ barBtnCopyAndExpand.ItemClick += barBtnCopyAndExpand_ItemClick;
//
// XhsPumpMainPhartPanel
//
@@ -336,13 +358,12 @@
Controls.Add(ribbonControl1);
Margin = new Padding(6, 8, 6, 8);
Name = "XhsPumpMainPhartPanel";
- Size = new Size(1060, 804);
+ Size = new Size(1060, 805);
sidePanel2.ResumeLayout(false);
sidePanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
tabNavigationPage1.ResumeLayout(false);
- tabNavigationPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
dockPanel1.ResumeLayout(false);
@@ -352,13 +373,10 @@
}
#endregion
- private Yw.WinFrmUI.Phart.XtrPerform2dChart xtrPerform2dChart1;
+ private Yw.WinFrmUI.Phart.PumpPerformChart xtrPerform2dChart1;
private DevExpress.XtraEditors.SidePanel sidePanel1;
private DevExpress.XtraBars.Navigation.TabPane tabPane1;
private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage1;
- private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage2;
- private DevExpress.XtraEditors.SimpleButton simpleButton2;
- private DevExpress.XtraEditors.SimpleButton simpleButton3;
private DevExpress.XtraEditors.SidePanel sidePanel2;
private XhsPumpMainPhartListCtrl xhsPumpMainPhartListCtrl1;
private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
@@ -382,5 +400,10 @@
private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
private DevExpress.XtraBars.BarButtonItem barBtnUpdateimportance;
private DevExpress.XtraBars.BarButtonItem barBtnOtherName;
+ private DevExpress.XtraBars.BarButtonItem barBtnEditChart;
+ private DevExpress.XtraBars.BarButtonItem barBtnImportByOnePoint;
+ private DevExpress.XtraBars.BarButtonItem barBtnVariableSpeed;
+ private Yw.WinFrmUI.Phart.PumpPerformInfoCtrl pumpPerformInfoCtrl1;
+ private DevExpress.XtraBars.BarButtonItem barBtnCopyAndExpand;
}
}
--
Gitblit v1.9.3