From bc8d900f5ca26216dae0e1be243ab6237790873b Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 21 十月 2024 10:56:42 +0800
Subject: [PATCH] 部分调试升级

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  540 ++++++++++++++++++++++-------------------------------------
 1 files changed, 203 insertions(+), 337 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 191631b..edeb645 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
     {
@@ -36,7 +38,7 @@
             barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
             barBtnSave = new DevExpress.XtraBars.BarButtonItem();
             barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnShowHide = new DevExpress.XtraBars.BarButtonItem();
+            barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
             barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
@@ -49,78 +51,57 @@
             barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnFeatCurve = new DevExpress.XtraBars.BarButtonItem();
+            barBtnAnaly = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
+            barBtnMarkSet = new DevExpress.XtraBars.BarButtonItem();
+            barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
+            barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
+            barBtnGradingCancel = new DevExpress.XtraBars.BarButtonItem();
+            barBtnMarkCancel = new DevExpress.XtraBars.BarButtonItem();
+            barBtnProperty = new DevExpress.XtraBars.BarButtonItem();
+            barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
             ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
+            pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             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();
-            tabPageL3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
-            xhsProjectSimulationL3dCtrl1 = new XhsProjectSimulationL3dCtrl();
+            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();
-            xhsProjectSimulationHydroCalcuFailedCtrl1 = new XhsProjectSimulationHydroCalcuFailedCtrl();
-            docPnlHydroCheck = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainer1 = new DevExpress.XtraBars.Docking.ControlContainer();
-            xhsProjectSimulationHydroCheckFailedCtrl1 = new XhsProjectSimulationHydroCheckFailedCtrl();
-            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 Xhs.XhsProjectSimulationMatchingListCtrl();
+            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);
             ((ISupportInitialize)ribbonControl1).BeginInit();
             ((ISupportInitialize)tabPane1).BeginInit();
             tabPane1.SuspendLayout();
-            pageBimface.SuspendLayout();
-            pageQ3d.SuspendLayout();
-            tabPageL3d.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();
+            docPnlRight.SuspendLayout();
+            docPnlBottom.SuspendLayout();
             ((ISupportInitialize)svgImg32).BeginInit();
             ((ISupportInitialize)rmSet).BeginInit();
             SuspendLayout();
             // 
             // ribbonControl1
             // 
-            ribbonControl1.DrawGroupCaptions = DevExpress.Utils.DefaultBoolean.False;
             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 });
+            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnAnaly, barBtnSearch, barBtnMarkSet, barBtnGradingSet, barBtnGradingApply, barBtnGradingCancel, barBtnMarkCancel, barBtnProperty, barBtnRefresh });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 32;
+            ribbonControl1.MaxItemId = 40;
             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(1161, 110);
+            ribbonControl1.Size = new Size(1206, 128);
             ribbonControl1.Toolbar.ShowCustomizeItem = false;
             ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
             // 
@@ -164,13 +145,13 @@
             barBtnHydroParterList.Name = "barBtnHydroParterList";
             barBtnHydroParterList.ItemClick += barBtnHydroParterList_ItemClick;
             // 
-            // barBtnShowHide
+            // barBtnFastShowHidden
             // 
-            barBtnShowHide.Caption = "涓�閿樉闅�";
-            barBtnShowHide.Id = 9;
-            barBtnShowHide.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnShowHide.ImageOptions.SvgImage");
-            barBtnShowHide.Name = "barBtnShowHide";
-            barBtnShowHide.ItemClick += barBtnShowHide_ItemClick;
+            barBtnFastShowHidden.Caption = "涓�閿樉闅�";
+            barBtnFastShowHidden.Id = 9;
+            barBtnFastShowHidden.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnShowHide.ImageOptions.SvgImage");
+            barBtnFastShowHidden.Name = "barBtnFastShowHidden";
+            barBtnFastShowHidden.ItemClick += barBtnFastShowHidden_ItemClick;
             // 
             // barBtnMatchingList
             // 
@@ -259,42 +240,128 @@
             barBtnSetJunctionList.Id = 30;
             barBtnSetJunctionList.Name = "barBtnSetJunctionList";
             // 
-            // barBtnFeatCurve
+            // barBtnAnaly
             // 
