From 142473031b3728bc0999d5be3b63bc5b62047504 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 21 十一月 2024 15:34:40 +0800
Subject: [PATCH] 核心界面修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  185 +++++++++++++++++++++++++++------------------
 1 files changed, 111 insertions(+), 74 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 3fca934..0e93ddb 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
@@ -40,7 +40,6 @@
             barBtnExportInp = new DevExpress.XtraBars.BarButtonItem();
             barBtnSave = new DevExpress.XtraBars.BarButtonItem();
             barBtnHydroVisualList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
             barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
@@ -53,7 +52,7 @@
             barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnParallelAnaly = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingParallel = new DevExpress.XtraBars.BarButtonItem();
             barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
             barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
             barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
@@ -74,17 +73,20 @@
             barCkMonitor = new DevExpress.XtraBars.BarCheckItem();
             barEditCurrentWorking = new DevExpress.XtraBars.BarEditItem();
             repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
-            barBtnWorkingCompare = new DevExpress.XtraBars.BarButtonItem();
             barCkMark = new DevExpress.XtraBars.BarCheckItem();
             barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
             barCkGrading = new DevExpress.XtraBars.BarCheckItem();
-            barCkCalcuResult = new DevExpress.XtraBars.BarCheckItem();
+            barCkCalcuLabels = new DevExpress.XtraBars.BarCheckItem();
             barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
             barBtnWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingPowerAnalysis = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingMulti = 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();
@@ -120,9 +122,9 @@
             // 
             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, barBtnParallelAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barBtnWorkingCompare, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcuResult, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPowerAnalysis, barBtnWorkingMulti, barBtnParallel, barBtnRepair });
+            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnWorkingCalcu, barBtnExportInp, barBtnSave, barBtnHydroVisualList, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnWorkingParallel, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcuLabels, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPower, barBtnWorkingAnaly, barBtnParallel, barBtnRepair, barBtnWorkingList, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 75;
+            ribbonControl1.MaxItemId = 79;
             ribbonControl1.Name = "ribbonControl1";
             ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
             ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
@@ -130,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;
             // 
@@ -175,14 +177,6 @@
             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;
             // 
             // barBtnMatchingList
             // 
@@ -274,14 +268,14 @@
             barBtnSetJunctionList.Id = 30;
             barBtnSetJunctionList.Name = "barBtnSetJunctionList";
             // 
-            // barBtnParallelAnaly
+            // barBtnWorkingParallel
             // 
-            barBtnParallelAnaly.Caption = "骞惰仈鍒嗘瀽";
-            barBtnParallelAnaly.Id = 31;
-            barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallelAnaly.ImageOptions.SvgImage");
-            barBtnParallelAnaly.Name = "barBtnParallelAnaly";
-            barBtnParallelAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnParallelAnaly.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
             // 
@@ -415,17 +409,18 @@
             // 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;
             // 
             // barEditCurrentWorking
             // 
-            barEditCurrentWorking.Caption = "宸ュ喌";
+            barEditCurrentWorking.Caption = "褰撳墠宸ュ喌";
             barEditCurrentWorking.Edit = repositoryItemImageComboBox1;
             barEditCurrentWorking.Id = 63;
             barEditCurrentWorking.Name = "barEditCurrentWorking";
+            barEditCurrentWorking.EditValueChanged += barEditCurrentWorking_EditValueChanged;
             // 
             // repositoryItemImageComboBox1
             // 
@@ -433,18 +428,10 @@
             repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
             repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
             // 
-            // barBtnWorkingCompare
-            // 
-            barBtnWorkingCompare.Caption = "宸ュ喌瀵规瘮";
-            barBtnWorkingCompare.Id = 64;
-            barBtnWorkingCompare.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingCompare.ImageOptions.SvgImage");
-            barBtnWorkingCompare.Name = "barBtnWorkingCompare";
-            barBtnWorkingCompare.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
-            // 
             // 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;
@@ -452,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;
@@ -460,17 +447,18 @@
             // 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;
             // 
-            // barCkCalcuResult
+            // barCkCalcuLabels
             // 
-            barCkCalcuResult.Caption = "鏄剧ず";
-            barCkCalcuResult.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
-            barCkCalcuResult.Id = 68;
-            barCkCalcuResult.Name = "barCkCalcuResult";
+            barCkCalcuLabels.Caption = "璁$畻鏍囩";
+            barCkCalcuLabels.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+            barCkCalcuLabels.Id = 68;
+            barCkCalcuLabels.Name = "barCkCalcuLabels";
+            barCkCalcuLabels.CheckedChanged += barCkCalcuLabels_CheckedChanged;
             // 
             // barBtnWorkingLossCurve
             // 
@@ -479,6 +467,7 @@
             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;
             // 
             // barBtnWorkingLossScale
             // 
