From 839d9f96be96108dc9ca9359b3db32596e7e2454 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 25 十一月 2024 22:09:18 +0800
Subject: [PATCH] 工况分析

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  629 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 494 insertions(+), 135 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 8410f9f..55b3146 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,13 +32,14 @@
         {
             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();
+            barBtnVisualList = new DevExpress.XtraBars.BarButtonItem();
             barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
@@ -47,26 +48,60 @@
             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();
+            barBtnWorkingParallel = 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();
+            barBtnWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingAnaly = new DevExpress.XtraBars.BarButtonItem();
+            barBtnParallel = new DevExpress.XtraBars.BarButtonItem();
+            barBtnRepair = new DevExpress.XtraBars.BarButtonItem();
+            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();
             ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
             tabPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
-            pageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
-            xhsProjectSimulationQ3dCtrl1 = new XhsProjectSimulationQ3dCtrl();
+            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();
+            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);
@@ -74,10 +109,8 @@
             ((ISupportInitialize)ribbonControl1).BeginInit();
             ((ISupportInitialize)tabPane1).BeginInit();
             tabPane1.SuspendLayout();
-            pageQ3d.SuspendLayout();
             ((ISupportInitialize)dockManager1).BeginInit();
-            docPnlProperty.SuspendLayout();
-            dockPanel1_Container.SuspendLayout();
+            docPnlRight.SuspendLayout();
             docPnlBottom.SuspendLayout();
             ((ISupportInitialize)svgImg32).BeginInit();
             ((ISupportInitialize)rmSet).BeginInit();
@@ -87,42 +120,45 @@
             // 
             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, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnWorkingParallel, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPower, barBtnWorkingAnaly, barBtnParallel, barBtnRepair, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 33;
+            ribbonControl1.MaxItemId = 80;
             ribbonControl1.Name = "ribbonControl1";
             ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
             ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
             ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
             ribbonControl1.ShowQatLocationSelector = false;
             ribbonControl1.ShowToolbarCustomizeItem = false;
-            ribbonControl1.Size = new Size(967, 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
             // 
@@ -132,21 +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;
+            barBtnVisualList.Caption = "鏋勪欢鏄庣粏";
+            barBtnVisualList.Id = 8;
+            barBtnVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnVisualList.ImageOptions.SvgImage");
+            barBtnVisualList.Name = "barBtnVisualList";
+            barBtnVisualList.ItemClick += barBtnVisualList_ItemClick;
             // 
             // barBtnMatchingList
             // 
@@ -154,6 +182,7 @@
             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
@@ -162,6 +191,7 @@
             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;
             // 
             // barBtnSetList
@@ -170,6 +200,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
@@ -207,12 +238,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
             // 
@@ -235,25 +266,282 @@
             barBtnSetJunctionList.Id = 30;
             barBtnSetJunctionList.Name = "barBtnSetJunctionList";
             // 
-            // barBtnFeatCurve
+            // barBtnWorkingParallel
             // 
-            barBtnFeatCurve.Caption = "鎬ц兘鏇茬嚎";
-            barBtnFeatCurve.Id = 31;
-            barBtnFeatCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFeatCurve.ImageOptions.SvgImage");
-            barBtnFeatCurve.Name = "barBtnFeatCurve";
-            barBtnFeatCurve.ItemClick += barBtnFeatCurve_ItemClick;
+            barBtnWorkingParallel.Caption = "骞惰仈鍒嗘瀽";
+            barBtnWorkingParallel.Id = 31;
+            barBtnWorkingParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingParallel.ImageOptions.SvgImage");
+            barBtnWorkingParallel.Name = "barBtnWorkingParallel";
+            barBtnWorkingParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnWorkingParallel.ItemClick += barBtnAnaly_ItemClick;
             // 
             // barBtnSearch
             // 
-            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.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            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.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            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;
+            // 
+            // barBtnWorkingLossScale
+            // 
+            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;
+            // 
+            // 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;
+            // 
+            // barBtnParallel
+            // 
+            barBtnParallel.Caption = "骞惰仈";
+            barBtnParallel.Id = 73;
+            barBtnParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallel.ImageOptions.SvgImage");
+            barBtnParallel.Name = "barBtnParallel";
+            barBtnParallel.ItemClick += barBtnParallel_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[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
             ribbonPage1.Name = "ribbonPage1";
             ribbonPage1.Text = "ribbonPage1";
             // 
@@ -266,25 +554,70 @@
             // 
             // pageGroupModel
             // 
-            pageGroupModel.ItemLinks.Add(barBtnShowHide);
+            pageGroupModel.ItemLinks.Add(barCkDecorator);
+            pageGroupModel.ItemLinks.Add(barBtnSetVisualVisible);
+            pageGroupModel.ItemLinks.Add(barBtnVisualList);
             pageGroupModel.ItemLinks.Add(barBtnSearch);
-            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
             pageGroupModel.ItemLinks.Add(barBtnSetList);
-            pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
+            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(barBtnParallel);
+            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(barBtnWorkingParallel);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossScale);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
+            ribbonPageGroup9.Name = "ribbonPageGroup9";
+            ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
             // 
             // ribbonPageGroup3
             // 
             ribbonPageGroup3.ItemLinks.Add(barBtnSave);
-            ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
+            ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
             ribbonPageGroup3.Name = "ribbonPageGroup3";
             ribbonPageGroup3.Text = "鏇村...";
             // 
@@ -296,14 +629,14 @@
             // tabPane1
             // 
             tabPane1.Controls.Add(tabPageBimface);
-            tabPane1.Controls.Add(pageQ3d);
+            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[] { tabPageBimface, pageQ3d });
-            tabPane1.RegularSize = new Size(692, 340);
+            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
+            tabPane1.RegularSize = new Size(1189, 407);
             tabPane1.SelectedPage = tabPageBimface;
