From 9886c494da5adcc9a670e2b7ff2c657a98f27b96 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 28 十一月 2024 14:23:30 +0800
Subject: [PATCH] 导入优化

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  952 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 530 insertions(+), 422 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 4dba630..dd42575 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
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing HStation.WinFrmUI.Xhs;
+
+namespace HStation.WinFrmUI
 {
     partial class XhsProjectSimulationCorePage
     {
@@ -30,82 +32,85 @@
         {
             components = new Container();
             ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectSimulationCorePage));
+            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
             ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
-            barBtnHydroCheck = new DevExpress.XtraBars.BarButtonItem();
-            barBtnHydroCalcu = new DevExpress.XtraBars.BarButtonItem();
-            barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
+            barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
+            barBtnCalcu = new DevExpress.XtraBars.BarButtonItem();
+            barBtnExportInp = new DevExpress.XtraBars.BarButtonItem();
             barBtnSave = new DevExpress.XtraBars.BarButtonItem();
-            barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnShowHide = 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();
             barBtnSetPipeList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetElbowsList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetThreelinkList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnFourlinkList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetFourlinkList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnFeatCurve = new DevExpress.XtraBars.BarButtonItem();
+            barBtnPumpAnaly = new DevExpress.XtraBars.BarButtonItem();
             barBtnSearch = 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();
+            barBtnSetTankList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetWaterboxList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetBluntheadList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetNozzleList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetHydrantList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetMeterList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetCompressorList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetFlowmeterList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetMonitor = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetMonitorValue = new DevExpress.XtraBars.BarButtonItem();
+            barCkMonitor = new DevExpress.XtraBars.BarCheckItem();
+            barCkMark = new DevExpress.XtraBars.BarCheckItem();
+            barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
+            barCkGrading = new DevExpress.XtraBars.BarCheckItem();
+            barCkCalcu = new DevExpress.XtraBars.BarCheckItem();
+            barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingLossStatistics = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingAnaly = new DevExpress.XtraBars.BarButtonItem();
+            barBtnPumpParallel = new DevExpress.XtraBars.BarButtonItem();
+            barBtnRepair = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingEvaluation = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem();
+            barCkDecorator = new DevExpress.XtraBars.BarCheckItem();
+            barBtnAddWorking = new DevExpress.XtraBars.BarButtonItem();
             ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
-            pageGroupMatching = 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();
-            pageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
-            xhsProjectSimulationBimfaceCtrl1 = new XhsProjectSimulationBimfaceCtrl();
-            pageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
-            xhsProjectSimulationQ3dCtrl1 = new XhsProjectSimulationQ3dCtrl();
+            tabPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
+            tabPageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
             dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
-            docPnlProperty = new DevExpress.XtraBars.Docking.DockPanel();
-            dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
-            xhsProjectSimulationPropertyCtrl1 = new XhsProjectSimulationPropertyCtrl();
-            docPnlHydroParterList = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainer3 = new DevExpress.XtraBars.Docking.ControlContainer();
-            hydroParterListCtrl1 = new HydroParterListCtrl();
-            docPnlHydroCalcu = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainer2 = new DevExpress.XtraBars.Docking.ControlContainer();
-            docPnlHydroCheck = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainer1 = new DevExpress.XtraBars.Docking.ControlContainer();
-            xhsProjectSimulationHydroCheckResultCtrl1 = new XhsProjectSimulationHydroCheckResultCtrl();
-            docPnlUnMatchingList = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainer4 = new DevExpress.XtraBars.Docking.ControlContainer();
-            xhsProjectSimulationUnMatchingListCtrl1 = new XhsProjectSimulationUnMatchingListCtrl();
-            docPnlMatchingList = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainer5 = new DevExpress.XtraBars.Docking.ControlContainer();
-            xhsProjectSimulationMatchingListCtrl1 = new XhsProjectSimulationMatchingListCtrl();
-            docPnlSearch = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainer6 = new DevExpress.XtraBars.Docking.ControlContainer();
-            xhsProjectSimulationSearchCtrl1 = new XhsProjectSimulationSearchCtrl();
+            docPnlRight = new DevExpress.XtraBars.Docking.DockPanel();
+            controlContainerRight = new DevExpress.XtraBars.Docking.ControlContainer();
+            docPnlBottom = new DevExpress.XtraBars.Docking.DockPanel();
+            controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
             svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
             rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
-            xhsProjectSimulationCalcuCtrl1 = new XhsProjectSimulationCalcuCtrl();
             ((ISupportInitialize)ribbonControl1).BeginInit();
+            ((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
             ((ISupportInitialize)tabPane1).BeginInit();
             tabPane1.SuspendLayout();
-            pageBimface.SuspendLayout();
-            pageQ3d.SuspendLayout();
             ((ISupportInitialize)dockManager1).BeginInit();
-            docPnlProperty.SuspendLayout();
-            dockPanel1_Container.SuspendLayout();
-            docPnlHydroParterList.SuspendLayout();
-            controlContainer3.SuspendLayout();
-            docPnlHydroCalcu.SuspendLayout();
-            controlContainer2.SuspendLayout();
-            docPnlHydroCheck.SuspendLayout();
-            controlContainer1.SuspendLayout();
-            docPnlUnMatchingList.SuspendLayout();
-            controlContainer4.SuspendLayout();
-            docPnlMatchingList.SuspendLayout();
-            controlContainer5.SuspendLayout();
-            docPnlSearch.SuspendLayout();
-            controlContainer6.SuspendLayout();
+            docPnlRight.SuspendLayout();
+            docPnlBottom.SuspendLayout();
             ((ISupportInitialize)svgImg32).BeginInit();
             ((ISupportInitialize)rmSet).BeginInit();
             SuspendLayout();
@@ -114,42 +119,46 @@
             // 
             ribbonControl1.ExpandCollapseItem.Id = 0;
             ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
-            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnFeatCurve, barBtnSearch });
+            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 });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 33;
+            ribbonControl1.MaxItemId = 81;
             ribbonControl1.Name = "ribbonControl1";
             ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