-            barBtnFeatCurve.Caption = "鎬ц兘鏇茬嚎";
-            barBtnFeatCurve.Id = 31;
-            barBtnFeatCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFeatCurve.ImageOptions.SvgImage");
-            barBtnFeatCurve.Name = "barBtnFeatCurve";
-            barBtnFeatCurve.ItemClick += barBtnFeatCurve_ItemClick;
+            barBtnAnaly.Caption = "缁煎悎鍒嗘瀽";
+            barBtnAnaly.Id = 31;
+            barBtnAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnaly.ImageOptions.SvgImage");
+            barBtnAnaly.Name = "barBtnAnaly";
+            barBtnAnaly.ItemClick += barBtnFeatCurve_ItemClick;
+            // 
+            // barBtnSearch
+            // 
+            barBtnSearch.Caption = "鏌ヨ";
+            barBtnSearch.Id = 32;
+            barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
+            barBtnSearch.Name = "barBtnSearch";
+            barBtnSearch.ItemClick += barBtnSearch_ItemClick;
+            // 
+            // barBtnMarkSet
+            // 
+            barBtnMarkSet.Caption = "搴旂敤";
+            barBtnMarkSet.Id = 33;
+            barBtnMarkSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMarkSet.ImageOptions.SvgImage");
+            barBtnMarkSet.Name = "barBtnMarkSet";
+            barBtnMarkSet.ItemClick += barBtnMarkSet_ItemClick;
+            // 
+            // barBtnGradingSet
+            // 
+            barBtnGradingSet.Caption = "閰嶇疆";
+            barBtnGradingSet.Id = 34;
+            barBtnGradingSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingSet.ImageOptions.SvgImage");
+            barBtnGradingSet.Name = "barBtnGradingSet";
+            barBtnGradingSet.ItemClick += barBtnGradingSet_ItemClick;
+            // 
+            // barBtnGradingApply
+            // 
+            barBtnGradingApply.Caption = "搴旂敤";
+            barBtnGradingApply.Id = 35;
+            barBtnGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingApply.ImageOptions.SvgImage");
+            barBtnGradingApply.Name = "barBtnGradingApply";
+            barBtnGradingApply.ItemClick += barBtnGradingApply_ItemClick;
+            // 
+            // barBtnGradingCancel
+            // 
+            barBtnGradingCancel.Caption = "鍙栨秷";
+            barBtnGradingCancel.Id = 36;
+            barBtnGradingCancel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingCancel.ImageOptions.SvgImage");
+            barBtnGradingCancel.Name = "barBtnGradingCancel";
+            barBtnGradingCancel.ItemClick += barBtnGradingCancel_ItemClick;
+            // 
+            // barBtnMarkCancel
+            // 
+            barBtnMarkCancel.Caption = "鍙栨秷";
+            barBtnMarkCancel.Id = 37;
+            barBtnMarkCancel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMarkCancel.ImageOptions.SvgImage");
+            barBtnMarkCancel.Name = "barBtnMarkCancel";
+            barBtnMarkCancel.ItemClick += barBtnMarkCancel_ItemClick;
+            // 
+            // barBtnProperty
+            // 
+            barBtnProperty.Caption = "灞炴�ч潰鏉�";
+            barBtnProperty.Id = 38;
+            barBtnProperty.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnProperty.ImageOptions.SvgImage");
+            barBtnProperty.Name = "barBtnProperty";
+            barBtnProperty.ItemClick += barBtnProperty_ItemClick;
+            // 
+            // barBtnRefresh
+            // 
+            barBtnRefresh.Caption = "鍒锋柊";
+            barBtnRefresh.Id = 39;
+            barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
+            barBtnRefresh.Name = "barBtnRefresh";
             // 
             // ribbonPage1
             // 
-            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
+            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup5, ribbonPageGroup1, ribbonPageGroup2, 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(barBtnFastShowHidden);
+            pageGroupModel.ItemLinks.Add(barBtnSearch);
+            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
+            pageGroupModel.ItemLinks.Add(barBtnSetList);
+            pageGroupModel.ItemLinks.Add(barBtnProperty);
+            pageGroupModel.Name = "pageGroupModel";
+            pageGroupModel.Text = "妯″瀷";
+            // 
+            // ribbonPageGroup5
+            // 
+            ribbonPageGroup5.ItemLinks.Add(barBtnMarkSet);
+            ribbonPageGroup5.ItemLinks.Add(barBtnMarkCancel);
+            ribbonPageGroup5.Name = "ribbonPageGroup5";
+            ribbonPageGroup5.Text = "鏍囨敞";
+            // 
             // ribbonPageGroup1
             // 
