From be1dcb30e552fff6a2cf733d6577b103665edded Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期三, 11 十二月 2024 17:31:32 +0800 Subject: [PATCH] 增加能耗分析图片 --- WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs | 172 ++++++++++++++++++++++----------------------------------- 1 files changed, 66 insertions(+), 106 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 1742106..e7a9a3f 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,9 @@ { 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.PumpViewChart(); 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(); ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl(); BtnAdd = new DevExpress.XtraBars.BarButtonItem(); BtnEdit = new DevExpress.XtraBars.BarButtonItem(); @@ -54,6 +48,10 @@ 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(); + barBtnCopyAndExpand = new DevExpress.XtraBars.BarButtonItem(); ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); @@ -61,11 +59,6 @@ dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel(); dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer(); 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(); @@ -77,10 +70,10 @@ xtrPerform2dChart1.DefinePointVisible = false; xtrPerform2dChart1.Dock = DockStyle.Fill; xtrPerform2dChart1.LineVisible = false; - xtrPerform2dChart1.Location = new Point(164, 101); - xtrPerform2dChart1.Margin = new Padding(1, 1, 1, 1); + xtrPerform2dChart1.Location = new Point(235, 148); + xtrPerform2dChart1.Margin = new Padding(1, 2, 1, 2); xtrPerform2dChart1.Name = "xtrPerform2dChart1"; - xtrPerform2dChart1.Size = new Size(388, 411); + xtrPerform2dChart1.Size = new Size(825, 657); xtrPerform2dChart1.TabIndex = 1; // // sidePanel2 @@ -88,9 +81,8 @@ sidePanel2.Controls.Add(xhsPumpMainPhartListCtrl1); sidePanel2.Dock = DockStyle.Fill; sidePanel2.Location = new Point(0, 0); - sidePanel2.Margin = new Padding(2, 2, 2, 2); sidePanel2.Name = "sidePanel2"; - sidePanel2.Size = new Size(163, 388); + sidePanel2.Size = new Size(234, 623); sidePanel2.TabIndex = 4; sidePanel2.Text = "sidePanel2"; // @@ -100,87 +92,28 @@ 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(163, 388); + xhsPumpMainPhartListCtrl1.Size = new Size(234, 623); xhsPumpMainPhartListCtrl1.TabIndex = 0; - // - // sidePanel1 - // - sidePanel1.Controls.Add(tabPane1); - sidePanel1.Dock = DockStyle.Right; - sidePanel1.Location = new Point(552, 101); - sidePanel1.Margin = new Padding(2, 2, 2, 2); - sidePanel1.Name = "sidePanel1"; - sidePanel1.Size = new Size(190, 411); - sidePanel1.TabIndex = 3; - sidePanel1.Text = "sidePanel1"; - // - // tabPane1 - // - tabPane1.Controls.Add(tabNavigationPage1); - tabPane1.Controls.Add(tabNavigationPage2); - tabPane1.Dock = DockStyle.Top; - tabPane1.Location = new Point(1, 0); - tabPane1.Margin = new Padding(2, 2, 2, 2); - tabPane1.Name = "tabPane1"; - tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabNavigationPage1, tabNavigationPage2 }); - tabPane1.RegularSize = new Size(189, 417); - tabPane1.SelectedPage = tabNavigationPage1; - tabPane1.Size = new Size(189, 417); - tabPane1.TabIndex = 0; - tabPane1.Text = "tabPane1"; - // - // tabNavigationPage1 - // - tabNavigationPage1.Caption = "杩愯鍙傛暟"; - tabNavigationPage1.Controls.Add(simpleButton2); - tabNavigationPage1.Margin = new Padding(2, 2, 2, 2); - tabNavigationPage1.Name = "tabNavigationPage1"; - tabNavigationPage1.Size = new Size(189, 384); - // - // simpleButton2 - // - simpleButton2.Dock = DockStyle.Fill; - simpleButton2.Location = new Point(0, 0); - simpleButton2.Margin = new Padding(2, 2, 2, 2); - simpleButton2.Name = "simpleButton2"; - simpleButton2.Size = new Size(189, 384); - simpleButton2.TabIndex = 0; - simpleButton2.Text = "寰呰ˉ鍏�"; - // - // tabNavigationPage2 - // - tabNavigationPage2.Caption = "灞炴��"; - tabNavigationPage2.Controls.Add(simpleButton3); - tabNavigationPage2.Margin = new Padding(2, 2, 2, 2); - tabNavigationPage2.Name = "tabNavigationPage2"; - tabNavigationPage2.Size = new Size(190, 386); - // - // simpleButton3 - // - simpleButton3.Dock = DockStyle.Fill; - simpleButton3.Location = new Point(0, 0); - simpleButton3.Margin = new Padding(2, 2, 2, 2); - simpleButton3.Name = "simpleButton3"; - simpleButton3.Size = new Size(190, 386); - simpleButton3.TabIndex = 0; - simpleButton3.Text = "寰呰ˉ鍏�"; // // 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.MaxItemId = 31; + ribbonControl1.Margin = new Padding(4, 5, 4, 5); + ribbonControl1.MaxItemId = 35; ribbonControl1.Name = "ribbonControl1"; + ribbonControl1.OptionsMenuMinWidth = 471; ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 }); ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide; - ribbonControl1.Size = new Size(742, 101); + ribbonControl1.Size = new Size(1060, 148); ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; // // BtnAdd @@ -281,6 +214,39 @@ 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; + // + // barBtnCopyAndExpand + // + barBtnCopyAndExpand.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True; + barBtnCopyAndExpand.Caption = "澶嶅埗-寤堕暱"; + barBtnCopyAndExpand.Id = 34; + barBtnCopyAndExpand.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCopyAndExpand.ImageOptions.SvgImage"); + barBtnCopyAndExpand.Name = "barBtnCopyAndExpand"; + barBtnCopyAndExpand.ItemClick += barBtnCopyAndExpand_ItemClick; + // // ribbonPage1 // ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 }); @@ -291,13 +257,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 = "鎿嶄綔"; @@ -315,41 +285,33 @@ dockPanel1.Controls.Add(dockPanel1_Container); dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left; dockPanel1.ID = new Guid("202c2203-fb3a-4b47-a9cb-083c698bd2ac"); - dockPanel1.Location = new Point(0, 101); - dockPanel1.Margin = new Padding(2, 2, 2, 2); + dockPanel1.Location = new Point(0, 148); dockPanel1.Name = "dockPanel1"; dockPanel1.OriginalSize = new Size(235, 200); - dockPanel1.Size = new Size(164, 411); + dockPanel1.Size = new Size(235, 657); dockPanel1.Text = "鏇茬嚎鍒楄〃"; // // dockPanel1_Container // dockPanel1_Container.Controls.Add(sidePanel2); - dockPanel1_Container.Location = new Point(0, 23); - dockPanel1_Container.Margin = new Padding(2, 2, 2, 2); + dockPanel1_Container.Location = new Point(0, 34); dockPanel1_Container.Name = "dockPanel1_Container"; - dockPanel1_Container.Size = new Size(163, 388); + dockPanel1_Container.Size = new Size(234, 623); dockPanel1_Container.TabIndex = 0; // // XhsPumpMainPhartPanel // Appearance.BackColor = SystemColors.Control; Appearance.Options.UseBackColor = true; - AutoScaleDimensions = new SizeF(7F, 14F); + AutoScaleDimensions = new SizeF(10F, 22F); AutoScaleMode = AutoScaleMode.Font; Controls.Add(xtrPerform2dChart1); - Controls.Add(sidePanel1); Controls.Add(dockPanel1); Controls.Add(ribbonControl1); - Margin = new Padding(4, 5, 4, 5); + Margin = new Padding(6, 8, 6, 8); Name = "XhsPumpMainPhartPanel"; - Size = new Size(742, 512); + 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); @@ -359,13 +321,7 @@ } #endregion - private Yw.WinFrmUI.Phart.XtrPerform2dChart 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 Yw.WinFrmUI.Phart.PumpViewChart xtrPerform2dChart1; private DevExpress.XtraEditors.SidePanel sidePanel2; private XhsPumpMainPhartListCtrl xhsPumpMainPhartListCtrl1; private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1; @@ -389,5 +345,9 @@ 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 DevExpress.XtraBars.BarButtonItem barBtnCopyAndExpand; } } -- Gitblit v1.9.3