+            ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
             ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
             ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
             ribbonControl1.ShowQatLocationSelector = false;
             ribbonControl1.ShowToolbarCustomizeItem = false;
-            ribbonControl1.Size = new Size(1166, 128);
+            ribbonControl1.Size = new Size(1464, 128);
             ribbonControl1.Toolbar.ShowCustomizeItem = false;
             ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
             // 
-            // barBtnHydroCheck
+            // barBtnCheck
             // 
-            barBtnHydroCheck.Caption = "鏍¢獙";
-            barBtnHydroCheck.Id = 1;
-            barBtnHydroCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCheck.ImageOptions.SvgImage");
-            barBtnHydroCheck.Name = "barBtnHydroCheck";
-            barBtnHydroCheck.ItemClick += barBtnHydroCheck_ItemClick;
+            barBtnCheck.Caption = "姘村姏妫�鏌�";
+            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;
             // 
-            // barBtnHydroCalcu
+            // barBtnCalcu
             // 
-            barBtnHydroCalcu.Caption = "璁$畻";
-            barBtnHydroCalcu.Id = 2;
-            barBtnHydroCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCalcu.ImageOptions.SvgImage");
-            barBtnHydroCalcu.Name = "barBtnHydroCalcu";
-            barBtnHydroCalcu.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;
             // 
-            // barBtnHydroExportInp
+            // barBtnExportInp
             // 
-            barBtnHydroExportInp.Caption = "瀵煎嚭Inp";
-            barBtnHydroExportInp.Id = 4;
-            barBtnHydroExportInp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroExportInp.ImageOptions.SvgImage");
-            barBtnHydroExportInp.Name = "barBtnHydroExportInp";
-            barBtnHydroExportInp.ItemClick += barBtnHydroExportInp_ItemClick;
+            barBtnExportInp.Caption = "瀵煎嚭Inp鏂囦欢";
+            barBtnExportInp.Id = 4;
+            barBtnExportInp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExportInp.ImageOptions.SvgImage");
+            barBtnExportInp.Name = "barBtnExportInp";
+            barBtnExportInp.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnExportInp.ItemClick += barBtnExportInp_ItemClick;
             // 
             // barBtnSave
             // 
@@ -159,37 +168,13 @@
             barBtnSave.Name = "barBtnSave";
             barBtnSave.ItemClick += barBtnSave_ItemClick;
             // 
-            // barBtnHydroParterList
+            // barBtnVisualList
             // 
-            barBtnHydroParterList.Caption = "鏋勪欢鏄庣粏";
-            barBtnHydroParterList.Id = 8;
-            barBtnHydroParterList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
-            barBtnHydroParterList.Name = "barBtnHydroParterList";
-            barBtnHydroParterList.ItemClick += barBtnHydroParterList_ItemClick;
-            // 
-            // barBtnShowHide
-            // 
-            barBtnShowHide.Caption = "涓�閿樉闅�";
-            barBtnShowHide.Id = 9;
-            barBtnShowHide.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnShowHide.ImageOptions.SvgImage");
-            barBtnShowHide.Name = "barBtnShowHide";
-            barBtnShowHide.ItemClick += barBtnShowHide_ItemClick;
-            // 
-            // barBtnMatchingList
-            // 
-            barBtnMatchingList.Caption = "鑷姩鍖归厤";
-            barBtnMatchingList.Id = 10;
-            barBtnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMatchingList.ImageOptions.SvgImage");
-            barBtnMatchingList.Name = "barBtnMatchingList";
-            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.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
             // 
@@ -197,6 +182,7 @@
             barBtnSetList.Id = 21;
             barBtnSetList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetList.ImageOptions.SvgImage");
             barBtnSetList.Name = "barBtnSetList";
+            barBtnSetList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnSetList.ItemClick += barBtnSetList_ItemClick;
             // 
             // barBtnSetPumpList
@@ -234,12 +220,12 @@
             barBtnSetThreelinkList.Id = 26;
             barBtnSetThreelinkList.Name = "barBtnSetThreelinkList";
             // 
-            // barBtnFourlinkList
+            // barBtnSetFourlinkList
             // 
-            barBtnFourlinkList.Caption = "鍥涢��";
-            barBtnFourlinkList.CloseRadialMenuOnItemClick = true;
-            barBtnFourlinkList.Id = 27;
-            barBtnFourlinkList.Name = "barBtnFourlinkList";
+            barBtnSetFourlinkList.Caption = "鍥涢��";
+            barBtnSetFourlinkList.CloseRadialMenuOnItemClick = true;
+            barBtnSetFourlinkList.Id = 27;
+            barBtnSetFourlinkList.Name = "barBtnSetFourlinkList";
             // 
             // barBtnSetTranslationList
             // 
@@ -262,58 +248,358 @@
             barBtnSetJunctionList.Id = 30;
             barBtnSetJunctionList.Name = "barBtnSetJunctionList";
             // 
-            // barBtnFeatCurve
+            // barBtnPumpAnaly
             // 
-            barBtnFeatCurve.Caption = "鎬ц兘鏇茬嚎";
-            barBtnFeatCurve.Id = 31;
-            barBtnFeatCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFeatCurve.ImageOptions.SvgImage");
-            barBtnFeatCurve.Name = "barBtnFeatCurve";
-            barBtnFeatCurve.ItemClick += barBtnFeatCurve_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 += barBtnAnaly_ItemClick;
             // 
             // barBtnSearch
             // 
