From fb3e670f48e3525665a79dad19747a2c604aeae2 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 09 一月 2025 11:43:54 +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 | 99 +++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 48 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 4bd464d..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
@@ -64,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();
@@ -86,6 +83,9 @@
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();
@@ -123,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, 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, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve, barBtnEditScheme, barBtnDeleteScheme, barBtnExportWord, barBtnWorkingMonitorAnaly, barBtnSetCoolingList });
+ 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 = 87;
+ ribbonControl1.MaxItemId = 90;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
@@ -184,7 +184,6 @@
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
@@ -371,31 +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.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
//
@@ -404,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
//
@@ -563,6 +536,34 @@
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[] { ribPageGroupForScheme, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
@@ -580,10 +581,9 @@
//
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 = "妯″瀷";
//
@@ -605,9 +605,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 = "鐩戞祴";
//
@@ -737,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);
@@ -758,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;
@@ -840,12 +843,9 @@
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;
private DevExpress.XtraBars.BarCheckItem barCkGrading;
private DevExpress.XtraBars.BarCheckItem barCkCalcu;
private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
@@ -866,5 +866,8 @@
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