From 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 10:32:35 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  378 +++++++++++++++++++++++++++++------------------------
 1 files changed, 206 insertions(+), 172 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 4eb11ba..c50e94b 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,17 +32,14 @@
         {
             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();
+            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
             ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
             barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingCalcu = new DevExpress.XtraBars.BarButtonItem();
+            barBtnCalcu = new DevExpress.XtraBars.BarButtonItem();
             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();
+            barBtnVisualList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetPumpList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetValveList = new DevExpress.XtraBars.BarButtonItem();
@@ -53,10 +50,10 @@
             barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingParallel = new DevExpress.XtraBars.BarButtonItem();
+            barBtnPumpAnaly = 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();
@@ -72,29 +69,35 @@
             barBtnSetMonitor = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetMonitorValue = new DevExpress.XtraBars.BarButtonItem();
             barCkMonitor = new DevExpress.XtraBars.BarCheckItem();
-            barEditCurrentWorking = new DevExpress.XtraBars.BarEditItem();
-            repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
             barCkMark = new DevExpress.XtraBars.BarCheckItem();
             barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
             barCkGrading = new DevExpress.XtraBars.BarCheckItem();
-            barCkCalcuLabels = new DevExpress.XtraBars.BarCheckItem();
+            barCkCalcu = new DevExpress.XtraBars.BarCheckItem();
             barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingLossStatistics = new DevExpress.XtraBars.BarButtonItem();
             barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem();
             barBtnWorkingAnaly = new DevExpress.XtraBars.BarButtonItem();
-            barBtnParallel = new DevExpress.XtraBars.BarButtonItem();
+            barBtnPumpParallel = 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();
+            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();
             ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
-            pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            ribPageGroupForScheme = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup9 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
             ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
             tabPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
@@ -121,9 +124,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, 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 });
+            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, barBtnEditScheme, barBtnDeleteScheme, barBtnExportWord });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 77;
+            ribbonControl1.MaxItemId = 85;
             ribbonControl1.Name = "ribbonControl1";
             ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
             ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
@@ -131,7 +134,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, 101);
             ribbonControl1.Toolbar.ShowCustomizeItem = false;
             ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
             // 
@@ -141,16 +144,17 @@
             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;
             // 
-            // barBtnWorkingCalcu
+            // barBtnCalcu
             // 
-            barBtnWorkingCalcu.Caption = "宸ュ喌璁$畻";
-            barBtnWorkingCalcu.Id = 2;
-            barBtnWorkingCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingCalcu.ImageOptions.SvgImage");
-            barBtnWorkingCalcu.Name = "barBtnWorkingCalcu";
-            barBtnWorkingCalcu.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
-            barBtnWorkingCalcu.ItemClick += barBtnHydroCalcu_ItemClick;
+            barBtnCalcu.Caption = "璁$畻";
+            barBtnCalcu.Id = 2;
+            barBtnCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCalcu.ImageOptions.SvgImage");
+            barBtnCalcu.Name = "barBtnCalcu";
+            barBtnCalcu.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+            barBtnCalcu.ItemClick += barBtnCalcu_ItemClick;
             // 
             // barBtnExportInp
             // 
@@ -169,39 +173,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;
-            // 
-            // barBtnMatchingList
-            // 
-            barBtnMatchingList.Caption = "鑷姩鍖归厤";
-            barBtnMatchingList.Id = 10;
-            barBtnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMatchingList.ImageOptions.SvgImage");
-            barBtnMatchingList.Name = "barBtnMatchingList";
-            barBtnMatchingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnMatchingList.ItemClick += barBtnMatchingList_ItemClick;
-            // 
-            // barBtnUnMatchingList
-            // 
-            barBtnUnMatchingList.Caption = "鏈尮閰嶅垪琛�";
-            barBtnUnMatchingList.Id = 19;
-            barBtnUnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUnMatchingList.ImageOptions.SvgImage");
-            barBtnUnMatchingList.Name = "barBtnUnMatchingList";
-            barBtnUnMatchingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnUnMatchingList.ItemClick += barBtnUnMatchingList_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;
             // 
             // barBtnSetList
             // 
@@ -275,14 +253,15 @@
             barBtnSetJunctionList.Id = 30;
             barBtnSetJunctionList.Name = "barBtnSetJunctionList";
             // 
-            // barBtnWorkingParallel
+            // barBtnPumpAnaly
             // 