-            barBtnSearch.Caption = "鏌ヨ";
+            barBtnSearch.Caption = "鏋勪欢鏌ヨ";
             barBtnSearch.Id = 32;
             barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
             barBtnSearch.Name = "barBtnSearch";
+            barBtnSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnSearch.ItemClick += barBtnSearch_ItemClick;
+            // 
+            // barBtnSetGradingList
+            // 
+            barBtnSetGradingList.Caption = "閰嶇疆";
+            barBtnSetGradingList.Id = 34;
+            barBtnSetGradingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetGradingList.ImageOptions.SvgImage");
+            barBtnSetGradingList.Name = "barBtnSetGradingList";
+            barBtnSetGradingList.ItemClick += barBtnSetGradingList_ItemClick;
+            // 
+            // barBtnApplyGradingList
+            // 
+            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
+            // 
+            barBtnRefresh.Caption = "鍒锋柊";
+            barBtnRefresh.Id = 39;
+            barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
+            barBtnRefresh.Name = "barBtnRefresh";
+            barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
+            // 
+            // barBtnSetMark
+            // 
+            barBtnSetMark.Caption = "璁剧疆";
+            barBtnSetMark.Id = 40;
+            barBtnSetMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMark.ImageOptions.SvgImage");
+            barBtnSetMark.Name = "barBtnSetMark";
+            barBtnSetMark.ItemClick += barBtnSetMark_ItemClick;
+            // 
+            // barBtnSetReservoirList
+            // 
+            barBtnSetReservoirList.Caption = "姘村簱";
+            barBtnSetReservoirList.CloseRadialMenuOnItemClick = true;
+            barBtnSetReservoirList.Id = 41;
+            barBtnSetReservoirList.Name = "barBtnSetReservoirList";
+            // 
+            // barBtnSetTankList
+            // 
+            barBtnSetTankList.Caption = "姘存睜";
+            barBtnSetTankList.CloseRadialMenuOnItemClick = true;
+            barBtnSetTankList.Id = 42;
+            barBtnSetTankList.Name = "barBtnSetTankList";
+            // 
+            // barBtnSetWaterboxList
+            // 
+            barBtnSetWaterboxList.Caption = "姘寸";
+            barBtnSetWaterboxList.CloseRadialMenuOnItemClick = true;
+            barBtnSetWaterboxList.Id = 43;
+            barBtnSetWaterboxList.Name = "barBtnSetWaterboxList";
+            // 
+            // barBtnSetBluntheadList
+            // 
+            barBtnSetBluntheadList.Caption = "闂峰ご";
+            barBtnSetBluntheadList.CloseRadialMenuOnItemClick = true;
+            barBtnSetBluntheadList.Id = 44;
+            barBtnSetBluntheadList.Name = "barBtnSetBluntheadList";
+            // 
+            // barBtnSetNozzleList
+            // 
+            barBtnSetNozzleList.Caption = "鍠峰槾";
+            barBtnSetNozzleList.CloseRadialMenuOnItemClick = true;
+            barBtnSetNozzleList.Id = 45;
+            barBtnSetNozzleList.Name = "barBtnSetNozzleList";
+            // 
+            // barBtnSetHydrantList
+            // 
+            barBtnSetHydrantList.Caption = "娑堢伀鏍�";
+            barBtnSetHydrantList.Id = 46;
+            barBtnSetHydrantList.Name = "barBtnSetHydrantList";
+            // 
+            // barBtnSetMeterList
+            // 
+            barBtnSetMeterList.Caption = "姘磋〃";
+            barBtnSetMeterList.CloseRadialMenuOnItemClick = true;
+            barBtnSetMeterList.Id = 47;
+            barBtnSetMeterList.Name = "barBtnSetMeterList";
+            // 
+            // barBtnSetCompressorList
+            // 
+            barBtnSetCompressorList.Caption = "绌哄帇鏈�";
+            barBtnSetCompressorList.CloseRadialMenuOnItemClick = true;
+            barBtnSetCompressorList.Id = 48;
+            barBtnSetCompressorList.Name = "barBtnSetCompressorList";
+            // 
+            // barBtnSetFlowmeterList
+            // 
+            barBtnSetFlowmeterList.Caption = "娴侀噺璁�";
+            barBtnSetFlowmeterList.CloseRadialMenuOnItemClick = true;
+            barBtnSetFlowmeterList.Id = 49;
+            barBtnSetFlowmeterList.Name = "barBtnSetFlowmeterList";
+            // 
+            // barBtnSetPressmeterList
+            // 
+            barBtnSetPressmeterList.Caption = "鍘嬪姏琛�";
+            barBtnSetPressmeterList.Id = 50;
+            barBtnSetPressmeterList.Name = "barBtnSetPressmeterList";
+            // 
+            // 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.ItemClick += barBtnSetMonitor_ItemClick;
+            // 
+            // barBtnSetMonitorValue
+            // 
+            barBtnSetMonitorValue.Caption = "鐩戞祴鍊�";
+            barBtnSetMonitorValue.Id = 57;
+            barBtnSetMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitorValue.ImageOptions.SvgImage");
+            barBtnSetMonitorValue.Name = "barBtnSetMonitorValue";
+            barBtnSetMonitorValue.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnSetMonitorValue.ItemClick += barBtnSetMonitorValue_ItemClick;
+            // 
+            // barCkMonitor
+            // 
+            barCkMonitor.Caption = "鏄剧ず";
+            barCkMonitor.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+            barCkMonitor.Id = 58;
+            barCkMonitor.Name = "barCkMonitor";
+            barCkMonitor.CheckedChanged += barCkMonitor_CheckedChanged;
+            // 
+            // barCkMark
+            // 
+            barCkMark.Caption = "甯歌";
+            barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+            barCkMark.Id = 65;
+            barCkMark.Name = "barCkMark";
+            barCkMark.CheckedChanged += barCkMark_CheckedChanged;
+            // 
+            // barCkFlowEffect
+            // 
+            barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
+            barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+            barCkFlowEffect.Id = 66;
+            barCkFlowEffect.Name = "barCkFlowEffect";
+            barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged;
+            // 
+            // barCkGrading
+            // 
+            barCkGrading.Caption = "鏄剧ず";
+            barCkGrading.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+            barCkGrading.Id = 67;
+            barCkGrading.Name = "barCkGrading";
+            barCkGrading.CheckedChanged += barCkGrading_CheckedChanged;
+            // 
+            // barCkCalcu
+            // 
+            barCkCalcu.Caption = "璁$畻";
+            barCkCalcu.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+            barCkCalcu.Id = 68;
+            barCkCalcu.Name = "barCkCalcu";
+            barCkCalcu.CheckedChanged += barCkCalcu_CheckedChanged;
+            // 
+            // barBtnWorkingLossCurve
+            // 
+            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;
+            // 
+            // barBtnWorkingLossStatistics
+            // 
+            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.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;
+            // 
+            // barBtnWorkingAnaly
+            // 
+            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;
+            // 
+            // barBtnPumpParallel
+            // 
+            barBtnPumpParallel.Caption = "骞惰仈妯℃嫙";
+            barBtnPumpParallel.Id = 73;
+            barBtnPumpParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpParallel.ImageOptions.SvgImage");
+            barBtnPumpParallel.Name = "barBtnPumpParallel";
+            barBtnPumpParallel.ItemClick += barBtnPumpParallel_ItemClick;
+            // 
+            // barBtnRepair
+            // 
+            barBtnRepair.Caption = "绠$綉淇";
+            barBtnRepair.Id = 74;
+            barBtnRepair.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRepair.ImageOptions.SvgImage");
+            barBtnRepair.Name = "barBtnRepair";
+            barBtnRepair.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            toolTipItem2.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
+            superToolTip2.Items.Add(toolTipItem2);
+            barBtnRepair.SuperTip = superToolTip2;
+            barBtnRepair.ItemClick += barBtnRepair_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;
+            // 
+            // 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;
             // 
             // ribbonPage1
             // 
