From b9c79f595e5ad4684d731f968bf120ff8c52dbd8 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期一, 23 十二月 2024 00:42:25 +0800 Subject: [PATCH] 解决重复HydroInfo获取问题 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 171 ++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 115 insertions(+), 56 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 ab775ea..b866a23 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,8 +32,6 @@ { components = new Container(); ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectSimulationCorePage)); - DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip(); - DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem(); ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl(); barBtnCheck = new DevExpress.XtraBars.BarButtonItem(); barBtnCalcu = new DevExpress.XtraBars.BarButtonItem(); @@ -66,9 +64,7 @@ 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(); @@ -78,13 +74,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(); + ribPageGroupForScheme = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); @@ -120,9 +124,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, 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, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnRepair, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve }); + 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, barCkFlowEffect, 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 = 82; + ribbonControl1.MaxItemId = 90; ribbonControl1.Name = "ribbonControl1"; ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 }); ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 }); @@ -140,7 +144,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 @@ -158,7 +161,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 @@ -306,6 +308,7 @@ barBtnSetReservoirList.Caption = "姘村簱"; barBtnSetReservoirList.CloseRadialMenuOnItemClick = true; barBtnSetReservoirList.Id = 41; + barBtnSetReservoirList.ImageOptions.SvgImageSize = new Size(16, 16); barBtnSetReservoirList.Name = "barBtnSetReservoirList"; // // barBtnSetTankList @@ -369,31 +372,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.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 // @@ -472,18 +457,6 @@ 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; - toolTipItem1.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父"; - superToolTip1.Items.Add(toolTipItem1); - barBtnRepair.SuperTip = superToolTip1; - barBtnRepair.ItemClick += barBtnRepair_ItemClick; - // // barBtnWorkingEvaluation // barBtnWorkingEvaluation.Caption = "绮惧害璇勪及"; @@ -531,11 +504,88 @@ 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("barBtnSensorMonitor.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("barBtnSensorMonitorValue.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[] { 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"; + // + // ribPageGroupForScheme + // + ribPageGroupForScheme.ItemLinks.Add(barBtnEditScheme); + ribPageGroupForScheme.ItemLinks.Add(barBtnDeleteScheme); + ribPageGroupForScheme.Name = "ribPageGroupForScheme"; + ribPageGroupForScheme.Text = "鏂规"; // // pageGroupModel // @@ -566,9 +616,10 @@ // // 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 = "鐩戞祴"; // @@ -582,8 +633,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"; @@ -593,15 +642,18 @@ // ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly); ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation); + 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"; @@ -706,6 +758,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); @@ -799,9 +852,7 @@ private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList; 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; @@ -812,7 +863,6 @@ 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; @@ -820,5 +870,14 @@ 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