-            ribbonPageGroup1.ItemLinks.Add(barBtnMatchingList);
-            ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList);
-            ribbonPageGroup1.ItemLinks.Add(barBtnShowHide);
-            ribbonPageGroup1.ItemLinks.Add(barBtnSetList);
+            ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
+            ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
+            ribbonPageGroup1.ItemLinks.Add(barBtnGradingCancel);
             ribbonPageGroup1.Name = "ribbonPageGroup1";
-            ribbonPageGroup1.Text = "妯″瀷";
+            ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
             // 
             // ribbonPageGroup2
             // 
+            ribbonPageGroup2.ItemLinks.Add(barBtnAnaly);
             ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
             ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
-            ribbonPageGroup2.ItemLinks.Add(barBtnHydroParterList);
-            ribbonPageGroup2.ItemLinks.Add(barBtnHydroExportInp);
             ribbonPageGroup2.Name = "ribbonPageGroup2";
             ribbonPageGroup2.Text = "姘村姏";
             // 
             // ribbonPageGroup3
             // 
-            ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
             ribbonPageGroup3.ItemLinks.Add(barBtnSave);
+            ribbonPageGroup3.ItemLinks.Add(barBtnHydroExportInp);
+            ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
             ribbonPageGroup3.Name = "ribbonPageGroup3";
             ribbonPageGroup3.Text = "鏇村...";
             // 
@@ -305,248 +372,71 @@
             // 
             // tabPane1
             // 
-            tabPane1.Controls.Add(pageBimface);
-            tabPane1.Controls.Add(pageQ3d);
-            tabPane1.Controls.Add(tabPageL3d);
+            tabPane1.Controls.Add(tabPageBimface);
+            tabPane1.Controls.Add(tabPageQ3d);
             tabPane1.Dock = DockStyle.Fill;
-            tabPane1.Location = new Point(0, 110);
+            tabPane1.Location = new Point(0, 128);
             tabPane1.Name = "tabPane1";
-            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d, tabPageL3d });
-            tabPane1.RegularSize = new Size(886, 200);
-            tabPane1.SelectedPage = pageBimface;
-            tabPane1.Size = new Size(886, 200);
+            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
+            tabPane1.RegularSize = new Size(931, 407);
+            tabPane1.SelectedPage = tabPageBimface;
+            tabPane1.Size = new Size(931, 407);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
-            // pageBimface
+            // tabPageBimface
             // 
-            pageBimface.Caption = "涓夌淮妯″瀷";
-            pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
-            pageBimface.Name = "pageBimface";
-            pageBimface.Size = new Size(886, 167);
+            tabPageBimface.Caption = "涓夌淮妯″瀷";
+            tabPageBimface.Name = "tabPageBimface";
+            tabPageBimface.Size = new Size(931, 374);
             // 
-            // xhsProjectSimulationBimfaceCtrl1
+            // tabPageQ3d
             // 
-            xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
-            xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 167);
-            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, 185);
-            // 
-            // xhsProjectSimulationQ3dCtrl1
-            // 
-            xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
-            xhsProjectSimulationQ3dCtrl1.Size = new Size(886, 185);
-            xhsProjectSimulationQ3dCtrl1.TabIndex = 0;
-            // 
-            // tabPageL3d
-            // 
-            tabPageL3d.Caption = "L3d";
-            tabPageL3d.Controls.Add(xhsProjectSimulationL3dCtrl1);
-            tabPageL3d.Name = "tabPageL3d";
-            tabPageL3d.Size = new Size(886, 185);
-            // 
-            // xhsProjectSimulationL3dCtrl1
-            // 
-            xhsProjectSimulationL3dCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationL3dCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationL3dCtrl1.Name = "xhsProjectSimulationL3dCtrl1";
-            xhsProjectSimulationL3dCtrl1.Size = new Size(886, 185);
-            xhsProjectSimulationL3dCtrl1.TabIndex = 0;
+            tabPageQ3d.Caption = "姘村姏妯″瀷";
+            tabPageQ3d.Name = "tabPageQ3d";
+            tabPageQ3d.Size = new Size(692, 307);
             // 
             // dockManager1
             // 
             dockManager1.Form = this;