-            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup2, ribbonPageGroup3 });
+            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
             ribbonPage1.Name = "ribbonPage1";
             ribbonPage1.Text = "ribbonPage1";
             // 
-            // pageGroupMatching
-            // 
-            pageGroupMatching.ItemLinks.Add(barBtnMatchingList);
-            pageGroupMatching.ItemLinks.Add(barBtnUnMatchingList);
-            pageGroupMatching.Name = "pageGroupMatching";
-            pageGroupMatching.Text = "鍖归厤";
-            // 
             // pageGroupModel
             // 
-            pageGroupModel.ItemLinks.Add(barBtnShowHide);
-            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
-            pageGroupModel.ItemLinks.Add(barBtnSetList);
+            pageGroupModel.ItemLinks.Add(barCkDecorator);
+            pageGroupModel.ItemLinks.Add(barBtnSetVisualVisible);
+            pageGroupModel.ItemLinks.Add(barBtnVisualList);
             pageGroupModel.ItemLinks.Add(barBtnSearch);
-            pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
+            pageGroupModel.ItemLinks.Add(barBtnSetList);
+            pageGroupModel.ItemLinks.Add(barCkFlowEffect);
             pageGroupModel.Name = "pageGroupModel";
             pageGroupModel.Text = "妯″瀷";
             // 
+            // ribbonPageGroup6
+            // 
+            ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
+            ribbonPageGroup6.ItemLinks.Add(barCkMark);
+            ribbonPageGroup6.ItemLinks.Add(barCkCalcu);
+            ribbonPageGroup6.Name = "ribbonPageGroup6";
+            ribbonPageGroup6.Text = "鏍囨敞";
+            // 
+            // ribbonPageGroup1
+            // 
+            ribbonPageGroup1.ItemLinks.Add(barBtnSetGradingList);
+            ribbonPageGroup1.ItemLinks.Add(barBtnApplyGradingList);
+            ribbonPageGroup1.ItemLinks.Add(barCkGrading);
+            ribbonPageGroup1.Name = "ribbonPageGroup1";
+            ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
+            // 
+            // ribbonPageGroup7
+            // 
+            ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitor);
+            ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitorValue);
+            ribbonPageGroup7.ItemLinks.Add(barCkMonitor);
+            ribbonPageGroup7.Name = "ribbonPageGroup7";
+            ribbonPageGroup7.Text = "鐩戞祴";
+            // 
+            // ribbonPageGroup5
+            // 
+            ribbonPageGroup5.ItemLinks.Add(barBtnPumpParallel);
+            ribbonPageGroup5.Name = "ribbonPageGroup5";
+            ribbonPageGroup5.Text = "姘存车";
+            // 
             // ribbonPageGroup2
             // 
-            ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
-            ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
+            ribbonPageGroup2.ItemLinks.Add(barBtnCheck);
+            ribbonPageGroup2.ItemLinks.Add(barBtnRepair);
+            ribbonPageGroup2.ItemLinks.Add(barBtnExportInp);
+            ribbonPageGroup2.ItemLinks.Add(barBtnCalcu);
+            ribbonPageGroup2.ItemLinks.Add(barBtnAddWorking);
             ribbonPageGroup2.Name = "ribbonPageGroup2";