@@ -487,26 +476,29 @@
             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;
             // 
-            // barBtnWorkingPowerAnalysis
+            // barBtnWorkingPower
             // 
-            barBtnWorkingPowerAnalysis.Caption = "鑳芥晥鍒嗘瀽";
-            barBtnWorkingPowerAnalysis.Id = 71;
-            barBtnWorkingPowerAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingPowerAnalysis.ImageOptions.SvgImage");
-            barBtnWorkingPowerAnalysis.Name = "barBtnWorkingPowerAnalysis";
-            barBtnWorkingPowerAnalysis.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;
             // 
-            // barBtnWorkingMulti
+            // barBtnWorkingAnaly
             // 
-            barBtnWorkingMulti.Caption = "缁煎悎鍒嗘瀽";
-            barBtnWorkingMulti.Id = 72;
-            barBtnWorkingMulti.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingMulti.ImageOptions.SvgImage");
-            barBtnWorkingMulti.Name = "barBtnWorkingMulti";
-            barBtnWorkingMulti.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
             // 
-            barBtnParallel.Caption = "骞惰仈鍒嗘瀽";
+            barBtnParallel.Caption = "骞惰仈璁$畻";
             barBtnParallel.Id = 73;
             barBtnParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallel.ImageOptions.SvgImage");
             barBtnParallel.Name = "barBtnParallel";
@@ -525,6 +517,44 @@
             barBtnRepair.SuperTip = superToolTip1;
             barBtnRepair.ItemClick += barBtnRepair_ItemClick;
             // 
+            // barBtnWorkingList
+            // 
+            barBtnWorkingList.Caption = "宸ュ喌鍒楄〃";
+            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
             // 
             ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
@@ -540,7 +570,8 @@
             // 
             // pageGroupModel
             // 
-            pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
+            pageGroupModel.ItemLinks.Add(barCkDecorator);
+            pageGroupModel.ItemLinks.Add(barBtnSetVisualVisible);
             pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
             pageGroupModel.ItemLinks.Add(barBtnSearch);
             pageGroupModel.ItemLinks.Add(barBtnSetList);
@@ -584,13 +615,14 @@
             // ribbonPageGroup9
             // 
             ribbonPageGroup9.ItemLinks.Add(barEditCurrentWorking);
-            ribbonPageGroup9.ItemLinks.Add(barCkCalcuResult);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingList);
+            ribbonPageGroup9.ItemLinks.Add(barCkCalcuLabels);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingParallel);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
             ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
             ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossScale);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPowerAnalysis);
-            ribbonPageGroup9.ItemLinks.Add(barBtnParallelAnaly);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingMulti);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingCompare);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
             ribbonPageGroup9.Name = "ribbonPageGroup9";
             ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
             // 
@@ -614,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";
             // 
@@ -624,7 +656,7 @@
             // 
             tabPageBimface.Caption = "涓夌淮妯″瀷";
             tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(1666, 374);
+            tabPageBimface.Size = new Size(1189, 374);
             // 
             // tabPageQ3d
             // 
@@ -642,10 +674,13 @@
             // 
             docPnlRight.Controls.Add(controlContainerRight);
             docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+            docPnlRight.FloatVertical = true;
             docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
-            docPnlRight.Location = new Point(1666, 128);
+            docPnlRight.Location = new Point(1189, 128);
             docPnlRight.Name = "docPnlRight";
             docPnlRight.OriginalSize = new Size(275, 200);
+            docPnlRight.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+            docPnlRight.SavedIndex = 0;
             docPnlRight.Size = new Size(275, 572);
             docPnlRight.Text = "灞炴��";
             // 
@@ -664,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
@@ -718,7 +753,7 @@
             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();
@@ -743,7 +778,6 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSave;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
         private DevExpress.XtraBars.BarButtonItem barBtnHydroVisualList;
-        private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
         private DevExpress.XtraBars.BarButtonItem barBtnMatchingList;
@@ -765,7 +799,7 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
-        private DevExpress.XtraBars.BarButtonItem barBtnParallelAnaly;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingParallel;
         private DevExpress.XtraBars.BarButtonItem barBtnSearch;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
         private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
@@ -793,17 +827,20 @@
         private DevExpress.XtraBars.BarCheckItem barCkMonitor;
         private DevExpress.XtraBars.BarEditItem barEditCurrentWorking;
         private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingCompare;
         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 barCkCalcuResult;
+        private DevExpress.XtraBars.BarCheckItem barCkCalcuLabels;
         private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
         private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossScale;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingPowerAnalysis;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingMulti;
+        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.BarButtonItem barBtnWorkingEvaluation;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetVisualVisible;
+        private DevExpress.XtraBars.BarCheckItem barCkDecorator;
     }
 }

--
Gitblit v1.9.3