From 979fa511e23ad4cb8d7e25b813aade4aaec45535 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 23 十一月 2024 00:12:34 +0800
Subject: [PATCH] 核心界面整理

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  311 +++++++++++++++++++++++++--------------------------
 1 files changed, 152 insertions(+), 159 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 060adc4..0aff37c 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
@@ -39,8 +39,7 @@
             barBtnWorkingCalcu = new DevExpress.XtraBars.BarButtonItem();
             barBtnExportInp = new DevExpress.XtraBars.BarButtonItem();
             barBtnSave = new DevExpress.XtraBars.BarButtonItem();
-            barBtnHydroVisualList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
+            barBtnVisualList = new DevExpress.XtraBars.BarButtonItem();
             barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
@@ -53,10 +52,10 @@
             barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnCurrentWorkingParallelAnalysis = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingParallel = new DevExpress.XtraBars.BarButtonItem();
             barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
-            barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
-            barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetGradingList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnApplyGradingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetMark = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetReservoirList = new DevExpress.XtraBars.BarButtonItem();
@@ -77,14 +76,17 @@
             barCkMark = new DevExpress.XtraBars.BarCheckItem();
             barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
             barCkGrading = new DevExpress.XtraBars.BarCheckItem();
-            barCkCurrentWorkingCalcuResult = new DevExpress.XtraBars.BarCheckItem();
-            barBtnCurrentWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
-            barBtnCurrentWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
-            barBtnCurrentWorkingPowerAnalysis = new DevExpress.XtraBars.BarButtonItem();
-            barBtnCurrentWorkingMultiAnalysis = new DevExpress.XtraBars.BarButtonItem();
+            barCkCalcu = new DevExpress.XtraBars.BarCheckItem();
+            barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingAnaly = new DevExpress.XtraBars.BarButtonItem();
             barBtnParallel = new DevExpress.XtraBars.BarButtonItem();
             barBtnRepair = new DevExpress.XtraBars.BarButtonItem();
             barBtnWorkingList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingEvaluation = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem();
+            barCkDecorator = new DevExpress.XtraBars.BarCheckItem();
             ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -105,9 +107,6 @@
             controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
             svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
             rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
-            docPnlWorking = new DevExpress.XtraBars.Docking.DockPanel();
-            dockPanel2 = new DevExpress.XtraBars.Docking.DockPanel();
-            dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
             ((ISupportInitialize)ribbonControl1).BeginInit();
             ((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
             ((ISupportInitialize)tabPane1).BeginInit();
@@ -117,16 +116,15 @@
             docPnlBottom.SuspendLayout();
             ((ISupportInitialize)svgImg32).BeginInit();
             ((ISupportInitialize)rmSet).BeginInit();
-            dockPanel1.SuspendLayout();
             SuspendLayout();
             // 
             // ribbonControl1
             // 
             ribbonControl1.ExpandCollapseItem.Id = 0;
             ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
-            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnWorkingCalcu, barBtnExportInp, barBtnSave, barBtnHydroVisualList, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnCurrentWorkingParallelAnalysis, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barCkMark, barCkFlowEffect, barCkGrading, barCkCurrentWorkingCalcuResult, barBtnCurrentWorkingLossCurve, barBtnCurrentWorkingLossScale, barBtnCurrentWorkingPowerAnalysis, barBtnCurrentWorkingMultiAnalysis, barBtnParallel, barBtnRepair, barBtnWorkingList });
+            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnWorkingCalcu, 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, barEditCurrentWorking, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPower, barBtnWorkingAnaly, barBtnParallel, barBtnRepair, barBtnWorkingList, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 76;
+            ribbonControl1.MaxItemId = 79;
             ribbonControl1.Name = "ribbonControl1";
             ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
             ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
@@ -134,7 +132,7 @@
             ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
             ribbonControl1.ShowQatLocationSelector = false;
             ribbonControl1.ShowToolbarCustomizeItem = false;
-            ribbonControl1.Size = new Size(1941, 128);
+            ribbonControl1.Size = new Size(1464, 128);
             ribbonControl1.Toolbar.ShowCustomizeItem = false;
             ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
             // 
@@ -150,10 +148,10 @@
             // 
             barBtnWorkingCalcu.Caption = "宸ュ喌璁$畻";
             barBtnWorkingCalcu.Id = 2;