-            ribbonPageGroup2.Text = "姘村姏";
+            ribbonPageGroup2.Text = "姘村姏璁$畻";
+            // 
+            // ribbonPageGroup9
+            // 
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
+            ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
+            ribbonPageGroup9.Name = "ribbonPageGroup9";
+            ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
             // 
             // ribbonPageGroup3
             // 
-            ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
             ribbonPageGroup3.ItemLinks.Add(barBtnSave);
+            ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
             ribbonPageGroup3.Name = "ribbonPageGroup3";
             ribbonPageGroup3.Text = "鏇村...";
+            // 
+            // repositoryItemImageComboBox1
+            // 
+            repositoryItemImageComboBox1.AutoHeight = false;
+            repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
+            repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
             // 
             // ribbonPageGroup4
             // 
@@ -322,251 +608,74 @@
             // 
             // tabPane1
             // 
-            tabPane1.Controls.Add(pageBimface);
-            tabPane1.Controls.Add(pageQ3d);
+            tabPane1.Controls.Add(tabPageBimface);
+            tabPane1.Controls.Add(tabPageQ3d);
             tabPane1.Dock = DockStyle.Fill;
             tabPane1.Location = new Point(0, 128);
             tabPane1.Name = "tabPane1";
-            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d });
-            tabPane1.RegularSize = new Size(891, 165);
-            tabPane1.SelectedPage = pageBimface;
-            tabPane1.Size = new Size(891, 165);
+            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
+            tabPane1.RegularSize = new Size(1189, 407);
+            tabPane1.SelectedPage = tabPageBimface;
+            tabPane1.Size = new Size(1189, 407);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
-            // pageBimface
+            // tabPageBimface
             // 
-            pageBimface.Caption = "涓夌淮妯″瀷";
-            pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
-            pageBimface.Name = "pageBimface";
-            pageBimface.Size = new Size(891, 132);
+            tabPageBimface.Caption = "涓夌淮妯″瀷";
+            tabPageBimface.Name = "tabPageBimface";
+            tabPageBimface.Size = new Size(1189, 374);
             // 
-            // xhsProjectSimulationBimfaceCtrl1
+            // tabPageQ3d
             // 
-            xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
-            xhsProjectSimulationBimfaceCtrl1.Size = new Size(891, 132);
-            xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
-            xhsProjectSimulationBimfaceCtrl1.HydroClickEvent += xhsProjectSimulationBimfaceCtrl1_HydroClickEvent;
-            xhsProjectSimulationBimfaceCtrl1.LoadCompletedEvent += xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent;
-            // 
-            // pageQ3d
-            // 
-            pageQ3d.Caption = "姘村姏妯″瀷";
-            pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1);
-            pageQ3d.Name = "pageQ3d";
-            pageQ3d.Size = new Size(886, 167);
-            // 
-            // xhsProjectSimulationQ3dCtrl1
-            // 
-            xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
-            xhsProjectSimulationQ3dCtrl1.Size = new Size(886, 167);
-            xhsProjectSimulationQ3dCtrl1.TabIndex = 0;
+            tabPageQ3d.Caption = "姘村姏妯″瀷";
+            tabPageQ3d.Name = "tabPageQ3d";
+            tabPageQ3d.Size = new Size(931, 374);
             // 
             // dockManager1
             // 
             dockManager1.Form = this;
-            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck, docPnlUnMatchingList, docPnlMatchingList, docPnlSearch });
+            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" });
             // 
-            // docPnlProperty
+            // docPnlRight
             // 
-            docPnlProperty.Controls.Add(dockPanel1_Container);
-            docPnlProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
-            docPnlProperty.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
-            docPnlProperty.Location = new Point(891, 128);
-            docPnlProperty.Name = "docPnlProperty";
-            docPnlProperty.OriginalSize = new Size(275, 200);
-            docPnlProperty.Size = new Size(275, 700);
-            docPnlProperty.Text = "灞炴��";
+            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(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 = "灞炴��";
             // 
-            // dockPanel1_Container
+            // controlContainerRight
             // 
-            dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
-            dockPanel1_Container.Location = new Point(4, 26);
-            dockPanel1_Container.Name = "dockPanel1_Container";
-            dockPanel1_Container.Size = new Size(268, 671);
-            dockPanel1_Container.TabIndex = 0;
+            controlContainerRight.Location = new Point(4, 26);
+            controlContainerRight.Name = "controlContainerRight";
+            controlContainerRight.Size = new Size(268, 543);
+            controlContainerRight.TabIndex = 0;
             // 
-            // xhsProjectSimulationPropertyCtrl1
+            // docPnlBottom
             // 
-            xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
-            xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 671);
-            xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
+            docPnlBottom.Controls.Add(controlContainerBottom);
+            docPnlBottom.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
+            docPnlBottom.ID = new Guid("2baf4268-45b9-4b56-9f84-98580a0109e5");
+            docPnlBottom.Location = new Point(0, 535);
+            docPnlBottom.Name = "docPnlBottom";
+            docPnlBottom.OriginalSize = new Size(200, 165);
+            docPnlBottom.Size = new Size(1189, 165);
+            docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
             // 
-            // docPnlHydroParterList
+            // controlContainerBottom
             // 
