From eb3ec7dfafe071de899112c918851db18bde6109 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期二, 10 十二月 2024 13:36:23 +0800 Subject: [PATCH] 核心界面优化 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.Designer.cs | 162 ++++++++++++++++++++++++----------------------------- 1 files changed, 74 insertions(+), 88 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.Designer.cs index d6d0d74..a376aa5 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.Designer.cs @@ -35,34 +35,33 @@ ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl(); barBtnExportInp = new DevExpress.XtraBars.BarButtonItem(); barBtnVisualList = new DevExpress.XtraBars.BarButtonItem(); - barBtnWorkingParallel = new DevExpress.XtraBars.BarButtonItem(); + barBtnPumpAnaly = new DevExpress.XtraBars.BarButtonItem(); barBtnSearch = new DevExpress.XtraBars.BarButtonItem(); - barBtnSetGradingList = new DevExpress.XtraBars.BarButtonItem(); barBtnApplyGradingList = new DevExpress.XtraBars.BarButtonItem(); barBtnSetMark = new DevExpress.XtraBars.BarButtonItem(); - barBtnSetMonitor = new DevExpress.XtraBars.BarButtonItem(); - barBtnSetMonitorValue = new DevExpress.XtraBars.BarButtonItem(); + barBtnShowMonitorValue = new DevExpress.XtraBars.BarButtonItem(); barCkMonitor = new DevExpress.XtraBars.BarCheckItem(); barCkMark = new DevExpress.XtraBars.BarCheckItem(); barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem(); barCkGrading = new DevExpress.XtraBars.BarCheckItem(); barCkCalcu = new DevExpress.XtraBars.BarCheckItem(); barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem(); - barBtnWorkingLossScale = new DevExpress.XtraBars.BarButtonItem(); + barBtnWorkingLossStatistics = new DevExpress.XtraBars.BarButtonItem(); barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem(); barBtnWorkingAnaly = new DevExpress.XtraBars.BarButtonItem(); - barBtnParallel = new DevExpress.XtraBars.BarButtonItem(); barBtnWorkingEvaluation = new DevExpress.XtraBars.BarButtonItem(); barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem(); barCkDecorator = new DevExpress.XtraBars.BarCheckItem(); + barBtnEdit = new DevExpress.XtraBars.BarButtonItem(); + barBtnDelete = new DevExpress.XtraBars.BarButtonItem(); ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); + ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); - ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); - ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup9 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); + ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); tabPane1 = new DevExpress.XtraBars.Navigation.TabPane(); tabPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage(); @@ -84,9 +83,9 @@ // ribbonControl1.ExpandCollapseItem.Id = 0; ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic; - ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnExportInp, barBtnVisualList, barBtnWorkingParallel, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnSetMark, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPower, barBtnWorkingAnaly, barBtnParallel, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator }); + ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnExportInp, barBtnVisualList, barBtnPumpAnaly, barBtnSearch, barBtnApplyGradingList, barBtnSetMark, barBtnShowMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnEdit, barBtnDelete }); ribbonControl1.Location = new Point(0, 0); - ribbonControl1.MaxItemId = 80; + ribbonControl1.MaxItemId = 82; ribbonControl1.Name = "ribbonControl1"; ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 }); ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; @@ -103,7 +102,6 @@ barBtnExportInp.Id = 4; barBtnExportInp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExportInp.ImageOptions.SvgImage"); barBtnExportInp.Name = "barBtnExportInp"; - barBtnExportInp.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; barBtnExportInp.ItemClick += barBtnExportInp_ItemClick; // // barBtnVisualList @@ -114,14 +112,15 @@ barBtnVisualList.Name = "barBtnVisualList"; barBtnVisualList.ItemClick += barBtnVisualList_ItemClick; // - // barBtnWorkingParallel + // barBtnPumpAnaly // - barBtnWorkingParallel.Caption = "骞惰仈鍒嗘瀽"; - barBtnWorkingParallel.Id = 31; - barBtnWorkingParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingParallel.ImageOptions.SvgImage"); - barBtnWorkingParallel.Name = "barBtnWorkingParallel"; - barBtnWorkingParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; - barBtnWorkingParallel.ItemClick += barBtnAnaly_ItemClick; + barBtnPumpAnaly.Caption = "姘存车鍒嗘瀽"; + barBtnPumpAnaly.Id = 31; + barBtnPumpAnaly.ImageOptions.Image = Xhs.Core.Properties.Resources.pump_run_32; + barBtnPumpAnaly.ImageOptions.LargeImage = Xhs.Core.Properties.Resources.pump_run_32; + barBtnPumpAnaly.Name = "barBtnPumpAnaly"; + barBtnPumpAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; + barBtnPumpAnaly.ItemClick += barBtnPumpAnaly_ItemClick; // // barBtnSearch // @@ -131,14 +130,6 @@ barBtnSearch.Name = "barBtnSearch"; barBtnSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; barBtnSearch.ItemClick += barBtnSearch_ItemClick; - // - // barBtnSetGradingList - // - barBtnSetGradingList.Caption = "閰嶇疆"; - barBtnSetGradingList.Id = 34; - barBtnSetGradingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetGradingList.ImageOptions.SvgImage"); - barBtnSetGradingList.Name = "barBtnSetGradingList"; - barBtnSetGradingList.ItemClick += barBtnSetGradingList_ItemClick; // // barBtnApplyGradingList // @@ -155,27 +146,16 @@ barBtnSetMark.Id = 40; barBtnSetMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMark.ImageOptions.SvgImage"); barBtnSetMark.Name = "barBtnSetMark"; - barBtnSetMark.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; barBtnSetMark.ItemClick += barBtnSetMark_ItemClick; // - // barBtnSetMonitor + // barBtnShowMonitorValue // - barBtnSetMonitor.Caption = "鐩戞祴鐐�"; - barBtnSetMonitor.Enabled = false; - barBtnSetMonitor.Id = 56; - barBtnSetMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitor.ImageOptions.SvgImage"); - barBtnSetMonitor.Name = "barBtnSetMonitor"; - barBtnSetMonitor.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; - barBtnSetMonitor.ItemClick += barBtnSetMonitor_ItemClick; - // - // barBtnSetMonitorValue - // - barBtnSetMonitorValue.Caption = "鐩戞祴鍊�"; - barBtnSetMonitorValue.Id = 57; - barBtnSetMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitorValue.ImageOptions.SvgImage"); - barBtnSetMonitorValue.Name = "barBtnSetMonitorValue"; - barBtnSetMonitorValue.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; - barBtnSetMonitorValue.ItemClick += barBtnSetMonitorValue_ItemClick; + barBtnShowMonitorValue.Caption = "鐩戞祴鍊�"; + barBtnShowMonitorValue.Id = 57; + barBtnShowMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnShowMonitorValue.ImageOptions.SvgImage"); + barBtnShowMonitorValue.Name = "barBtnShowMonitorValue"; + barBtnShowMonitorValue.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; + barBtnShowMonitorValue.ItemClick += barBtnShowMonitorValue_ItemClick; // // barCkMonitor // @@ -226,14 +206,14 @@ barBtnWorkingLossCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; barBtnWorkingLossCurve.ItemClick += barBtnWorkingLossCurve_ItemClick; // - // barBtnWorkingLossScale + // barBtnWorkingLossStatistics // - barBtnWorkingLossScale.Caption = "鎹熷け姣斾緥"; - barBtnWorkingLossScale.Id = 70; - barBtnWorkingLossScale.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossScale.ImageOptions.SvgImage"); - barBtnWorkingLossScale.Name = "barBtnWorkingLossScale"; - barBtnWorkingLossScale.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; - barBtnWorkingLossScale.ItemClick += barBtnWorkingLossScale_ItemClick; + barBtnWorkingLossStatistics.Caption = "鎹熷け姣斾緥"; + barBtnWorkingLossStatistics.Id = 70; + barBtnWorkingLossStatistics.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossStatistics.ImageOptions.SvgImage"); + barBtnWorkingLossStatistics.Name = "barBtnWorkingLossStatistics"; + barBtnWorkingLossStatistics.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; + barBtnWorkingLossStatistics.ItemClick += barBtnWorkingLossStatistics_ItemClick; // // barBtnWorkingPower // @@ -252,14 +232,6 @@ barBtnWorkingAnaly.Name = "barBtnWorkingAnaly"; barBtnWorkingAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large; barBtnWorkingAnaly.ItemClick += barBtnWorkingAnaly_ItemClick; - // - // barBtnParallel - // - barBtnParallel.Caption = "骞惰仈"; - barBtnParallel.Id = 73; - barBtnParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallel.ImageOptions.SvgImage"); - barBtnParallel.Name = "barBtnParallel"; - barBtnParallel.ItemClick += barBtnParallel_ItemClick; // // barBtnWorkingEvaluation // @@ -290,11 +262,34 @@ barCkDecorator.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; barCkDecorator.CheckedChanged += barCkDecorator_CheckedChanged; // + // barBtnEdit + // + barBtnEdit.Caption = "缂栬緫"; + barBtnEdit.Id = 80; + barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage"); + barBtnEdit.Name = "barBtnEdit"; + barBtnEdit.ItemClick += barBtnEdit_ItemClick; + // + // barBtnDelete + // + barBtnDelete.Caption = "鍒犻櫎"; + barBtnDelete.Id = 81; + barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage"); + barBtnDelete.Name = "barBtnDelete"; + barBtnDelete.ItemClick += barBtnDelete_ItemClick; + // // ribbonPage1 // - ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9 }); + ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup3, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup9, ribbonPageGroup2 }); ribbonPage1.Name = "ribbonPage1"; ribbonPage1.Text = "ribbonPage1"; + // + // ribbonPageGroup3 + // + ribbonPageGroup3.ItemLinks.Add(barBtnEdit); + ribbonPageGroup3.ItemLinks.Add(barBtnDelete); + ribbonPageGroup3.Name = "ribbonPageGroup3"; + ribbonPageGroup3.Text = "宸ュ喌"; // // pageGroupModel // @@ -316,7 +311,6 @@ // // ribbonPageGroup1 // - ribbonPageGroup1.ItemLinks.Add(barBtnSetGradingList); ribbonPageGroup1.ItemLinks.Add(barBtnApplyGradingList); ribbonPageGroup1.ItemLinks.Add(barCkGrading); ribbonPageGroup1.Name = "ribbonPageGroup1"; @@ -324,34 +318,27 @@ // // ribbonPageGroup7 // - ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitor); - ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitorValue); + ribbonPageGroup7.ItemLinks.Add(barBtnShowMonitorValue); ribbonPageGroup7.ItemLinks.Add(barCkMonitor); ribbonPageGroup7.Name = "ribbonPageGroup7"; ribbonPageGroup7.Text = "鐩戞祴"; // - // ribbonPageGroup5 + // ribbonPageGroup9 // - ribbonPageGroup5.ItemLinks.Add(barBtnParallel); - ribbonPageGroup5.Name = "ribbonPageGroup5"; - ribbonPageGroup5.Text = "姘存车"; + ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly); + ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation); + ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower); + ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve); + ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics); + ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly); + ribbonPageGroup9.Name = "ribbonPageGroup9"; + ribbonPageGroup9.Text = "鍒嗘瀽"; // // ribbonPageGroup2 // ribbonPageGroup2.ItemLinks.Add(barBtnExportInp); ribbonPageGroup2.Name = "ribbonPageGroup2"; - ribbonPageGroup2.Text = "姘村姏璁$畻"; - // - // ribbonPageGroup9 - // - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation); - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingParallel); - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower); - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve); - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossScale); - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly); - ribbonPageGroup9.Name = "ribbonPageGroup9"; - ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽"; + ribbonPageGroup2.Text = "鏇村"; // // ribbonPageGroup4 // @@ -382,7 +369,7 @@ // tabPageQ3d.Caption = "姘村姏妯″瀷"; tabPageQ3d.Name = "tabPageQ3d"; - tabPageQ3d.Size = new Size(931, 374); + tabPageQ3d.Size = new Size(1189, 374); // // dockManager1 // @@ -457,7 +444,6 @@ private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1; private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1; private DevExpress.XtraBars.BarButtonItem barBtnExportInp; - private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2; private DevExpress.XtraBars.BarButtonItem barBtnVisualList; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4; private DevExpress.XtraBars.Navigation.TabPane tabPane1; @@ -466,19 +452,17 @@ private DevExpress.XtraBars.Docking.DockManager dockManager1; private DevExpress.XtraBars.Docking.DockPanel docPnlRight; private DevExpress.XtraBars.Docking.ControlContainer controlContainerRight; - private DevExpress.XtraBars.BarButtonItem barBtnWorkingParallel; + private DevExpress.XtraBars.BarButtonItem barBtnPumpAnaly; private DevExpress.XtraBars.BarButtonItem barBtnSearch; private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel; private DevExpress.XtraBars.Docking.DockPanel docPnlBottom; private DevExpress.XtraBars.Docking.ControlContainer controlContainerBottom; - private DevExpress.XtraBars.BarButtonItem barBtnSetGradingList; private DevExpress.XtraBars.BarButtonItem barBtnApplyGradingList; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1; private DevExpress.XtraBars.BarButtonItem barBtnSetMark; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup6; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup7; - private DevExpress.XtraBars.BarButtonItem barBtnSetMonitor; - private DevExpress.XtraBars.BarButtonItem barBtnSetMonitorValue; + private DevExpress.XtraBars.BarButtonItem barBtnShowMonitorValue; private DevExpress.XtraBars.BarCheckItem barCkMonitor; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup9; private DevExpress.XtraBars.BarCheckItem barCkMark; @@ -486,13 +470,15 @@ private DevExpress.XtraBars.BarCheckItem barCkGrading; private DevExpress.XtraBars.BarCheckItem barCkCalcu; private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve; - private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossScale; + private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossStatistics; private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower; private DevExpress.XtraBars.BarButtonItem barBtnWorkingAnaly; - private DevExpress.XtraBars.BarButtonItem barBtnParallel; private DevExpress.XtraBars.BarButtonItem barBtnWorkingEvaluation; private DevExpress.XtraBars.BarButtonItem barBtnSetVisualVisible; private DevExpress.XtraBars.BarCheckItem barCkDecorator; - private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5; + private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2; + private DevExpress.XtraBars.BarButtonItem barBtnEdit; + private DevExpress.XtraBars.BarButtonItem barBtnDelete; + private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3; } } -- Gitblit v1.9.3