-            barBtnWorkingCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingCalcu.ImageOptions.SvgImage");
+            barBtnWorkingCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCalcu.ImageOptions.SvgImage");
             barBtnWorkingCalcu.Name = "barBtnWorkingCalcu";
             barBtnWorkingCalcu.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
-            barBtnWorkingCalcu.ItemClick += barBtnHydroCalcu_ItemClick;
+            barBtnWorkingCalcu.ItemClick += barBtnWorkingCalcu_ItemClick;
             // 
             // barBtnExportInp
             // 
@@ -172,21 +170,13 @@
             barBtnSave.Name = "barBtnSave";
             barBtnSave.ItemClick += barBtnSave_ItemClick;
             // 
-            // barBtnHydroVisualList
+            // barBtnVisualList
             // 
-            barBtnHydroVisualList.Caption = "鏋勪欢鏄庣粏";
-            barBtnHydroVisualList.Id = 8;
-            barBtnHydroVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroVisualList.ImageOptions.SvgImage");
-            barBtnHydroVisualList.Name = "barBtnHydroVisualList";
-            barBtnHydroVisualList.ItemClick += barBtnHydroVisualList_ItemClick;
-            // 
-            // barBtnFastShowHidden
-            // 
-            barBtnFastShowHidden.Caption = "涓�閿樉闅�";
-            barBtnFastShowHidden.Id = 9;
-            barBtnFastShowHidden.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFastShowHidden.ImageOptions.SvgImage");
-            barBtnFastShowHidden.Name = "barBtnFastShowHidden";
-            barBtnFastShowHidden.ItemClick += barBtnFastShowHidden_ItemClick;
+            barBtnVisualList.Caption = "鏋勪欢鏄庣粏";
+            barBtnVisualList.Id = 8;
+            barBtnVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnVisualList.ImageOptions.SvgImage");
+            barBtnVisualList.Name = "barBtnVisualList";
+            barBtnVisualList.ItemClick += barBtnVisualList_ItemClick;
             // 
             // barBtnMatchingList
             // 
@@ -278,14 +268,14 @@
             barBtnSetJunctionList.Id = 30;
             barBtnSetJunctionList.Name = "barBtnSetJunctionList";
             // 
-            // barBtnCurrentWorkingParallelAnalysis
+            // barBtnWorkingParallel
             // 
-            barBtnCurrentWorkingParallelAnalysis.Caption = "骞惰仈鍒嗘瀽";
-            barBtnCurrentWorkingParallelAnalysis.Id = 31;
-            barBtnCurrentWorkingParallelAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingParallelAnalysis.ImageOptions.SvgImage");
-            barBtnCurrentWorkingParallelAnalysis.Name = "barBtnCurrentWorkingParallelAnalysis";
-            barBtnCurrentWorkingParallelAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnCurrentWorkingParallelAnalysis.ItemClick += barBtnAnaly_ItemClick;
+            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;
             // 
             // barBtnSearch
             // 
@@ -296,22 +286,22 @@
             barBtnSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnSearch.ItemClick += barBtnSearch_ItemClick;
             // 
-            // barBtnGradingSet
+            // barBtnSetGradingList
             // 
-            barBtnGradingSet.Caption = "閰嶇疆";
-            barBtnGradingSet.Id = 34;
-            barBtnGradingSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingSet.ImageOptions.SvgImage");
-            barBtnGradingSet.Name = "barBtnGradingSet";
-            barBtnGradingSet.ItemClick += barBtnGradingSet_ItemClick;
+            barBtnSetGradingList.Caption = "閰嶇疆";
+            barBtnSetGradingList.Id = 34;
+            barBtnSetGradingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetGradingList.ImageOptions.SvgImage");
+            barBtnSetGradingList.Name = "barBtnSetGradingList";
+            barBtnSetGradingList.ItemClick += barBtnSetGradingList_ItemClick;
             // 
-            // barBtnGradingApply
+            // barBtnApplyGradingList
             // 
