From e0df433d23b1afffa0b04389ad8b915a91f8debc Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期三, 04 十二月 2024 23:40:34 +0800 Subject: [PATCH] 对接部分匹配 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.Designer.cs | 105 ++++++++++++++++++++-------------------------------- 1 files changed, 41 insertions(+), 64 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 bb13454..01293a1 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,22 +35,20 @@ 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(); - 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(); - barBtnPumpParallel = new DevExpress.XtraBars.BarButtonItem(); barBtnWorkingEvaluation = new DevExpress.XtraBars.BarButtonItem(); barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem(); barCkDecorator = new DevExpress.XtraBars.BarCheckItem(); @@ -59,8 +57,8 @@ ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); - ribbonPageGroup5 = 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(); @@ -82,7 +80,7 @@ // 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, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, 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 }); ribbonControl1.Location = new Point(0, 0); ribbonControl1.MaxItemId = 80; ribbonControl1.Name = "ribbonControl1"; @@ -101,7 +99,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 @@ -112,14 +109,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 // @@ -129,14 +127,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 // @@ -153,17 +143,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; // - // barBtnSetMonitorValue + // barBtnShowMonitorValue // - 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 // @@ -214,14 +203,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 // @@ -240,14 +229,6 @@ barBtnWorkingAnaly.Name = "barBtnWorkingAnaly"; barBtnWorkingAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large; barBtnWorkingAnaly.ItemClick += barBtnWorkingAnaly_ItemClick; - // - // barBtnPumpParallel - // - barBtnPumpParallel.Caption = "骞惰仈妯℃嫙"; - barBtnPumpParallel.Id = 73; - barBtnPumpParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallel.ImageOptions.SvgImage"); - barBtnPumpParallel.Name = "barBtnPumpParallel"; - barBtnPumpParallel.ItemClick += barBtnParallel_ItemClick; // // barBtnWorkingEvaluation // @@ -280,7 +261,7 @@ // // ribbonPage1 // - ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup9 }); + ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup9, ribbonPageGroup2 }); ribbonPage1.Name = "ribbonPage1"; ribbonPage1.Text = "ribbonPage1"; // @@ -304,7 +285,6 @@ // // ribbonPageGroup1 // - ribbonPageGroup1.ItemLinks.Add(barBtnSetGradingList); ribbonPageGroup1.ItemLinks.Add(barBtnApplyGradingList); ribbonPageGroup1.ItemLinks.Add(barCkGrading); ribbonPageGroup1.Name = "ribbonPageGroup1"; @@ -312,28 +292,27 @@ // // ribbonPageGroup7 // - ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitorValue); + ribbonPageGroup7.ItemLinks.Add(barBtnShowMonitorValue); ribbonPageGroup7.ItemLinks.Add(barCkMonitor); ribbonPageGroup7.Name = "ribbonPageGroup7"; ribbonPageGroup7.Text = "鐩戞祴"; // - // ribbonPageGroup5 - // - ribbonPageGroup5.ItemLinks.Add(barBtnPumpParallel); - ribbonPageGroup5.Name = "ribbonPageGroup5"; - ribbonPageGroup5.Text = "姘存车"; - // // ribbonPageGroup9 // - ribbonPageGroup9.ItemLinks.Add(barBtnExportInp); - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingParallel); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation); + ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve); - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossScale); + ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly); ribbonPageGroup9.Name = "ribbonPageGroup9"; ribbonPageGroup9.Text = "鍒嗘瀽"; + // + // ribbonPageGroup2 + // + ribbonPageGroup2.ItemLinks.Add(barBtnExportInp); + ribbonPageGroup2.Name = "ribbonPageGroup2"; + ribbonPageGroup2.Text = "鏇村"; // // ribbonPageGroup4 // @@ -447,18 +426,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 barBtnSetMonitorValue; + private DevExpress.XtraBars.BarButtonItem barBtnShowMonitorValue; private DevExpress.XtraBars.BarCheckItem barCkMonitor; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup9; private DevExpress.XtraBars.BarCheckItem barCkMark; @@ -466,13 +444,12 @@ 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 barBtnPumpParallel; 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; } } -- Gitblit v1.9.3