-            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck, docPnlUnMatchingList, docPnlMatchingList });
+            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(886, 110);
-            docPnlProperty.Name = "docPnlProperty";
-            docPnlProperty.OriginalSize = new Size(275, 200);
-            docPnlProperty.Size = new Size(275, 629);
-            docPnlProperty.Text = "灞炴��";
+            docPnlRight.Controls.Add(controlContainerRight);
+            docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+            docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
+            docPnlRight.Location = new Point(931, 128);
+            docPnlRight.Name = "docPnlRight";
+            docPnlRight.OriginalSize = new Size(275, 200);
+            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, 600);
-            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, 600);
-            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(931, 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, 660);
-            docPnlHydroParterList.Name = "docPnlHydroParterList";
-            docPnlHydroParterList.OriginalSize = new Size(200, 79);
-            docPnlHydroParterList.Size = new Size(886, 79);
-            docPnlHydroParterList.Text = "鏋勪欢鏄庣粏";
-            // 
-            // controlContainer3
-            // 
-            controlContainer3.Controls.Add(hydroParterListCtrl1);
-            controlContainer3.Location = new Point(3, 27);
-            controlContainer3.Name = "controlContainer3";
-            controlContainer3.Size = new Size(880, 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(880, 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, 576);
-            docPnlHydroCalcu.Name = "docPnlHydroCalcu";
-            docPnlHydroCalcu.OriginalSize = new Size(200, 84);
-            docPnlHydroCalcu.Size = new Size(886, 84);
-            docPnlHydroCalcu.Text = "姘村姏璁$畻";
-            // 
-            // controlContainer2
-            // 
-            controlContainer2.Controls.Add(xhsProjectSimulationHydroCalcuFailedCtrl1);
-            controlContainer2.Location = new Point(3, 27);
-            controlContainer2.Name = "controlContainer2";
-            controlContainer2.Size = new Size(880, 54);
-            controlContainer2.TabIndex = 0;
-            // 
-            // xhsProjectSimulationHydroCalcuFailedCtrl1
-            // 
-            xhsProjectSimulationHydroCalcuFailedCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationHydroCalcuFailedCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationHydroCalcuFailedCtrl1.Name = "xhsProjectSimulationHydroCalcuFailedCtrl1";
-            xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(880, 54);
-            xhsProjectSimulationHydroCalcuFailedCtrl1.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, 488);
-            docPnlHydroCheck.Name = "docPnlHydroCheck";
-            docPnlHydroCheck.OriginalSize = new Size(200, 88);
-            docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
-            docPnlHydroCheck.SavedIndex = 1;
-            docPnlHydroCheck.Size = new Size(886, 88);
-            docPnlHydroCheck.Text = "姘村姏鏍¢獙";
-            // 
-            // controlContainer1
-            // 
-            controlContainer1.Controls.Add(xhsProjectSimulationHydroCheckFailedCtrl1);
-            controlContainer1.Location = new Point(3, 27);
-            controlContainer1.Name = "controlContainer1";
-            controlContainer1.Size = new Size(880, 58);
-            controlContainer1.TabIndex = 0;
-            // 
-            // xhsProjectSimulationHydroCheckFailedCtrl1
-            // 
-            xhsProjectSimulationHydroCheckFailedCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationHydroCheckFailedCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationHydroCheckFailedCtrl1.Name = "xhsProjectSimulationHydroCheckFailedCtrl1";
-            xhsProjectSimulationHydroCheckFailedCtrl1.Size = new Size(880, 58);
-            xhsProjectSimulationHydroCheckFailedCtrl1.TabIndex = 0;
-            xhsProjectSimulationHydroCheckFailedCtrl1.HydroClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_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, 405);
-            docPnlUnMatchingList.Name = "docPnlUnMatchingList";
-            docPnlUnMatchingList.OriginalSize = new Size(200, 83);
-            docPnlUnMatchingList.Size = new Size(886, 83);
-            docPnlUnMatchingList.Text = "鏈尮閰嶅垪琛�";
-            // 
-            // controlContainer4
-            // 
-            controlContainer4.Controls.Add(xhsProjectSimulationUnMatchingListCtrl1);
-            controlContainer4.Location = new Point(3, 27);
-            controlContainer4.Name = "controlContainer4";
-            controlContainer4.Size = new Size(880, 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(880, 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, 310);
-            docPnlMatchingList.Name = "docPnlMatchingList";
-            docPnlMatchingList.OriginalSize = new Size(200, 95);
-            docPnlMatchingList.Size = new Size(886, 95);
-            docPnlMatchingList.Text = "鍖归厤鍒楄〃";
-            // 
-            // controlContainer5
-            // 
-            controlContainer5.Controls.Add(xhsProjectSimulationMatchingListCtrl1);
-            controlContainer5.Location = new Point(3, 27);
-            controlContainer5.Name = "controlContainer5";
-            controlContainer5.Size = new Size(880, 65);
-            controlContainer5.TabIndex = 0;
-            // 
-            // xhsProjectSimulationMatchingListCtrl1
-            // 
-            xhsProjectSimulationMatchingListCtrl1.Dock = DockStyle.Fill;
-            xhsProjectSimulationMatchingListCtrl1.Location = new Point(0, 0);
-            xhsProjectSimulationMatchingListCtrl1.Name = "xhsProjectSimulationMatchingListCtrl1";
-            xhsProjectSimulationMatchingListCtrl1.Size = new Size(880, 65);
-            xhsProjectSimulationMatchingListCtrl1.TabIndex = 0;
-            xhsProjectSimulationMatchingListCtrl1.HydroClickEvent += xhsProjectSimulationMatchingListCtrl1_HydroClickEvent;
-            xhsProjectSimulationMatchingListCtrl1.ApplyMatchingEvent += xhsProjectSimulationMatchingListCtrl1_ApplyMatchingEvent;
+            controlContainerBottom.Location = new Point(3, 27);
+            controlContainerBottom.Name = "controlContainerBottom";
+            controlContainerBottom.Size = new Size(925, 135);
+            controlContainerBottom.TabIndex = 0;
             // 
             // svgImg32
             // 
@@ -576,35 +466,18 @@
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabPane1);
-            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(1161, 739);
+            Size = new Size(1206, 700);
             ((ISupportInitialize)ribbonControl1).EndInit();
             ((ISupportInitialize)tabPane1).EndInit();
             tabPane1.ResumeLayout(false);