-            barBtnGradingApply.Caption = "搴旂敤";
-            barBtnGradingApply.Id = 35;
-            barBtnGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingApply.ImageOptions.SvgImage");
-            barBtnGradingApply.Name = "barBtnGradingApply";
-            barBtnGradingApply.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnGradingApply.ItemClick += barBtnGradingApply_ItemClick;
+            barBtnApplyGradingList.Caption = "搴旂敤";
+            barBtnApplyGradingList.Id = 35;
+            barBtnApplyGradingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnApplyGradingList.ImageOptions.SvgImage");
+            barBtnApplyGradingList.Name = "barBtnApplyGradingList";
+            barBtnApplyGradingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnApplyGradingList.ItemClick += barBtnApplyGradingList_ItemClick;
             // 
             // barBtnRefresh
             // 
@@ -419,7 +409,7 @@
             // barCkMonitor
             // 
             barCkMonitor.Caption = "鏄剧ず";
-            barCkMonitor.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkMonitor.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
             barCkMonitor.Id = 58;
             barCkMonitor.Name = "barCkMonitor";
             barCkMonitor.CheckedChanged += barCkMonitor_CheckedChanged;
@@ -441,7 +431,7 @@
             // barCkMark
             // 
             barCkMark.Caption = "鏄剧ず";
-            barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
             barCkMark.Id = 65;
             barCkMark.Name = "barCkMark";
             barCkMark.CheckedChanged += barCkMark_CheckedChanged;
@@ -449,7 +439,7 @@
             // barCkFlowEffect
             // 
             barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
-            barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
             barCkFlowEffect.Id = 66;
             barCkFlowEffect.Name = "barCkFlowEffect";
             barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged;
@@ -457,49 +447,54 @@
             // barCkGrading
             // 
             barCkGrading.Caption = "鏄剧ず";
-            barCkGrading.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkGrading.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
             barCkGrading.Id = 67;
             barCkGrading.Name = "barCkGrading";
             barCkGrading.CheckedChanged += barCkGrading_CheckedChanged;
             // 
-            // barCkCurrentWorkingCalcuResult
+            // barCkCalcu
             // 
-            barCkCurrentWorkingCalcuResult.Caption = "璁$畻缁撴灉";
-            barCkCurrentWorkingCalcuResult.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
-            barCkCurrentWorkingCalcuResult.Id = 68;
-            barCkCurrentWorkingCalcuResult.Name = "barCkCurrentWorkingCalcuResult";
+            barCkCalcu.Caption = "璁$畻鏍囩";
+            barCkCalcu.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+            barCkCalcu.Id = 68;
+            barCkCalcu.Name = "barCkCalcu";
+            barCkCalcu.CheckedChanged += barCkCalcu_CheckedChanged;
             // 
-            // barBtnCurrentWorkingLossCurve
+            // barBtnWorkingLossCurve
             // 
-            barBtnCurrentWorkingLossCurve.Caption = "鎹熷け鏇茬嚎";
-            barBtnCurrentWorkingLossCurve.Id = 69;
-            barBtnCurrentWorkingLossCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingLossCurve.ImageOptions.SvgImage");
-            barBtnCurrentWorkingLossCurve.Name = "barBtnCurrentWorkingLossCurve";
-            barBtnCurrentWorkingLossCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnWorkingLossCurve.Caption = "鎹熷け鏇茬嚎";
+            barBtnWorkingLossCurve.Id = 69;
+            barBtnWorkingLossCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossCurve.ImageOptions.SvgImage");
+            barBtnWorkingLossCurve.Name = "barBtnWorkingLossCurve";
+            barBtnWorkingLossCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnWorkingLossCurve.ItemClick += barBtnWorkingLossCurve_ItemClick;
             // 
-            // barBtnCurrentWorkingLossScale
+            // barBtnWorkingLossScale
             // 
-            barBtnCurrentWorkingLossScale.Caption = "鎹熷け姣斾緥";
-            barBtnCurrentWorkingLossScale.Id = 70;
-            barBtnCurrentWorkingLossScale.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingLossScale.ImageOptions.SvgImage");
-            barBtnCurrentWorkingLossScale.Name = "barBtnCurrentWorkingLossScale";
-            barBtnCurrentWorkingLossScale.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            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;
             // 
-            // barBtnCurrentWorkingPowerAnalysis
+            // barBtnWorkingPower
             // 