-            tabPane1.Size = new Size(692, 340);
+            tabPane1.Size = new Size(1189, 407);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
@@ -311,73 +644,57 @@
             // 
             tabPageBimface.Caption = "涓夌淮妯″瀷";
             tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(692, 307);
+            tabPageBimface.Size = new Size(1189, 374);
             // 
-            // pageQ3d
+            // tabPageQ3d
             // 
-            pageQ3d.Caption = "姘村姏妯″瀷";
-            pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1);
-            pageQ3d.Name = "pageQ3d";
-            pageQ3d.Size = new Size(692, 307);
-            // 
-            // xhsProjectSimulationQ3dCtrl1
-            // 
-            xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
-            xhsProjectSimulationQ3dCtrl1.Size = new Size(692, 307);
-            xhsProjectSimulationQ3dCtrl1.TabIndex = 0;
-            xhsProjectSimulationQ3dCtrl1.ClickParterEvent += xhsProjectSimulationQ3dCtrl1_ClickParterEvent;
+            tabPageQ3d.Caption = "姘村姏妯″瀷";
+            tabPageQ3d.Name = "tabPageQ3d";
+            tabPageQ3d.Size = new Size(931, 374);
             // 
             // dockManager1
             // 
             dockManager1.Form = this;
-            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlBottom });
+            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlRight, docPnlBottom });
             dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
             // 
-            // 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(692, 128);
-            docPnlProperty.Name = "docPnlProperty";
-            docPnlProperty.OriginalSize = new Size(275, 200);
-            docPnlProperty.Size = new Size(275, 505);
-            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, 476);
-            dockPanel1_Container.TabIndex = 0;
-            // 
-            // xhsProjectSimulationPropertyCtrl1
-            // 
-            xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
-            xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 476);
-            xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
+            controlContainerRight.Location = new Point(4, 26);
+            controlContainerRight.Name = "controlContainerRight";
+            controlContainerRight.Size = new Size(268, 543);
+            controlContainerRight.TabIndex = 0;
             // 
             // docPnlBottom
             // 
             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, 468);
+            docPnlBottom.Location = new Point(0, 535);
             docPnlBottom.Name = "docPnlBottom";
             docPnlBottom.OriginalSize = new Size(200, 165);
-            docPnlBottom.Size = new Size(692, 165);
+            docPnlBottom.Size = new Size(1189, 165);
             docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
             // 
             // controlContainerBottom
             // 
             controlContainerBottom.Location = new Point(3, 27);
             controlContainerBottom.Name = "controlContainerBottom";
-            controlContainerBottom.Size = new Size(686, 135);
+            controlContainerBottom.Size = new Size(1183, 135);
             controlContainerBottom.TabIndex = 0;
             // 
             // svgImg32
@@ -389,17 +706,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;
+            rmSet.BeforePopup += rmSet_BeforePopup;
             // 
             // XhsProjectSimulationCorePage
             // 
@@ -409,18 +737,16 @@
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabPane1);
             Controls.Add(docPnlBottom);
-            Controls.Add(docPnlProperty);
+            Controls.Add(docPnlRight);
             Controls.Add(ribbonControl1);
             Margin = new Padding(2);
             Name = "XhsProjectSimulationCorePage";
-            Size = new Size(967, 633);
+            Size = new Size(1464, 700);
             ((ISupportInitialize)ribbonControl1).EndInit();
             ((ISupportInitialize)tabPane1).EndInit();
             tabPane1.ResumeLayout(false);
-            pageQ3d.ResumeLayout(false);
             ((ISupportInitialize)dockManager1).EndInit();
-            docPnlProperty.ResumeLayout(false);
-            dockPanel1_Container.ResumeLayout(false);
+            docPnlRight.ResumeLayout(false);
             docPnlBottom.ResumeLayout(false);
             ((ISupportInitialize)svgImg32).EndInit();
             ((ISupportInitialize)rmSet).EndInit();
@@ -431,28 +757,24 @@
         #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 tabPageBimface;
-        private DevExpress.XtraBars.Navigation.TabNavigationPage pageQ3d;
+        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 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.BarButtonItem barBtnUnMatchingList;
         private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
         private DevExpress.XtraBars.BarButtonItem barBtnSetList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList;
@@ -460,14 +782,51 @@
         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 DevExpress.XtraBars.BarButtonItem barBtnWorkingParallel;
         private DevExpress.XtraBars.BarButtonItem barBtnSearch;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
         private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
         private DevExpress.XtraBars.Docking.ControlContainer controlContainerBottom;
+        private DevExpress.XtraBars.BarButtonItem 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;
+        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.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 barBtnWorkingLossScale;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingAnaly;
+        private DevExpress.XtraBars.BarButtonItem barBtnParallel;
+        private DevExpress.XtraBars.BarButtonItem barBtnRepair;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingEvaluation;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetVisualVisible;
+        private DevExpress.XtraBars.BarCheckItem barCkDecorator;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5;
+        private DevExpress.XtraBars.BarButtonItem barBtnAddWorking;
     }
 }

--
Gitblit v1.9.3