-            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;
+            barBtnPumpAnaly.Caption = "姘存车鍒嗘瀽";
+            barBtnPumpAnaly.Id = 31;
+            barBtnPumpAnaly.ImageOptions.Image = Xhs.Core.Properties.Resources.pump_run_32;
+            barBtnPumpAnaly.ImageOptions.LargeImage = Xhs.Core.Properties.Resources.pump_run_32;
+            barBtnPumpAnaly.Name = "barBtnPumpAnaly";
+            barBtnPumpAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnPumpAnaly.ItemClick += barBtnPumpAnaly_ItemClick;
             // 
             // barBtnSearch
             // 
@@ -293,22 +272,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
             // 
@@ -324,7 +303,6 @@
             barBtnSetMark.Id = 40;
             barBtnSetMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMark.ImageOptions.SvgImage");
             barBtnSetMark.Name = "barBtnSetMark";
-            barBtnSetMark.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnSetMark.ItemClick += barBtnSetMark_ItemClick;
             // 
             // barBtnSetReservoirList
@@ -398,10 +376,10 @@
             // barBtnSetMonitor
             // 
             barBtnSetMonitor.Caption = "鐩戞祴鐐�";
+            barBtnSetMonitor.Enabled = false;
             barBtnSetMonitor.Id = 56;
             barBtnSetMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitor.ImageOptions.SvgImage");
             barBtnSetMonitor.Name = "barBtnSetMonitor";
-            barBtnSetMonitor.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnSetMonitor.ItemClick += barBtnSetMonitor_ItemClick;
             // 
             // barBtnSetMonitorValue
@@ -421,23 +399,9 @@
             barCkMonitor.Name = "barCkMonitor";
             barCkMonitor.CheckedChanged += barCkMonitor_CheckedChanged;
             // 
-            // barEditCurrentWorking
-            // 
-            barEditCurrentWorking.Caption = "褰撳墠宸ュ喌";
-            barEditCurrentWorking.Edit = repositoryItemImageComboBox1;
-            barEditCurrentWorking.Id = 63;
-            barEditCurrentWorking.Name = "barEditCurrentWorking";
-            barEditCurrentWorking.EditValueChanged += barEditCurrentWorking_EditValueChanged;
-            // 
-            // repositoryItemImageComboBox1
-            // 
-            repositoryItemImageComboBox1.AutoHeight = false;
-            repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
-            repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
-            // 
             // barCkMark
             // 
-            barCkMark.Caption = "鏄剧ず";
+            barCkMark.Caption = "甯歌";
             barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
             barCkMark.Id = 65;
             barCkMark.Name = "barCkMark";
@@ -459,13 +423,13 @@
             barCkGrading.Name = "barCkGrading";
             barCkGrading.CheckedChanged += barCkGrading_CheckedChanged;
             // 
-            // barCkCalcuLabels
+            // barCkCalcu
             // 
-            barCkCalcuLabels.Caption = "璁$畻鏍囩";
-            barCkCalcuLabels.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
-            barCkCalcuLabels.Id = 68;
-            barCkCalcuLabels.Name = "barCkCalcuLabels";
-            barCkCalcuLabels.CheckedChanged += barCkCalcuLabels_CheckedChanged;
+            barCkCalcu.Caption = "璁$畻";
+            barCkCalcu.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+            barCkCalcu.Id = 68;
+            barCkCalcu.Name = "barCkCalcu";
+            barCkCalcu.CheckedChanged += barCkCalcu_CheckedChanged;
             // 
             // barBtnWorkingLossCurve
             // 
@@ -476,18 +440,18 @@
             barBtnWorkingLossCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnWorkingLossCurve.ItemClick += barBtnWorkingLossCurve_ItemClick;
             // 
-            // barBtnWorkingLossScale
+            // barBtnWorkingLossStatistics
             // 
-            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;
+            barBtnWorkingLossStatistics.Caption = "鎹熷け缁熻";
+            barBtnWorkingLossStatistics.Id = 70;
+            barBtnWorkingLossStatistics.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossStatistics.ImageOptions.SvgImage");
+            barBtnWorkingLossStatistics.Name = "barBtnWorkingLossStatistics";
+            barBtnWorkingLossStatistics.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnWorkingLossStatistics.ItemClick += barBtnWorkingLossStatistics_ItemClick;
             // 
             // barBtnWorkingPower
             // 