-            barBtnCurrentWorkingPowerAnalysis.Caption = "鑳芥晥鍒嗘瀽";
-            barBtnCurrentWorkingPowerAnalysis.Id = 71;
-            barBtnCurrentWorkingPowerAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingPowerAnalysis.ImageOptions.SvgImage");
-            barBtnCurrentWorkingPowerAnalysis.Name = "barBtnCurrentWorkingPowerAnalysis";
-            barBtnCurrentWorkingPowerAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnWorkingPower.Caption = "鑳芥晥鍒嗘瀽";
+            barBtnWorkingPower.Id = 71;
+            barBtnWorkingPower.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingPower.ImageOptions.SvgImage");
+            barBtnWorkingPower.Name = "barBtnWorkingPower";
+            barBtnWorkingPower.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnWorkingPower.ItemClick += barBtnWorkingPower_ItemClick;
             // 
-            // barBtnCurrentWorkingMultiAnalysis
+            // barBtnWorkingAnaly
             // 
-            barBtnCurrentWorkingMultiAnalysis.Caption = "缁煎悎鍒嗘瀽";
-            barBtnCurrentWorkingMultiAnalysis.Id = 72;
-            barBtnCurrentWorkingMultiAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingMultiAnalysis.ImageOptions.SvgImage");
-            barBtnCurrentWorkingMultiAnalysis.Name = "barBtnCurrentWorkingMultiAnalysis";
-            barBtnCurrentWorkingMultiAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+            barBtnWorkingAnaly.Caption = "缁煎悎鍒嗘瀽";
+            barBtnWorkingAnaly.Id = 72;
+            barBtnWorkingAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingAnaly.ImageOptions.SvgImage");
+            barBtnWorkingAnaly.Name = "barBtnWorkingAnaly";
+            barBtnWorkingAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+            barBtnWorkingAnaly.ItemClick += barBtnWorkingAnaly_ItemClick;
             // 
             // barBtnParallel
             // 
@@ -528,6 +523,37 @@
             barBtnWorkingList.Id = 75;
             barBtnWorkingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingList.ImageOptions.SvgImage");
             barBtnWorkingList.Name = "barBtnWorkingList";
+            barBtnWorkingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnWorkingList.ItemClick += barBtnWorkingList_ItemClick;
+            // 
+            // barBtnWorkingEvaluation
+            // 
+            barBtnWorkingEvaluation.Caption = "绮惧害璇勪及";
+            barBtnWorkingEvaluation.Id = 76;
+            barBtnWorkingEvaluation.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingEvaluation.ImageOptions.SvgImage");
+            barBtnWorkingEvaluation.Name = "barBtnWorkingEvaluation";
+            barBtnWorkingEvaluation.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnWorkingEvaluation.ItemClick += barBtnWorkingEvaluation_ItemClick;
+            // 
+            // barBtnSetVisualVisible
+            // 
+            barBtnSetVisualVisible.Caption = "鏋勪欢鏄剧ず";
+            barBtnSetVisualVisible.Id = 77;
+            barBtnSetVisualVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetVisualVisible.ImageOptions.SvgImage");
+            barBtnSetVisualVisible.Name = "barBtnSetVisualVisible";
+            barBtnSetVisualVisible.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnSetVisualVisible.ItemClick += barBtnSetVisualVisible_ItemClick;
+            // 
+            // barCkDecorator
+            // 
+            barCkDecorator.BindableChecked = true;
+            barCkDecorator.Caption = "涓�閿樉闅�";
+            barCkDecorator.Checked = true;
+            barCkDecorator.Id = 78;
+            barCkDecorator.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkDecorator.ImageOptions.SvgImage");
+            barCkDecorator.Name = "barCkDecorator";
+            barCkDecorator.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barCkDecorator.CheckedChanged += barCkDecorator_CheckedChanged;
             // 
             // ribbonPage1
             // 
@@ -544,8 +570,9 @@
             // 
             // pageGroupModel
             // 
-            pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
-            pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
+            pageGroupModel.ItemLinks.Add(barCkDecorator);
+            pageGroupModel.ItemLinks.Add(barBtnSetVisualVisible);
+            pageGroupModel.ItemLinks.Add(barBtnVisualList);
             pageGroupModel.ItemLinks.Add(barBtnSearch);
             pageGroupModel.ItemLinks.Add(barBtnSetList);
             pageGroupModel.ItemLinks.Add(barCkFlowEffect);
@@ -561,8 +588,8 @@
             // 
             // ribbonPageGroup1
             // 
