From facdda630bc2a16c2a61e5db6e4387e257202d44 Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期三, 15 一月 2025 11:40:38 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 254 ++++++++++++++++++++++++++++---------------------- 1 files changed, 142 insertions(+), 112 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs index ce061dd..1434a24 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs @@ -32,16 +32,12 @@ { components = new Container(); ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectSimulationCorePage)); - DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip(); - DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem(); ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl(); barBtnCheck = new DevExpress.XtraBars.BarButtonItem(); barBtnCalcu = new DevExpress.XtraBars.BarButtonItem(); barBtnExportInp = new DevExpress.XtraBars.BarButtonItem(); barBtnSave = new DevExpress.XtraBars.BarButtonItem(); barBtnVisualList = new DevExpress.XtraBars.BarButtonItem(); - barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem(); - barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem(); barBtnSetList = new DevExpress.XtraBars.BarButtonItem(); barBtnSetPumpList = new DevExpress.XtraBars.BarButtonItem(); barBtnSetValveList = new DevExpress.XtraBars.BarButtonItem(); @@ -52,7 +48,7 @@ barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem(); barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem(); barBtnSetJunctionList = 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(); @@ -68,11 +64,8 @@ barBtnSetCompressorList = new DevExpress.XtraBars.BarButtonItem(); barBtnSetFlowmeterList = new DevExpress.XtraBars.BarButtonItem(); barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem(); - barBtnSetMonitor = new DevExpress.XtraBars.BarButtonItem(); - barBtnSetMonitorValue = new DevExpress.XtraBars.BarButtonItem(); - barCkMonitor = new DevExpress.XtraBars.BarCheckItem(); + barCkMonitorVisible = 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(); @@ -80,13 +73,21 @@ barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem(); barBtnWorkingAnaly = new DevExpress.XtraBars.BarButtonItem(); barBtnPumpParallel = new DevExpress.XtraBars.BarButtonItem(); - barBtnRepair = new DevExpress.XtraBars.BarButtonItem(); barBtnWorkingEvaluation = new DevExpress.XtraBars.BarButtonItem(); barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem(); barCkDecorator = new DevExpress.XtraBars.BarCheckItem(); barBtnAddWorking = new DevExpress.XtraBars.BarButtonItem(); + barBtnPumpCurve = new DevExpress.XtraBars.BarButtonItem(); + barBtnEditScheme = new DevExpress.XtraBars.BarButtonItem(); + barBtnDeleteScheme = new DevExpress.XtraBars.BarButtonItem(); + barBtnExportWord = new DevExpress.XtraBars.BarButtonItem(); + barBtnWorkingMonitorAnaly = new DevExpress.XtraBars.BarButtonItem(); + barBtnSetCoolingList = new DevExpress.XtraBars.BarButtonItem(); + barBtnDockingMonitor = new DevExpress.XtraBars.BarButtonItem(); + barBtnDockingMonitorValue = new DevExpress.XtraBars.BarButtonItem(); + barBtnAnalyseMonitor = new DevExpress.XtraBars.BarButtonItem(); ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); - pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); + ribPageGroupForScheme = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); @@ -122,9 +123,9 @@ // ribbonControl1.ExpandCollapseItem.Id = 0; ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic; - ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnCalcu, barBtnExportInp, barBtnSave, barBtnVisualList, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnWorkingParallel, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnRepair, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking }); + ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnCalcu, barBtnExportInp, barBtnSave, barBtnVisualList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnPumpAnaly, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barCkMonitorVisible, barCkMark, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve, barBtnEditScheme, barBtnDeleteScheme, barBtnExportWord, barBtnWorkingMonitorAnaly, barBtnSetCoolingList, barBtnDockingMonitor, barBtnDockingMonitorValue, barBtnAnalyseMonitor }); ribbonControl1.Location = new Point(0, 0); - ribbonControl1.MaxItemId = 81; + ribbonControl1.MaxItemId = 90; ribbonControl1.Name = "ribbonControl1"; ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 }); ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 }); @@ -142,7 +143,6 @@ barBtnCheck.Id = 1; barBtnCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCheck.ImageOptions.SvgImage"); barBtnCheck.Name = "barBtnCheck"; - barBtnCheck.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; barBtnCheck.ItemClick += barBtnCheck_ItemClick; // // barBtnCalcu @@ -160,7 +160,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; // // barBtnSave @@ -179,31 +178,12 @@ barBtnVisualList.Name = "barBtnVisualList"; barBtnVisualList.ItemClick += barBtnVisualList_ItemClick; // - // barBtnMatchingList - // - barBtnMatchingList.Caption = "鑷姩鍖归厤"; - barBtnMatchingList.Id = 10; - barBtnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMatchingList.ImageOptions.SvgImage"); - barBtnMatchingList.Name = "barBtnMatchingList"; - barBtnMatchingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; - barBtnMatchingList.ItemClick += barBtnMatchingList_ItemClick; - // - // barBtnUnMatchingList - // - barBtnUnMatchingList.Caption = "鏈尮閰嶅垪琛�"; - barBtnUnMatchingList.Id = 19; - barBtnUnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUnMatchingList.ImageOptions.SvgImage"); - barBtnUnMatchingList.Name = "barBtnUnMatchingList"; - barBtnUnMatchingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; - barBtnUnMatchingList.ItemClick += barBtnUnMatchingList_ItemClick; - // // barBtnSetList // barBtnSetList.Caption = "鎵归噺閰嶇疆"; barBtnSetList.Id = 21; barBtnSetList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetList.ImageOptions.SvgImage"); barBtnSetList.Name = "barBtnSetList"; - barBtnSetList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; barBtnSetList.ItemClick += barBtnSetList_ItemClick; // // barBtnSetPumpList @@ -269,14 +249,15 @@ barBtnSetJunctionList.Id = 30; barBtnSetJunctionList.Name = "barBtnSetJunctionList"; // - // 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 // @@ -318,7 +299,6 @@ 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; // // barBtnSetReservoirList @@ -326,6 +306,7 @@ barBtnSetReservoirList.Caption = "姘村簱"; barBtnSetReservoirList.CloseRadialMenuOnItemClick = true; barBtnSetReservoirList.Id = 41; + barBtnSetReservoirList.ImageOptions.SvgImageSize = new Size(16, 16); barBtnSetReservoirList.Name = "barBtnSetReservoirList"; // // barBtnSetTankList @@ -389,32 +370,13 @@ barBtnSetPressmeterList.Id = 50; barBtnSetPressmeterList.Name = "barBtnSetPressmeterList"; // - // barBtnSetMonitor + // barCkMonitorVisible // - 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; - // - // barCkMonitor - // - barCkMonitor.Caption = "鏄剧ず"; - barCkMonitor.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText; - barCkMonitor.Id = 58; - barCkMonitor.Name = "barCkMonitor"; - barCkMonitor.CheckedChanged += barCkMonitor_CheckedChanged; + barCkMonitorVisible.Caption = "娴嬬偣鏄剧ず"; + barCkMonitorVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText; + barCkMonitorVisible.Id = 58; + barCkMonitorVisible.Name = "barCkMonitorVisible"; + barCkMonitorVisible.CheckedChanged += barCkMonitorVisible_CheckedChanged; // // barCkMark // @@ -423,14 +385,6 @@ barCkMark.Id = 65; barCkMark.Name = "barCkMark"; barCkMark.CheckedChanged += barCkMark_CheckedChanged; - // - // barCkFlowEffect - // - barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾"; - barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText; - barCkFlowEffect.Id = 66; - barCkFlowEffect.Name = "barCkFlowEffect"; - barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged; // // barCkGrading // @@ -461,14 +415,14 @@ // barBtnWorkingLossStatistics.Caption = "鎹熷け缁熻"; barBtnWorkingLossStatistics.Id = 70; - barBtnWorkingLossStatistics.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossScale.ImageOptions.SvgImage"); + 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 // - barBtnWorkingPower.Caption = "鑳芥晥鍒嗘瀽"; + barBtnWorkingPower.Caption = "鑳借�楀垎鏋�"; barBtnWorkingPower.Id = 71; barBtnWorkingPower.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingPower.ImageOptions.SvgImage"); barBtnWorkingPower.Name = "barBtnWorkingPower"; @@ -490,19 +444,8 @@ barBtnPumpParallel.Id = 73; barBtnPumpParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpParallel.ImageOptions.SvgImage"); barBtnPumpParallel.Name = "barBtnPumpParallel"; + barBtnPumpParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; barBtnPumpParallel.ItemClick += barBtnPumpParallel_ItemClick; - // - // barBtnRepair - // - barBtnRepair.Caption = "绠$綉淇"; - barBtnRepair.Id = 74; - barBtnRepair.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRepair.ImageOptions.SvgImage"); - barBtnRepair.Name = "barBtnRepair"; - barBtnRepair.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; - toolTipItem2.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父"; - superToolTip2.Items.Add(toolTipItem2); - barBtnRepair.SuperTip = superToolTip2; - barBtnRepair.ItemClick += barBtnRepair_ItemClick; // // barBtnWorkingEvaluation // @@ -542,27 +485,105 @@ barBtnAddWorking.Name = "barBtnAddWorking"; barBtnAddWorking.ItemClick += barBtnAddWorking_ItemClick; // + // barBtnPumpCurve + // + barBtnPumpCurve.Caption = "鎬ц兘鏇茬嚎"; + barBtnPumpCurve.Id = 81; + barBtnPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpCurve.ImageOptions.SvgImage"); + barBtnPumpCurve.Name = "barBtnPumpCurve"; + barBtnPumpCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; + barBtnPumpCurve.ItemClick += barBtnPumpCurve_ItemClick; + // + // barBtnEditScheme + // + barBtnEditScheme.Caption = "缂栬緫"; + barBtnEditScheme.Id = 82; + barBtnEditScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditScheme.ImageOptions.SvgImage"); + barBtnEditScheme.Name = "barBtnEditScheme"; + barBtnEditScheme.ItemClick += barBtnEditScheme_ItemClick; + // + // barBtnDeleteScheme + // + barBtnDeleteScheme.Caption = "鍒犻櫎"; + barBtnDeleteScheme.Id = 83; + barBtnDeleteScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDeleteScheme.ImageOptions.SvgImage"); + barBtnDeleteScheme.Name = "barBtnDeleteScheme"; + barBtnDeleteScheme.ItemClick += barBtnDeleteScheme_ItemClick; + // + // barBtnExportWord + // + barBtnExportWord.Caption = "瀵煎嚭鎶ュ憡"; + barBtnExportWord.Enabled = false; + barBtnExportWord.Id = 84; + barBtnExportWord.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExportWord.ImageOptions.SvgImage"); + barBtnExportWord.Name = "barBtnExportWord"; + barBtnExportWord.ItemClick += barBtnExportWord_ItemClick; + // + // barBtnWorkingMonitorAnaly + // + barBtnWorkingMonitorAnaly.Caption = "鐩戞祴鍒嗘瀽"; + barBtnWorkingMonitorAnaly.Id = 85; + barBtnWorkingMonitorAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingMonitorAnaly.ImageOptions.SvgImage"); + barBtnWorkingMonitorAnaly.Name = "barBtnWorkingMonitorAnaly"; + barBtnWorkingMonitorAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; + barBtnWorkingMonitorAnaly.ItemClick += barBtnWorkingMonitorAnaly_ItemClick; + // + // barBtnSetCoolingList + // + barBtnSetCoolingList.Caption = "鍐峰嵈濉�"; + barBtnSetCoolingList.CloseRadialMenuOnItemClick = true; + barBtnSetCoolingList.Id = 86; + barBtnSetCoolingList.ImageOptions.SvgImageSize = new Size(16, 16); + barBtnSetCoolingList.Name = "barBtnSetCoolingList"; + // + // barBtnDockingMonitor + // + barBtnDockingMonitor.Caption = "浼犳劅鍣ㄦ祴鐐�"; + barBtnDockingMonitor.Enabled = false; + barBtnDockingMonitor.Id = 87; + barBtnDockingMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDockingMonitor.ImageOptions.SvgImage"); + barBtnDockingMonitor.Name = "barBtnDockingMonitor"; + barBtnDockingMonitor.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; + barBtnDockingMonitor.ItemClick += barBtnDockingMonitor_ItemClick; + // + // barBtnDockingMonitorValue + // + barBtnDockingMonitorValue.Caption = "浼犳劅鍣ㄦ祴鍊�"; + barBtnDockingMonitorValue.Id = 88; + barBtnDockingMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDockingMonitorValue.ImageOptions.SvgImage"); + barBtnDockingMonitorValue.Name = "barBtnDockingMonitorValue"; + barBtnDockingMonitorValue.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; + barBtnDockingMonitorValue.ItemClick += barBtnDockingMonitorValue_ItemClick; + // + // barBtnAnalyseMonitor + // + barBtnAnalyseMonitor.Caption = "鍒嗘瀽娴嬬偣"; + barBtnAnalyseMonitor.Enabled = false; + barBtnAnalyseMonitor.Id = 89; + barBtnAnalyseMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnalyseMonitor.ImageOptions.SvgImage"); + barBtnAnalyseMonitor.Name = "barBtnAnalyseMonitor"; + barBtnAnalyseMonitor.ItemClick += barBtnAnalyseMonitor_ItemClick; + // // ribbonPage1 // - ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 }); + ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribPageGroupForScheme, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 }); ribbonPage1.Name = "ribbonPage1"; ribbonPage1.Text = "ribbonPage1"; // - // pageGroupMatching + // ribPageGroupForScheme // - pageGroupMatching.ItemLinks.Add(barBtnMatchingList); - pageGroupMatching.ItemLinks.Add(barBtnUnMatchingList); - pageGroupMatching.Name = "pageGroupMatching"; - pageGroupMatching.Text = "鍖归厤"; + ribPageGroupForScheme.ItemLinks.Add(barBtnEditScheme); + ribPageGroupForScheme.ItemLinks.Add(barBtnDeleteScheme); + ribPageGroupForScheme.Name = "ribPageGroupForScheme"; + ribPageGroupForScheme.Text = "鏂规"; // // pageGroupModel // pageGroupModel.ItemLinks.Add(barCkDecorator); pageGroupModel.ItemLinks.Add(barBtnSetVisualVisible); - pageGroupModel.ItemLinks.Add(barBtnVisualList); pageGroupModel.ItemLinks.Add(barBtnSearch); + pageGroupModel.ItemLinks.Add(barBtnVisualList); pageGroupModel.ItemLinks.Add(barBtnSetList); - pageGroupModel.ItemLinks.Add(barCkFlowEffect); pageGroupModel.Name = "pageGroupModel"; pageGroupModel.Text = "妯″瀷"; // @@ -584,14 +605,16 @@ // // ribbonPageGroup7 // - ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitor); - ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitorValue); - ribbonPageGroup7.ItemLinks.Add(barCkMonitor); + ribbonPageGroup7.ItemLinks.Add(barBtnDockingMonitor); + ribbonPageGroup7.ItemLinks.Add(barBtnDockingMonitorValue); + ribbonPageGroup7.ItemLinks.Add(barCkMonitorVisible); + ribbonPageGroup7.ItemLinks.Add(barBtnAnalyseMonitor); ribbonPageGroup7.Name = "ribbonPageGroup7"; ribbonPageGroup7.Text = "鐩戞祴"; // // ribbonPageGroup5 // + ribbonPageGroup5.ItemLinks.Add(barBtnPumpCurve); ribbonPageGroup5.ItemLinks.Add(barBtnPumpParallel); ribbonPageGroup5.Name = "ribbonPageGroup5"; ribbonPageGroup5.Text = "姘存车"; @@ -599,8 +622,6 @@ // ribbonPageGroup2 // ribbonPageGroup2.ItemLinks.Add(barBtnCheck); - ribbonPageGroup2.ItemLinks.Add(barBtnRepair); - ribbonPageGroup2.ItemLinks.Add(barBtnExportInp); ribbonPageGroup2.ItemLinks.Add(barBtnCalcu); ribbonPageGroup2.ItemLinks.Add(barBtnAddWorking); ribbonPageGroup2.Name = "ribbonPageGroup2"; @@ -608,17 +629,20 @@ // // ribbonPageGroup9 // + ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation); - ribbonPageGroup9.ItemLinks.Add(barBtnWorkingParallel); + ribbonPageGroup9.ItemLinks.Add(barBtnWorkingMonitorAnaly); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly); + ribbonPageGroup9.ItemLinks.Add(barBtnExportWord); ribbonPageGroup9.Name = "ribbonPageGroup9"; ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽"; // // ribbonPageGroup3 // + ribbonPageGroup3.ItemLinks.Add(barBtnExportInp); ribbonPageGroup3.ItemLinks.Add(barBtnSave); ribbonPageGroup3.ItemLinks.Add(barBtnRefresh); ribbonPageGroup3.Name = "ribbonPageGroup3"; @@ -714,6 +738,7 @@ // rmSet // rmSet.AllowGlyphSkinning = true; + rmSet.AutoExpand = true; rmSet.Glyph = (Image)resources.GetObject("rmSet.Glyph"); rmSet.ItemLinks.Add(barBtnSetReservoirList); rmSet.ItemLinks.Add(barBtnSetTankList); @@ -723,6 +748,7 @@ rmSet.ItemLinks.Add(barBtnSetPipeList); rmSet.ItemLinks.Add(barBtnSetNozzleList); rmSet.ItemLinks.Add(barBtnSetHydrantList); + rmSet.ItemLinks.Add(barBtnSetCoolingList); rmSet.ItemLinks.Add(barBtnSetBluntheadList); rmSet.ItemLinks.Add(barBtnSetElbowsList); rmSet.ItemLinks.Add(barBtnSetThreelinkList); @@ -734,6 +760,7 @@ rmSet.ItemLinks.Add(barBtnSetExchangerList); rmSet.ItemLinks.Add(barBtnSetCompressorList); rmSet.ItemLinks.Add(barBtnSetJunctionList); + rmSet.MenuColor = Color.FromArgb(0, 122, 204); rmSet.Name = "rmSet"; rmSet.Ribbon = ribbonControl1; rmSet.BeforePopup += rmSet_BeforePopup; @@ -770,14 +797,12 @@ private DevExpress.XtraBars.BarButtonItem barBtnCheck; private DevExpress.XtraBars.BarButtonItem barBtnCalcu; private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1; - private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupMatching; private DevExpress.XtraBars.BarButtonItem barBtnExportInp; private DevExpress.XtraBars.BarButtonItem barBtnSave; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2; private DevExpress.XtraBars.BarButtonItem barBtnVisualList; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3; - private DevExpress.XtraBars.BarButtonItem barBtnMatchingList; private DevExpress.XtraBars.Navigation.TabPane tabPane1; private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageBimface; private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageQ3d; @@ -796,7 +821,7 @@ private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList; private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList; private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList; - 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; @@ -816,15 +841,11 @@ private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList; private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList; private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList; - public DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList; 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.BarCheckItem barCkMonitor; + private DevExpress.XtraBars.BarCheckItem barCkMonitorVisible; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup9; private DevExpress.XtraBars.BarCheckItem barCkMark; - private DevExpress.XtraBars.BarCheckItem barCkFlowEffect; private DevExpress.XtraBars.BarCheckItem barCkGrading; private DevExpress.XtraBars.BarCheckItem barCkCalcu; private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve; @@ -832,12 +853,21 @@ private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower; private DevExpress.XtraBars.BarButtonItem barBtnWorkingAnaly; private DevExpress.XtraBars.BarButtonItem barBtnPumpParallel; - private DevExpress.XtraBars.BarButtonItem barBtnRepair; private DevExpress.XtraBars.BarButtonItem barBtnWorkingEvaluation; private DevExpress.XtraBars.BarButtonItem barBtnSetVisualVisible; private DevExpress.XtraBars.BarCheckItem barCkDecorator; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5; private DevExpress.XtraBars.BarButtonItem barBtnAddWorking; private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1; + private DevExpress.XtraBars.BarButtonItem barBtnPumpCurve; + private DevExpress.XtraBars.BarButtonItem barBtnEditScheme; + private DevExpress.XtraBars.BarButtonItem barBtnDeleteScheme; + private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribPageGroupForScheme; + private DevExpress.XtraBars.BarButtonItem barBtnExportWord; + private DevExpress.XtraBars.BarButtonItem barBtnWorkingMonitorAnaly; + private DevExpress.XtraBars.BarButtonItem barBtnSetCoolingList; + private DevExpress.XtraBars.BarButtonItem barBtnDockingMonitor; + private DevExpress.XtraBars.BarButtonItem barBtnDockingMonitorValue; + private DevExpress.XtraBars.BarButtonItem barBtnAnalyseMonitor; } } -- Gitblit v1.9.3