-            barBtnWorkingPower.Caption = "鑳芥晥鍒嗘瀽";
+            barBtnWorkingPower.Caption = "鑳借�楀垎鏋�";
             barBtnWorkingPower.Id = 71;
             barBtnWorkingPower.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingPower.ImageOptions.SvgImage");
             barBtnWorkingPower.Name = "barBtnWorkingPower";
@@ -503,14 +467,14 @@
             barBtnWorkingAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
             barBtnWorkingAnaly.ItemClick += barBtnWorkingAnaly_ItemClick;
             // 
-            // barBtnParallel
+            // barBtnPumpParallel
             // 
-            barBtnParallel.Caption = "骞惰仈璁$畻";
-            barBtnParallel.Id = 73;
-            barBtnParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallel.ImageOptions.SvgImage");
-            barBtnParallel.Name = "barBtnParallel";
-            barBtnParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnParallel.ItemClick += barBtnParallel_ItemClick;
+            barBtnPumpParallel.Caption = "骞惰仈妯℃嫙";
+            barBtnPumpParallel.Id = 73;
+            barBtnPumpParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpParallel.ImageOptions.SvgImage");
+            barBtnPumpParallel.Name = "barBtnPumpParallel";
+            barBtnPumpParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnPumpParallel.ItemClick += barBtnPumpParallel_ItemClick;
             // 
             // barBtnRepair
             // 
@@ -519,19 +483,10 @@
             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;
+            toolTipItem2.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
+            superToolTip2.Items.Add(toolTipItem2);
+            barBtnRepair.SuperTip = superToolTip2;
             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
             // 
@@ -542,23 +497,87 @@
             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;
+            // 
+            // barBtnAddWorking
+            // 
+            barBtnAddWorking.Caption = "鏂板宸ュ喌";
+            barBtnAddWorking.Enabled = false;
+            barBtnAddWorking.Id = 79;
+            barBtnAddWorking.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAddWorking.ImageOptions.SvgImage");
+            barBtnAddWorking.Name = "barBtnAddWorking";
+            barBtnAddWorking.ItemClick += barBtnAddWorking_ItemClick;
+            // 
+            // barBtnPumpCurve
+            // 
+            barBtnPumpCurve.Caption = "鎬ц兘鏇茬嚎";
+            barBtnPumpCurve.Id = 81;
+            barBtnPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpCurve.ImageOptions.SvgImage");
+            barBtnPumpCurve.Name = "barBtnPumpCurve";
+            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;
+            // 
             // ribbonPage1
             // 
-            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, 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";
             // 
-            // pageGroupMatching
+            // ribPageGroupForScheme
             // 
-            pageGroupMatching.ItemLinks.Add(barBtnMatchingList);
-            pageGroupMatching.ItemLinks.Add(barBtnUnMatchingList);
-            pageGroupMatching.Name = "pageGroupMatching";
-            pageGroupMatching.Text = "鍖归厤";
+            ribPageGroupForScheme.ItemLinks.Add(barBtnEditScheme);
+            ribPageGroupForScheme.ItemLinks.Add(barBtnDeleteScheme);
+            ribPageGroupForScheme.Name = "ribPageGroupForScheme";
+            ribPageGroupForScheme.Text = "鏂规";
             // 
             // 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);
@@ -569,13 +588,14 @@
             // 
             ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
             ribbonPageGroup6.ItemLinks.Add(barCkMark);
+            ribbonPageGroup6.ItemLinks.Add(barCkCalcu);
             ribbonPageGroup6.Name = "ribbonPageGroup6";
             ribbonPageGroup6.Text = "鏍囨敞";
             // 
             // 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,26 +608,31 @@
             ribbonPageGroup7.Name = "ribbonPageGroup7";
             ribbonPageGroup7.Text = "鐩戞祴";
             // 
+            // ribbonPageGroup5
+            // 
+            ribbonPageGroup5.ItemLinks.Add(barBtnPumpCurve);
+            ribbonPageGroup5.ItemLinks.Add(barBtnPumpParallel);
+            ribbonPageGroup5.Name = "ribbonPageGroup5";
+            ribbonPageGroup5.Text = "姘存车";
+            // 
             // ribbonPageGroup2
             // 
             ribbonPageGroup2.ItemLinks.Add(barBtnCheck);
             ribbonPageGroup2.ItemLinks.Add(barBtnRepair);