-            ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
-            ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
+            ribbonPageGroup1.ItemLinks.Add(barBtnSetGradingList);
+            ribbonPageGroup1.ItemLinks.Add(barBtnApplyGradingList);
             ribbonPageGroup1.ItemLinks.Add(barCkGrading);
             ribbonPageGroup1.Name = "ribbonPageGroup1";
             ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
@@ -588,13 +615,14 @@
             // ribbonPageGroup9
             // 
             ribbonPageGroup9.ItemLinks.Add(barEditCurrentWorking);
-            ribbonPageGroup9.ItemLinks.Add(barCkCurrentWorkingCalcuResult);
-            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingParallelAnalysis);
-            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingLossCurve);
-            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingLossScale);
-            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingPowerAnalysis);
-            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingMultiAnalysis);
             ribbonPageGroup9.ItemLinks.Add(barBtnWorkingList);
+            ribbonPageGroup9.ItemLinks.Add(barCkCalcu);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingParallel);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossScale);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
             ribbonPageGroup9.Name = "ribbonPageGroup9";
             ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
             // 
@@ -618,9 +646,9 @@
             tabPane1.Location = new Point(0, 128);
             tabPane1.Name = "tabPane1";
             tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
-            tabPane1.RegularSize = new Size(1666, 407);
+            tabPane1.RegularSize = new Size(1189, 407);
             tabPane1.SelectedPage = tabPageBimface;
-            tabPane1.Size = new Size(1666, 407);
+            tabPane1.Size = new Size(1189, 407);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
@@ -628,7 +656,7 @@
             // 
             tabPageBimface.Caption = "涓夌淮妯″瀷";
             tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(1666, 374);
+            tabPageBimface.Size = new Size(1189, 374);
             // 
             // tabPageQ3d
             // 
@@ -639,26 +667,28 @@
             // dockManager1
             // 
             dockManager1.Form = this;
-            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1, docPnlBottom });
+            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlRight, docPnlBottom });
             dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
             // 
             // docPnlRight
             // 
             docPnlRight.Controls.Add(controlContainerRight);
-            docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
+            docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
             docPnlRight.FloatVertical = true;
             docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
-            docPnlRight.Location = new Point(4, 26);
+            docPnlRight.Location = new Point(1189, 128);
             docPnlRight.Name = "docPnlRight";
-            docPnlRight.OriginalSize = new Size(200, 200);
-            docPnlRight.Size = new Size(268, 516);
+            docPnlRight.OriginalSize = new Size(275, 200);
+            docPnlRight.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+            docPnlRight.SavedIndex = 0;
+            docPnlRight.Size = new Size(275, 572);
             docPnlRight.Text = "灞炴��";
             // 
             // controlContainerRight
             // 
-            controlContainerRight.Location = new Point(0, 0);
+            controlContainerRight.Location = new Point(4, 26);
             controlContainerRight.Name = "controlContainerRight";
-            controlContainerRight.Size = new Size(268, 516);
+            controlContainerRight.Size = new Size(268, 543);
             controlContainerRight.TabIndex = 0;
             // 
             // docPnlBottom
@@ -669,14 +699,14 @@
             docPnlBottom.Location = new Point(0, 535);
             docPnlBottom.Name = "docPnlBottom";
             docPnlBottom.OriginalSize = new Size(200, 165);
-            docPnlBottom.Size = new Size(1666, 165);
+            docPnlBottom.Size = new Size(1189, 165);
             docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
             // 
             // controlContainerBottom
             // 
             controlContainerBottom.Location = new Point(3, 27);
             controlContainerBottom.Name = "controlContainerBottom";
-            controlContainerBottom.Size = new Size(1660, 135);
+            controlContainerBottom.Size = new Size(1183, 135);
             controlContainerBottom.TabIndex = 0;
             // 
             // svgImg32
@@ -711,41 +741,6 @@
             rmSet.Ribbon = ribbonControl1;
             rmSet.BeforePopup += rmSet_BeforePopup;
             // 