-            pageBimface.ResumeLayout(false);
-            pageQ3d.ResumeLayout(false);
-            tabPageL3d.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);
+            docPnlRight.ResumeLayout(false);
+            docPnlBottom.ResumeLayout(false);
             ((ISupportInitialize)svgImg32).EndInit();
             ((ISupportInitialize)rmSet).EndInit();
             ResumeLayout(false);
@@ -617,44 +490,24 @@
         private DevExpress.XtraBars.BarButtonItem barBtnHydroCheck;
         private DevExpress.XtraBars.BarButtonItem barBtnHydroCalcu;
         private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupMatching;
         private DevExpress.XtraBars.BarButtonItem barBtnHydroExportInp;
         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 barBtnFastShowHidden;
         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 XhsProjectSimulationHydroCheckFailedCtrl xhsProjectSimulationHydroCheckFailedCtrl1;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlHydroCalcu;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainer2;
-        private XhsProjectSimulationHydroCalcuFailedCtrl xhsProjectSimulationHydroCalcuFailedCtrl1;
-        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.Navigation.TabNavigationPage tabPageL3d;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlMatchingList;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainer5;
-        private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
-        private XhsProjectSimulationL3dCtrl xhsProjectSimulationL3dCtrl1;
         private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
-        private Xhs.XhsProjectSimulationMatchingListCtrl xhsProjectSimulationMatchingListCtrl1;
         private DevExpress.XtraBars.BarButtonItem barBtnSetList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetValveList;
@@ -665,6 +518,19 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
-        private DevExpress.XtraBars.BarButtonItem barBtnFeatCurve;
+        private DevExpress.XtraBars.BarButtonItem barBtnAnaly;
+        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 barBtnMarkSet;
+        private DevExpress.XtraBars.BarButtonItem barBtnGradingSet;
+        private DevExpress.XtraBars.BarButtonItem barBtnGradingApply;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+        private DevExpress.XtraBars.BarButtonItem barBtnGradingCancel;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5;
+        private DevExpress.XtraBars.BarButtonItem barBtnMarkCancel;
+        private DevExpress.XtraBars.BarButtonItem barBtnProperty;
+        private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
     }
 }

--
Gitblit v1.9.3