-            docPnlHydroParterList.Controls.Add(controlContainer3);
-            docPnlHydroParterList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
-            docPnlHydroParterList.FloatVertical = true;
-            docPnlHydroParterList.ID = new Guid("facc1bde-3cf7-455c-b59c-8377daa6b90e");
-            docPnlHydroParterList.Location = new Point(0, 749);
-            docPnlHydroParterList.Name = "docPnlHydroParterList";
-            docPnlHydroParterList.OriginalSize = new Size(200, 79);
-            docPnlHydroParterList.Size = new Size(891, 79);
-            docPnlHydroParterList.Text = "鏋勪欢鏄庣粏";
-            // 
-            // controlContainer3
-            // 
-            controlContainer3.Controls.Add(hydroParterListCtrl1);
-            controlContainer3.Location = new Point(3, 27);
-            controlContainer3.Name = "controlContainer3";
-            controlContainer3.Size = new Size(885, 49);
-            controlContainer3.TabIndex = 0;
-            // 
-            // hydroParterListCtrl1
-            // 
-            hydroParterListCtrl1.Dock = DockStyle.Fill;
-            hydroParterListCtrl1.HidePageWhenListIsNull = true;
-            hydroParterListCtrl1.Location = new Point(0, 0);
-            hydroParterListCtrl1.Name = "hydroParterListCtrl1";
-            hydroParterListCtrl1.Size = new Size(885, 49);
-            hydroParterListCtrl1.TabIndex = 0;
-            hydroParterListCtrl1.HydroClickEvent += hydroParterListCtrl1_HydroClickEvent;
-            // 
-            // docPnlHydroCalcu
-            // 
-            docPnlHydroCalcu.Controls.Add(controlContainer2);
-            docPnlHydroCalcu.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
-            docPnlHydroCalcu.FloatVertical = true;
-            docPnlHydroCalcu.ID = new Guid("ac7055c0-e9fe-40c2-bf51-83dde5710cd4");
-            docPnlHydroCalcu.Location = new Point(0, 665);
-            docPnlHydroCalcu.Name = "docPnlHydroCalcu";
-            docPnlHydroCalcu.OriginalSize = new Size(200, 84);
-            docPnlHydroCalcu.Size = new Size(891, 84);
-            docPnlHydroCalcu.Text = "姘村姏璁$畻";
-            // 
-            // controlContainer2
-            // 
-            controlContainer2.Controls.Add(xhsProjectSimulationCalcuCtrl1);
-            controlContainer2.Location = new Point(3, 27);
-            controlContainer2.Name = "controlContainer2";
-            controlContainer2.Size = new Size(885, 54);
-            controlContainer2.TabIndex = 0;
-            // 
-            // docPnlHydroCheck
-            // 
-            docPnlHydroCheck.Controls.Add(controlContainer1);
-            docPnlHydroCheck.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
-            docPnlHydroCheck.FloatVertical = true;
-            docPnlHydroCheck.ID = new Guid("dee18895-8b3d-44cd-9001-28bee516095d");
-            docPnlHydroCheck.Location = new Point(0, 577);
-            docPnlHydroCheck.Name = "docPnlHydroCheck";
-            docPnlHydroCheck.OriginalSize = new Size(200, 88);
-            docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
-            docPnlHydroCheck.SavedIndex = 1;
-            docPnlHydroCheck.Size = new Size(891, 88);
-            docPnlHydroCheck.Text = "姘村姏鏍¢獙";
-            // 
-            // controlContainer1
-            // 
-            controlContainer1.Controls.Add(xhsProjectSimulationHydroCheckResultCtrl1);
-            controlContainer1.Location = new Point(3, 27);
-            controlContainer1.Name = "controlContainer1";
-            controlContainer1.Size = new Size(885, 58);
-            controlContainer1.TabIndex = 0;
-            // 
-            // xhsProjectSimulationHydroCheckResultCtrl1
-            // 
-            xhsProjectSimulationHydroCheckResultCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationHydroCheckResultCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationHydroCheckResultCtrl1.Name = "xhsProjectSimulationHydroCheckResultCtrl1";
-            xhsProjectSimulationHydroCheckResultCtrl1.Size = new Size(885, 58);
-            xhsProjectSimulationHydroCheckResultCtrl1.TabIndex = 0;
-            xhsProjectSimulationHydroCheckResultCtrl1.HydroClickEvent += xhsProjectSimulationHydroCheckResultCtrl1_HydroClickEvent;
-            // 
-            // docPnlUnMatchingList
-            // 
-            docPnlUnMatchingList.Controls.Add(controlContainer4);
-            docPnlUnMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
-            docPnlUnMatchingList.FloatVertical = true;
-            docPnlUnMatchingList.ID = new Guid("fdc5c4e2-7bd3-4114-90a6-3cd0ed365103");
-            docPnlUnMatchingList.Location = new Point(0, 494);
-            docPnlUnMatchingList.Name = "docPnlUnMatchingList";
-            docPnlUnMatchingList.OriginalSize = new Size(200, 83);
-            docPnlUnMatchingList.Size = new Size(891, 83);
-            docPnlUnMatchingList.Text = "鏈尮閰嶅垪琛�";
-            // 
-            // controlContainer4
-            // 
-            controlContainer4.Controls.Add(xhsProjectSimulationUnMatchingListCtrl1);
-            controlContainer4.Location = new Point(3, 27);
-            controlContainer4.Name = "controlContainer4";
-            controlContainer4.Size = new Size(885, 53);
-            controlContainer4.TabIndex = 0;
-            // 
-            // xhsProjectSimulationUnMatchingListCtrl1
-            // 
-            xhsProjectSimulationUnMatchingListCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationUnMatchingListCtrl1.HidePageWhenListIsNull = true;
-            xhsProjectSimulationUnMatchingListCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationUnMatchingListCtrl1.Name = "xhsProjectSimulationUnMatchingListCtrl1";
-            xhsProjectSimulationUnMatchingListCtrl1.Size = new Size(885, 53);
-            xhsProjectSimulationUnMatchingListCtrl1.TabIndex = 0;
-            xhsProjectSimulationUnMatchingListCtrl1.HydroClickEvent += xhsProjectSimulationUnMatchingListCtrl1_HydroClickEvent;
-            xhsProjectSimulationUnMatchingListCtrl1.ViewModelEvent += xhsProjectSimulationUnMatchingListCtrl1_ViewModelEvent;
-            // 
-            // docPnlMatchingList
-            // 
-            docPnlMatchingList.Controls.Add(controlContainer5);
-            docPnlMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
-            docPnlMatchingList.FloatVertical = true;
-            docPnlMatchingList.ID = new Guid("19fbbff8-5202-46bc-b9f4-472249e3c49a");
-            docPnlMatchingList.Location = new Point(0, 399);
-            docPnlMatchingList.Name = "docPnlMatchingList";
-            docPnlMatchingList.OriginalSize = new Size(200, 95);
-            docPnlMatchingList.Size = new Size(891, 95);
-            docPnlMatchingList.Text = "鍖归厤鍒楄〃";
-            // 
-            // controlContainer5
-            // 
-            controlContainer5.Controls.Add(xhsProjectSimulationMatchingListCtrl1);
-            controlContainer5.Location = new Point(3, 27);
-            controlContainer5.Name = "controlContainer5";
-            controlContainer5.Size = new Size(885, 65);
-            controlContainer5.TabIndex = 0;
-            // 
-            // xhsProjectSimulationMatchingListCtrl1
-            // 
-            xhsProjectSimulationMatchingListCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationMatchingListCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationMatchingListCtrl1.Name = "xhsProjectSimulationMatchingListCtrl1";
-            xhsProjectSimulationMatchingListCtrl1.Size = new Size(885, 65);
-            xhsProjectSimulationMatchingListCtrl1.TabIndex = 0;
-            xhsProjectSimulationMatchingListCtrl1.HydroClickEvent += xhsProjectSimulationMatchingListCtrl1_HydroClickEvent;
-            xhsProjectSimulationMatchingListCtrl1.ApplyMatchingEvent += xhsProjectSimulationMatchingListCtrl1_ApplyMatchingEvent;
-            // 
-            // docPnlSearch
-            // 
-            docPnlSearch.Controls.Add(controlContainer6);
-            docPnlSearch.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
-            docPnlSearch.ID = new Guid("35c854bb-37b4-4601-8ca5-60dee4323ca2");
-            docPnlSearch.Location = new Point(0, 293);
-            docPnlSearch.Name = "docPnlSearch";
-            docPnlSearch.OriginalSize = new Size(200, 106);
-            docPnlSearch.Size = new Size(891, 106);
-            docPnlSearch.Text = "鏌ヨ";
-            // 
-            // controlContainer6
-            // 
-            controlContainer6.Controls.Add(xhsProjectSimulationSearchCtrl1);
-            controlContainer6.Location = new Point(3, 27);
-            controlContainer6.Name = "controlContainer6";
-            controlContainer6.Size = new Size(885, 76);
-            controlContainer6.TabIndex = 0;
-            // 
-            // xhsProjectSimulationSearchCtrl1
-            // 
-            xhsProjectSimulationSearchCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationSearchCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationSearchCtrl1.Name = "xhsProjectSimulationSearchCtrl1";
-            xhsProjectSimulationSearchCtrl1.Size = new Size(885, 76);
-            xhsProjectSimulationSearchCtrl1.TabIndex = 0;
+            controlContainerBottom.Location = new Point(3, 27);
+            controlContainerBottom.Name = "controlContainerBottom";
+            controlContainerBottom.Size = new Size(1183, 135);
+            controlContainerBottom.TabIndex = 0;
             // 
             // svgImg32
             // 