-            ribbonPageGroup2.ItemLinks.Add(barBtnParallel);
             ribbonPageGroup2.ItemLinks.Add(barBtnExportInp);
-            ribbonPageGroup2.ItemLinks.Add(barBtnWorkingCalcu);
+            ribbonPageGroup2.ItemLinks.Add(barBtnCalcu);
+            ribbonPageGroup2.ItemLinks.Add(barBtnAddWorking);
+            ribbonPageGroup2.ItemLinks.Add(barBtnExportWord);
             ribbonPageGroup2.Name = "ribbonPageGroup2";
             ribbonPageGroup2.Text = "姘村姏璁$畻";
             // 
             // ribbonPageGroup9
             // 
-            ribbonPageGroup9.ItemLinks.Add(barEditCurrentWorking);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingList);
-            ribbonPageGroup9.ItemLinks.Add(barCkCalcuLabels);
+            ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly);
             ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingParallel);
             ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
             ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossScale);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics);
             ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
             ribbonPageGroup9.Name = "ribbonPageGroup9";
             ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
@@ -619,6 +644,12 @@
             ribbonPageGroup3.Name = "ribbonPageGroup3";
             ribbonPageGroup3.Text = "鏇村...";
             // 
+            // repositoryItemImageComboBox1
+            // 
+            repositoryItemImageComboBox1.AutoHeight = false;
+            repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
+            repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
+            // 
             // ribbonPageGroup4
             // 
             ribbonPageGroup4.Name = "ribbonPageGroup4";
@@ -629,12 +660,12 @@
             tabPane1.Controls.Add(tabPageBimface);
             tabPane1.Controls.Add(tabPageQ3d);
             tabPane1.Dock = DockStyle.Fill;
-            tabPane1.Location = new Point(0, 128);
+            tabPane1.Location = new Point(0, 101);
             tabPane1.Name = "tabPane1";
             tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
-            tabPane1.RegularSize = new Size(1666, 407);
+            tabPane1.RegularSize = new Size(1189, 434);
             tabPane1.SelectedPage = tabPageBimface;
-            tabPane1.Size = new Size(1666, 407);
+            tabPane1.Size = new Size(1189, 434);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
@@ -642,7 +673,7 @@
             // 
             tabPageBimface.Caption = "涓夌淮妯″瀷";
             tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(1666, 374);
+            tabPageBimface.Size = new Size(1189, 374);
             // 
             // tabPageQ3d
             // 
@@ -662,19 +693,19 @@
             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, 101);
             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.Size = new Size(275, 599);
             docPnlRight.Text = "灞炴��";
             // 
             // controlContainerRight
             // 
             controlContainerRight.Location = new Point(4, 26);
             controlContainerRight.Name = "controlContainerRight";
-            controlContainerRight.Size = new Size(268, 543);
+            controlContainerRight.Size = new Size(268, 570);
             controlContainerRight.TabIndex = 0;
             // 
             // docPnlBottom
@@ -685,14 +716,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
@@ -734,12 +765,12 @@
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabPane1);
-            Controls.Add(docPnlBottom);
             Controls.Add(docPnlRight);
+            Controls.Add(docPnlBottom);
             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();
@@ -757,17 +788,14 @@
 
         private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
         private DevExpress.XtraBars.BarButtonItem barBtnCheck;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingCalcu;
+        private DevExpress.XtraBars.BarButtonItem barBtnCalcu;
         private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupMatching;
         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;
         private DevExpress.XtraBars.Navigation.TabPane tabPane1;
         private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageBimface;
         private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageQ3d;
@@ -786,13 +814,13 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingParallel;
+        private DevExpress.XtraBars.BarButtonItem barBtnPumpAnaly;
         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;
@@ -806,26 +834,32 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList;
-        public DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
         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.BarEditItem barEditCurrentWorking;
-        private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
         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 barCkCalcuLabels;
+        private DevExpress.XtraBars.BarCheckItem barCkCalcu;
         private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossScale;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossStatistics;
         private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower;
         private DevExpress.XtraBars.BarButtonItem barBtnWorkingAnaly;
-        private DevExpress.XtraBars.BarButtonItem barBtnParallel;
+        private DevExpress.XtraBars.BarButtonItem barBtnPumpParallel;
         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;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5;
+        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;
     }
 }

--
Gitblit v1.9.3