From ad8f523428e7f319700c226707e3cdfe389d6539 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 17 二月 2025 17:48:39 +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 | 90 +++++++++++++++++++++++++++++++-------------
1 files changed, 63 insertions(+), 27 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 b866a23..145a970 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
@@ -66,7 +66,6 @@
barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem();
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();
@@ -87,6 +86,9 @@
barBtnDockingMonitor = new DevExpress.XtraBars.BarButtonItem();
barBtnDockingMonitorValue = new DevExpress.XtraBars.BarButtonItem();
barBtnAnalyseMonitor = new DevExpress.XtraBars.BarButtonItem();
+ barBtnMgrWorking = new DevExpress.XtraBars.BarButtonItem();
+ barToggleSwitchPress = new DevExpress.XtraBars.BarToggleSwitchItem();
+ barBtnEvaluation = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribPageGroupForScheme = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -98,6 +100,7 @@
ribbonPageGroup9 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
+ repositoryItemRadioGroup1 = new DevExpress.XtraEditors.Repository.RepositoryItemRadioGroup();
ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
tabPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
@@ -111,6 +114,7 @@
rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
+ ((ISupportInitialize)repositoryItemRadioGroup1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
((ISupportInitialize)dockManager1).BeginInit();
@@ -124,17 +128,17 @@
//
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, barCkMonitorVisible, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve, barBtnEditScheme, barBtnDeleteScheme, barBtnExportWord, barBtnWorkingMonitorAnaly, barBtnSetCoolingList, barBtnDockingMonitor, barBtnDockingMonitorValue, barBtnAnalyseMonitor });
+ 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, barBtnMgrWorking, barToggleSwitchPress, barBtnEvaluation });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 90;
+ ribbonControl1.MaxItemId = 97;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
- ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
+ ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1, repositoryItemRadioGroup1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
ribbonControl1.ShowQatLocationSelector = false;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(1464, 128);
+ ribbonControl1.Size = new Size(1934, 128);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -144,6 +148,7 @@
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
@@ -185,7 +190,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
@@ -388,14 +392,6 @@
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
//
barCkGrading.Caption = "鏄剧ず";
@@ -551,7 +547,7 @@
barBtnDockingMonitor.Caption = "浼犳劅鍣ㄦ祴鐐�";
barBtnDockingMonitor.Enabled = false;
barBtnDockingMonitor.Id = 87;
- barBtnDockingMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSensorMonitor.ImageOptions.SvgImage");
+ 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;
@@ -560,7 +556,7 @@
//
barBtnDockingMonitorValue.Caption = "浼犳劅鍣ㄦ祴鍊�";
barBtnDockingMonitorValue.Id = 88;
- barBtnDockingMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSensorMonitorValue.ImageOptions.SvgImage");
+ 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;
@@ -573,6 +569,33 @@
barBtnAnalyseMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnalyseMonitor.ImageOptions.SvgImage");
barBtnAnalyseMonitor.Name = "barBtnAnalyseMonitor";
barBtnAnalyseMonitor.ItemClick += barBtnAnalyseMonitor_ItemClick;
+ //
+ // barBtnMgrWorking
+ //
+ barBtnMgrWorking.Caption = "宸ュ喌绠＄悊";
+ barBtnMgrWorking.Id = 90;
+ barBtnMgrWorking.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMgrWorking.ImageOptions.SvgImage");
+ barBtnMgrWorking.Name = "barBtnMgrWorking";
+ barBtnMgrWorking.ItemClick += barBtnMgrWorking_ItemClick;
+ //
+ // barToggleSwitchPress
+ //
+ barToggleSwitchPress.BindableChecked = true;
+ barToggleSwitchPress.Caption = "鑷敱鍘嬪姏";
+ barToggleSwitchPress.Checked = true;
+ barToggleSwitchPress.Hint = "缁濆鍘嬪姏鍖呭惈楂樼▼";
+ barToggleSwitchPress.Id = 95;
+ barToggleSwitchPress.Name = "barToggleSwitchPress";
+ barToggleSwitchPress.CheckedChanged += barToggleSwitchPress_CheckedChanged;
+ //
+ // barBtnEvaluation
+ //
+ barBtnEvaluation.Caption = "璇勪环瑙勫垯";
+ barBtnEvaluation.Id = 96;
+ barBtnEvaluation.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEvaluation.ImageOptions.SvgImage");
+ barBtnEvaluation.Name = "barBtnEvaluation";
+ barBtnEvaluation.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnEvaluation.ItemClick += barBtnEvaluation_ItemClick;
//
// ribbonPage1
//
@@ -591,10 +614,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 = "妯″瀷";
//
@@ -632,7 +654,9 @@
//
// ribbonPageGroup2
//
+ ribbonPageGroup2.ItemLinks.Add(barToggleSwitchPress);
ribbonPageGroup2.ItemLinks.Add(barBtnCheck);
+ ribbonPageGroup2.ItemLinks.Add(barBtnEvaluation);
ribbonPageGroup2.ItemLinks.Add(barBtnCalcu);
ribbonPageGroup2.ItemLinks.Add(barBtnAddWorking);
ribbonPageGroup2.Name = "ribbonPageGroup2";
@@ -640,13 +664,14 @@
//
// ribbonPageGroup9
//
- ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
+ ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingMonitorAnaly);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
+ ribbonPageGroup9.ItemLinks.Add(barBtnMgrWorking);
ribbonPageGroup9.ItemLinks.Add(barBtnExportWord);
ribbonPageGroup9.Name = "ribbonPageGroup9";
ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
@@ -665,6 +690,11 @@
repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
//
+ // repositoryItemRadioGroup1
+ //
+ repositoryItemRadioGroup1.Items.AddRange(new RadioGroupItem[] { new RadioGroupItem(null, "鑷敱鍘嬪姏", true, null, ""), new RadioGroupItem(null, "缁濆鍘嬪姏", true, null, "") });
+ repositoryItemRadioGroup1.Name = "repositoryItemRadioGroup1";
+ //
// ribbonPageGroup4
//
ribbonPageGroup4.Name = "ribbonPageGroup4";
@@ -678,9 +708,9 @@
tabPane1.Location = new Point(0, 128);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
- tabPane1.RegularSize = new Size(1189, 407);
+ tabPane1.RegularSize = new Size(1659, 407);
tabPane1.SelectedPage = tabPageBimface;
- tabPane1.Size = new Size(1189, 407);
+ tabPane1.Size = new Size(1659, 407);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -688,7 +718,7 @@
//
tabPageBimface.Caption = "涓夌淮妯″瀷";
tabPageBimface.Name = "tabPageBimface";
- tabPageBimface.Size = new Size(1189, 374);
+ tabPageBimface.Size = new Size(1659, 374);
//
// tabPageQ3d
//
@@ -708,7 +738,7 @@
docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.FloatVertical = true;
docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
- docPnlRight.Location = new Point(1189, 128);
+ docPnlRight.Location = new Point(1659, 128);
docPnlRight.Name = "docPnlRight";
docPnlRight.OriginalSize = new Size(275, 200);
docPnlRight.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
@@ -731,14 +761,14 @@
docPnlBottom.Location = new Point(0, 535);
docPnlBottom.Name = "docPnlBottom";
docPnlBottom.OriginalSize = new Size(200, 165);
- docPnlBottom.Size = new Size(1189, 165);
+ docPnlBottom.Size = new Size(1659, 165);
docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
//
// controlContainerBottom
//
controlContainerBottom.Location = new Point(3, 27);
controlContainerBottom.Name = "controlContainerBottom";
- controlContainerBottom.Size = new Size(1183, 135);
+ controlContainerBottom.Size = new Size(1653, 135);
controlContainerBottom.TabIndex = 0;
//
// svgImg32
@@ -749,6 +779,7 @@
// rmSet
//
rmSet.AllowGlyphSkinning = true;
+ rmSet.AutoExpand = true;
rmSet.Glyph = (Image)resources.GetObject("rmSet.Glyph");
rmSet.ItemLinks.Add(barBtnSetReservoirList);
rmSet.ItemLinks.Add(barBtnSetTankList);
@@ -770,6 +801,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;
@@ -786,9 +818,10 @@
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(1464, 700);
+ Size = new Size(1934, 700);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)repositoryItemImageComboBox1).EndInit();
+ ((ISupportInitialize)repositoryItemRadioGroup1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
((ISupportInitialize)dockManager1).EndInit();
@@ -855,7 +888,6 @@
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;
@@ -879,5 +911,9 @@
private DevExpress.XtraBars.BarButtonItem barBtnDockingMonitor;
private DevExpress.XtraBars.BarButtonItem barBtnDockingMonitorValue;
private DevExpress.XtraBars.BarButtonItem barBtnAnalyseMonitor;
+ private DevExpress.XtraBars.BarButtonItem barBtnMgrWorking;
+ private DevExpress.XtraEditors.Repository.RepositoryItemRadioGroup repositoryItemRadioGroup1;
+ private DevExpress.XtraBars.BarToggleSwitchItem barToggleSwitchPress;
+ private DevExpress.XtraBars.BarButtonItem barBtnEvaluation;
}
}
--
Gitblit v1.9.3