@@ -577,25 +686,28 @@
             // 
             rmSet.AllowGlyphSkinning = true;
             rmSet.Glyph = (Image)resources.GetObject("rmSet.Glyph");
+            rmSet.ItemLinks.Add(barBtnSetReservoirList);
+            rmSet.ItemLinks.Add(barBtnSetTankList);
+            rmSet.ItemLinks.Add(barBtnSetWaterboxList);
             rmSet.ItemLinks.Add(barBtnSetPumpList);
             rmSet.ItemLinks.Add(barBtnSetValveList);
             rmSet.ItemLinks.Add(barBtnSetPipeList);
+            rmSet.ItemLinks.Add(barBtnSetNozzleList);
+            rmSet.ItemLinks.Add(barBtnSetHydrantList);
+            rmSet.ItemLinks.Add(barBtnSetBluntheadList);
             rmSet.ItemLinks.Add(barBtnSetElbowsList);
             rmSet.ItemLinks.Add(barBtnSetThreelinkList);
-            rmSet.ItemLinks.Add(barBtnFourlinkList);
+            rmSet.ItemLinks.Add(barBtnSetFourlinkList);
+            rmSet.ItemLinks.Add(barBtnSetMeterList);
+            rmSet.ItemLinks.Add(barBtnSetFlowmeterList);
+            rmSet.ItemLinks.Add(barBtnSetPressmeterList);
             rmSet.ItemLinks.Add(barBtnSetTranslationList);
             rmSet.ItemLinks.Add(barBtnSetExchangerList);
+            rmSet.ItemLinks.Add(barBtnSetCompressorList);
             rmSet.ItemLinks.Add(barBtnSetJunctionList);
             rmSet.Name = "rmSet";
             rmSet.Ribbon = ribbonControl1;
-            // 
-            // xhsProjectSimulationCalcuCtrl1
-            // 
-            xhsProjectSimulationCalcuCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationCalcuCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationCalcuCtrl1.Name = "xhsProjectSimulationCalcuCtrl1";
-            xhsProjectSimulationCalcuCtrl1.Size = new Size(885, 54);
-            xhsProjectSimulationCalcuCtrl1.TabIndex = 0;
+            rmSet.BeforePopup += rmSet_BeforePopup;
             // 
             // XhsProjectSimulationCorePage
             // 