-            // docPnlWorking
-            // 
-            docPnlWorking.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
-            docPnlWorking.ID = new Guid("6a12321b-176a-43ac-b64f-fbaa0f6806ce");
-            docPnlWorking.Location = new Point(4, 26);
-            docPnlWorking.Name = "docPnlWorking";
-            docPnlWorking.OriginalSize = new Size(200, 200);
-            docPnlWorking.Size = new Size(268, 516);
-            docPnlWorking.Text = "宸ュ喌";
-            // 
-            // dockPanel2
-            // 
-            dockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
-            dockPanel2.ID = new Guid("9e1401bf-eba9-4e65-8e3e-50e08d389108");
-            dockPanel2.Location = new Point(1666, 128);
-            dockPanel2.Name = "dockPanel2";
-            dockPanel2.OriginalSize = new Size(275, 200);
-            dockPanel2.Size = new Size(275, 572);
-            dockPanel2.Tabbed = true;
-            dockPanel2.Text = "panelContainer1";
-            // 
-            // dockPanel1
-            // 
-            dockPanel1.ActiveChild = docPnlRight;
-            dockPanel1.Controls.Add(docPnlRight);
-            dockPanel1.Controls.Add(docPnlWorking);
-            dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
-            dockPanel1.ID = new Guid("9c1c1fcf-0dc2-460f-ad97-7c25e496b4ae");
-            dockPanel1.Location = new Point(1666, 128);
-            dockPanel1.Name = "dockPanel1";
-            dockPanel1.OriginalSize = new Size(275, 200);
-            dockPanel1.Size = new Size(275, 572);
-            dockPanel1.Tabbed = true;
-            dockPanel1.Text = "panelContainer1";
-            // 
             // XhsProjectSimulationCorePage
             // 
             Appearance.BackColor = SystemColors.Control;
@@ -754,11 +749,11 @@
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabPane1);
             Controls.Add(docPnlBottom);
-            Controls.Add(dockPanel1);
+            Controls.Add(docPnlRight);
             Controls.Add(ribbonControl1);
             Margin = new Padding(2);
             Name = "XhsProjectSimulationCorePage";
-            Size = new Size(1941, 700);
+            Size = new Size(1464, 700);
             ((ISupportInitialize)ribbonControl1).EndInit();
             ((ISupportInitialize)repositoryItemImageComboBox1).EndInit();
             ((ISupportInitialize)tabPane1).EndInit();
@@ -768,7 +763,6 @@
             docPnlBottom.ResumeLayout(false);
             ((ISupportInitialize)svgImg32).EndInit();
             ((ISupportInitialize)rmSet).EndInit();
-            dockPanel1.ResumeLayout(false);
             ResumeLayout(false);
             PerformLayout();
         }
@@ -783,8 +777,7 @@
         private DevExpress.XtraBars.BarButtonItem barBtnExportInp;
         private DevExpress.XtraBars.BarButtonItem barBtnSave;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroVisualList;
-        private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
+        private DevExpress.XtraBars.BarButtonItem barBtnVisualList;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
         private DevExpress.XtraBars.BarButtonItem barBtnMatchingList;
@@ -806,13 +799,13 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
-        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingParallelAnalysis;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingParallel;
         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 barBtnGradingSet;
-        private DevExpress.XtraBars.BarButtonItem barBtnGradingApply;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetGradingList;
+        private DevExpress.XtraBars.BarButtonItem barBtnApplyGradingList;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
         private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
         private DevExpress.XtraBars.BarButtonItem barBtnSetMark;
@@ -838,16 +831,16 @@
         private DevExpress.XtraBars.BarCheckItem barCkMark;
         private DevExpress.XtraBars.BarCheckItem barCkFlowEffect;
         private DevExpress.XtraBars.BarCheckItem barCkGrading;
-        private DevExpress.XtraBars.BarCheckItem barCkCurrentWorkingCalcuResult;
-        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingLossCurve;
-        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingLossScale;
-        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingPowerAnalysis;
-        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingMultiAnalysis;
+        private DevExpress.XtraBars.BarCheckItem barCkCalcu;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossScale;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingAnaly;
         private DevExpress.XtraBars.BarButtonItem barBtnParallel;
         private DevExpress.XtraBars.BarButtonItem barBtnRepair;
         private DevExpress.XtraBars.BarButtonItem barBtnWorkingList;
-        private DevExpress.XtraBars.Docking.DockPanel dockPanel2;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlWorking;
-        private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingEvaluation;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetVisualVisible;
+        private DevExpress.XtraBars.BarCheckItem barCkDecorator;
     }
 }

--
Gitblit v1.9.3