@@ -604,37 +716,19 @@
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabPane1);
-            Controls.Add(docPnlSearch);
-            Controls.Add(docPnlMatchingList);
-            Controls.Add(docPnlUnMatchingList);
-            Controls.Add(docPnlHydroCheck);
-            Controls.Add(docPnlHydroCalcu);
-            Controls.Add(docPnlHydroParterList);
-            Controls.Add(docPnlProperty);
+            Controls.Add(docPnlBottom);
+            Controls.Add(docPnlRight);
             Controls.Add(ribbonControl1);
             Margin = new Padding(2);
             Name = "XhsProjectSimulationCorePage";
-            Size = new Size(1166, 828);
+            Size = new Size(1464, 700);
             ((ISupportInitialize)ribbonControl1).EndInit();
+            ((ISupportInitialize)repositoryItemImageComboBox1).EndInit();
             ((ISupportInitialize)tabPane1).EndInit();
             tabPane1.ResumeLayout(false);
-            pageBimface.ResumeLayout(false);
-            pageQ3d.ResumeLayout(false);
             ((ISupportInitialize)dockManager1).EndInit();
-            docPnlProperty.ResumeLayout(false);
-            dockPanel1_Container.ResumeLayout(false);
-            docPnlHydroParterList.ResumeLayout(false);
-            controlContainer3.ResumeLayout(false);
-            docPnlHydroCalcu.ResumeLayout(false);
-            controlContainer2.ResumeLayout(false);
-            docPnlHydroCheck.ResumeLayout(false);
-            controlContainer1.ResumeLayout(false);
-            docPnlUnMatchingList.ResumeLayout(false);
-            controlContainer4.ResumeLayout(false);
-            docPnlMatchingList.ResumeLayout(false);
-            controlContainer5.ResumeLayout(false);
-            docPnlSearch.ResumeLayout(false);
-            controlContainer6.ResumeLayout(false);
+            docPnlRight.ResumeLayout(false);
+            docPnlBottom.ResumeLayout(false);
             ((ISupportInitialize)svgImg32).EndInit();
             ((ISupportInitialize)rmSet).EndInit();
             ResumeLayout(false);
@@ -644,60 +738,74 @@
         #endregion
 
         private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroCheck;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroCalcu;
+        private DevExpress.XtraBars.BarButtonItem barBtnCheck;
+        private DevExpress.XtraBars.BarButtonItem barBtnCalcu;
         private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupMatching;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroExportInp;
+        private DevExpress.XtraBars.BarButtonItem barBtnExportInp;
         private DevExpress.XtraBars.BarButtonItem barBtnSave;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroParterList;
-        private DevExpress.XtraBars.BarButtonItem barBtnShowHide;
+        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 pageBimface;
-        private DevExpress.XtraBars.Navigation.TabNavigationPage pageQ3d;
+        private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageBimface;
+        private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageQ3d;
         private DevExpress.XtraBars.Docking.DockManager dockManager1;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlProperty;
-        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
-        private XhsProjectSimulationBimfaceCtrl xhsProjectSimulationBimfaceCtrl1;
-        private XhsProjectSimulationQ3dCtrl xhsProjectSimulationQ3dCtrl1;
-        private XhsProjectSimulationPropertyCtrl xhsProjectSimulationPropertyCtrl1;
+        private DevExpress.XtraBars.Docking.DockPanel docPnlRight;
+        private DevExpress.XtraBars.Docking.ControlContainer controlContainerRight;
         private DevExpress.Utils.SvgImageCollection svgImg32;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlHydroCheck;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainer1;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlHydroCalcu;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainer2;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlHydroParterList;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainer3;
-        private HydroParterListCtrl hydroParterListCtrl1;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlUnMatchingList;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainer4;
-        private DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlMatchingList;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainer5;
-        private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
         private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
-        private XhsProjectSimulationMatchingListCtrl xhsProjectSimulationMatchingListCtrl1;
         private DevExpress.XtraBars.BarButtonItem barBtnSetList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetValveList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetPipeList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetElbowsList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetThreelinkList;
-        private DevExpress.XtraBars.BarButtonItem barBtnFourlinkList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetFourlinkList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
-        private DevExpress.XtraBars.BarButtonItem barBtnFeatCurve;
-        private XhsProjectSimulationHydroCheckResultCtrl xhsProjectSimulationHydroCheckResultCtrl1;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlSearch;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainer6;
-        private XhsProjectSimulationSearchCtrl xhsProjectSimulationSearchCtrl1;
+        private DevExpress.XtraBars.BarButtonItem barBtnPumpAnaly;
         private DevExpress.XtraBars.BarButtonItem barBtnSearch;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
-        private XhsProjectSimulationCalcuCtrl xhsProjectSimulationCalcuCtrl1;
+        private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
+        private DevExpress.XtraBars.Docking.ControlContainer controlContainerBottom;
+        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;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetReservoirList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetTankList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetWaterboxList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetBluntheadList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetNozzleList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetHydrantList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetMeterList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup6;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup7;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetMonitor;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetMonitorValue;
+        private DevExpress.XtraBars.BarCheckItem barCkMonitor;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup9;
+        private DevExpress.XtraBars.BarCheckItem barCkMark;
+        private DevExpress.XtraBars.BarCheckItem barCkFlowEffect;
+        private DevExpress.XtraBars.BarCheckItem barCkGrading;
+        private DevExpress.XtraBars.BarCheckItem barCkCalcu;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossStatistics;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingAnaly;
+        private DevExpress.XtraBars.BarButtonItem barBtnPumpParallel;
+        private DevExpress.XtraBars.BarButtonItem barBtnRepair;
+        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;
     }
 }

--
Gitblit v1.9.3