From 750b85dc4c5562b9c0dc9b8c463e5cc5f0ad2553 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 11 十一月 2024 15:45:32 +0800
Subject: [PATCH] 添加方案

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  175 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 111 insertions(+), 64 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 db34948..c6eb9c9 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
@@ -37,7 +37,7 @@
             barBtnHydroCalcu = new DevExpress.XtraBars.BarButtonItem();
             barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
             barBtnSave = new DevExpress.XtraBars.BarButtonItem();
-            barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnHydroVisualList = new DevExpress.XtraBars.BarButtonItem();
             barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
             barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
@@ -51,12 +51,10 @@
             barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnAnaly = new DevExpress.XtraBars.BarButtonItem();
+            barBtnParallelAnaly = new DevExpress.XtraBars.BarButtonItem();
             barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
             barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
             barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
-            barBtnGradingCancel = new DevExpress.XtraBars.BarButtonItem();
-            barBtnProperty = new DevExpress.XtraBars.BarButtonItem();
             barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetMark = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetReservoirList = new DevExpress.XtraBars.BarButtonItem();
@@ -69,9 +67,15 @@
             barBtnSetCompressorList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetFlowmeterList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnLoadFlowDirection = new DevExpress.XtraBars.BarButtonItem();
+            barBtnUnloadFlowDirection = new DevExpress.XtraBars.BarButtonItem();
+            barBtnClearMark = new DevExpress.XtraBars.BarButtonItem();
+            batBtnCancelGradingApply = 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();
+            ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -98,24 +102,27 @@
             // 
             // ribbonControl1
             // 
+            ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
             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, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnGradingCancel, barBtnProperty, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList });
+            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroVisualList, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnParallelAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnLoadFlowDirection, barBtnUnloadFlowDirection, barBtnClearMark, batBtnCancelGradingApply });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 51;
+            ribbonControl1.Margin = new Padding(4, 5, 4, 5);
+            ribbonControl1.MaxItemId = 55;
             ribbonControl1.Name = "ribbonControl1";
+            ribbonControl1.OptionsMenuMinWidth = 471;
             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(1206, 101);
+            ribbonControl1.Size = new Size(1897, 148);
             ribbonControl1.Toolbar.ShowCustomizeItem = false;
             ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
             // 
             // barBtnHydroCheck
             // 
-            barBtnHydroCheck.Caption = "鏍¢獙";
+            barBtnHydroCheck.Caption = "妫�鏌�";
             barBtnHydroCheck.Id = 1;
             barBtnHydroCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCheck.ImageOptions.SvgImage");
             barBtnHydroCheck.Name = "barBtnHydroCheck";
@@ -145,13 +152,13 @@
             barBtnSave.Name = "barBtnSave";
             barBtnSave.ItemClick += barBtnSave_ItemClick;
             // 
-            // barBtnHydroParterList
+            // barBtnHydroVisualList
             // 
-            barBtnHydroParterList.Caption = "鏋勪欢鏄庣粏";
-            barBtnHydroParterList.Id = 8;
-            barBtnHydroParterList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
-            barBtnHydroParterList.Name = "barBtnHydroParterList";
-            barBtnHydroParterList.ItemClick += barBtnHydroParterList_ItemClick;
+            barBtnHydroVisualList.Caption = "鏋勪欢鏄庣粏";
+            barBtnHydroVisualList.Id = 8;
+            barBtnHydroVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroVisualList.ImageOptions.SvgImage");
+            barBtnHydroVisualList.Name = "barBtnHydroVisualList";
+            barBtnHydroVisualList.ItemClick += barBtnHydroVisualList_ItemClick;
             // 
             // barBtnFastShowHidden
             // 
@@ -248,13 +255,13 @@
             barBtnSetJunctionList.Id = 30;
             barBtnSetJunctionList.Name = "barBtnSetJunctionList";
             // 
-            // barBtnAnaly
+            // barBtnParallelAnaly
             // 
-            barBtnAnaly.Caption = "缁煎悎鍒嗘瀽";
-            barBtnAnaly.Id = 31;
-            barBtnAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnaly.ImageOptions.SvgImage");
-            barBtnAnaly.Name = "barBtnAnaly";
-            barBtnAnaly.ItemClick += barBtnAnaly_ItemClick;
+            barBtnParallelAnaly.Caption = "骞惰仈鍒嗘瀽";
+            barBtnParallelAnaly.Id = 31;
+            barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallelAnaly.ImageOptions.SvgImage");
+            barBtnParallelAnaly.Name = "barBtnParallelAnaly";
+            barBtnParallelAnaly.ItemClick += barBtnAnaly_ItemClick;
             // 
             // barBtnSearch
             // 
@@ -280,32 +287,17 @@
             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;
-            // 
-            // 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";
+            barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
             // 
             // barBtnSetMark
             // 
-            barBtnSetMark.Caption = "璁剧疆鏍囨敞";
+            barBtnSetMark.Caption = "璁剧疆";
             barBtnSetMark.Id = 40;
             barBtnSetMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMark.ImageOptions.SvgImage");
             barBtnSetMark.Name = "barBtnSetMark";
@@ -379,9 +371,41 @@
             barBtnSetPressmeterList.Id = 50;
             barBtnSetPressmeterList.Name = "barBtnSetPressmeterList";
             // 
+            // barBtnLoadFlowDirection
+            // 
+            barBtnLoadFlowDirection.Caption = "鍔犺浇";
+            barBtnLoadFlowDirection.Id = 51;
+            barBtnLoadFlowDirection.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnLoadFlowDirection.ImageOptions.SvgImage");
+            barBtnLoadFlowDirection.Name = "barBtnLoadFlowDirection";
+            barBtnLoadFlowDirection.ItemClick += barBtnLoadFlowDirection_ItemClick;
+            // 
+            // barBtnUnloadFlowDirection
+            // 
+            barBtnUnloadFlowDirection.Caption = "鍗歌浇";
+            barBtnUnloadFlowDirection.Id = 52;
+            barBtnUnloadFlowDirection.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUnloadFlowDirection.ImageOptions.SvgImage");
+            barBtnUnloadFlowDirection.Name = "barBtnUnloadFlowDirection";
+            barBtnUnloadFlowDirection.ItemClick += barBtnUnloadFlowDirection_ItemClick;
+            // 
+            // barBtnClearMark
+            // 
+            barBtnClearMark.Caption = "娓呴櫎";
+            barBtnClearMark.Id = 53;
+            barBtnClearMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnClearMark.ImageOptions.SvgImage");
+            barBtnClearMark.Name = "barBtnClearMark";
+            barBtnClearMark.ItemClick += barBtnClearMark_ItemClick;
+            // 
+            // batBtnCancelGradingApply
+            // 
+            batBtnCancelGradingApply.Caption = "鍙栨秷";
+            batBtnCancelGradingApply.Id = 54;
+            batBtnCancelGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("batBtnCancelGradingApply.ImageOptions.SvgImage");
+            batBtnCancelGradingApply.Name = "batBtnCancelGradingApply";
+            batBtnCancelGradingApply.ItemClick += batBtnCancelGradingApply_ItemClick;
+            // 
             // ribbonPage1
             // 
-            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
+            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup5, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
             ribbonPage1.Name = "ribbonPage1";
             ribbonPage1.Text = "ribbonPage1";
             // 
@@ -396,24 +420,36 @@
             // 
             pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
             pageGroupModel.ItemLinks.Add(barBtnSearch);
-            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
+            pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
             pageGroupModel.ItemLinks.Add(barBtnSetList);
-            pageGroupModel.ItemLinks.Add(barBtnProperty);
-            pageGroupModel.ItemLinks.Add(barBtnSetMark);
             pageGroupModel.Name = "pageGroupModel";
             pageGroupModel.Text = "妯″瀷";
+            // 
+            // ribbonPageGroup6
+            // 
+            ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
+            ribbonPageGroup6.ItemLinks.Add(barBtnClearMark);
+            ribbonPageGroup6.Name = "ribbonPageGroup6";
+            ribbonPageGroup6.Text = "鏍囨敞";
+            // 
+            // ribbonPageGroup5
+            // 
+            ribbonPageGroup5.ItemLinks.Add(barBtnLoadFlowDirection);
+            ribbonPageGroup5.ItemLinks.Add(barBtnUnloadFlowDirection);
+            ribbonPageGroup5.Name = "ribbonPageGroup5";
+            ribbonPageGroup5.Text = "娴佸悜";
             // 
             // ribbonPageGroup1
             // 
             ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
             ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
-            ribbonPageGroup1.ItemLinks.Add(barBtnGradingCancel);
+            ribbonPageGroup1.ItemLinks.Add(batBtnCancelGradingApply);
             ribbonPageGroup1.Name = "ribbonPageGroup1";
             ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
             // 
             // ribbonPageGroup2
             // 
-            ribbonPageGroup2.ItemLinks.Add(barBtnAnaly);
+            ribbonPageGroup2.ItemLinks.Add(barBtnParallelAnaly);
             ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
             ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
             ribbonPageGroup2.Name = "ribbonPageGroup2";
@@ -437,26 +473,29 @@
             tabPane1.Controls.Add(tabPageBimface);
             tabPane1.Controls.Add(tabPageQ3d);
             tabPane1.Dock = DockStyle.Fill;
-            tabPane1.Location = new Point(0, 101);
+            tabPane1.Location = new Point(0, 148);
+            tabPane1.Margin = new Padding(4, 5, 4, 5);
             tabPane1.Name = "tabPane1";
             tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
-            tabPane1.RegularSize = new Size(931, 434);
+            tabPane1.RegularSize = new Size(1504, 693);
             tabPane1.SelectedPage = tabPageBimface;
-            tabPane1.Size = new Size(931, 434);
+            tabPane1.Size = new Size(1504, 693);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
             // tabPageBimface
             // 
             tabPageBimface.Caption = "涓夌淮妯″瀷";
+            tabPageBimface.Margin = new Padding(4, 5, 4, 5);
             tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(931, 401);
+            tabPageBimface.Size = new Size(1504, 644);
             // 
             // tabPageQ3d
             // 
             tabPageQ3d.Caption = "姘村姏妯″瀷";
+            tabPageQ3d.Margin = new Padding(4, 5, 4, 5);
             tabPageQ3d.Name = "tabPageQ3d";
-            tabPageQ3d.Size = new Size(931, 374);
+            tabPageQ3d.Size = new Size(1330, 588);
             // 
             // dockManager1
             // 
@@ -469,17 +508,19 @@
             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, 101);
+            docPnlRight.Location = new Point(1504, 148);
+            docPnlRight.Margin = new Padding(4, 5, 4, 5);
             docPnlRight.Name = "docPnlRight";
             docPnlRight.OriginalSize = new Size(275, 200);
-            docPnlRight.Size = new Size(275, 599);
+            docPnlRight.Size = new Size(393, 952);
             docPnlRight.Text = "灞炴��";
             // 
             // controlContainerRight
             // 
-            controlContainerRight.Location = new Point(4, 26);
+            controlContainerRight.Location = new Point(7, 38);
+            controlContainerRight.Margin = new Padding(4, 5, 4, 5);
             controlContainerRight.Name = "controlContainerRight";
-            controlContainerRight.Size = new Size(268, 570);
+            controlContainerRight.Size = new Size(382, 910);
             controlContainerRight.TabIndex = 0;
             // 
             // docPnlBottom
@@ -487,17 +528,19 @@
             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.Location = new Point(0, 841);
+            docPnlBottom.Margin = new Padding(4, 5, 4, 5);
             docPnlBottom.Name = "docPnlBottom";
             docPnlBottom.OriginalSize = new Size(200, 165);
-            docPnlBottom.Size = new Size(931, 165);
+            docPnlBottom.Size = new Size(1504, 259);
             docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
             // 
             // controlContainerBottom
             // 
-            controlContainerBottom.Location = new Point(3, 27);
+            controlContainerBottom.Location = new Point(4, 41);
+            controlContainerBottom.Margin = new Padding(4, 5, 4, 5);
             controlContainerBottom.Name = "controlContainerBottom";
-            controlContainerBottom.Size = new Size(925, 135);
+            controlContainerBottom.Size = new Size(1496, 214);
             controlContainerBottom.TabIndex = 0;
             // 
             // svgImg32
@@ -536,15 +579,15 @@
             // 
             Appearance.BackColor = SystemColors.Control;
             Appearance.Options.UseBackColor = true;
-            AutoScaleDimensions = new SizeF(7F, 14F);
+            AutoScaleDimensions = new SizeF(10F, 22F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabPane1);
             Controls.Add(docPnlRight);
             Controls.Add(docPnlBottom);
             Controls.Add(ribbonControl1);
-            Margin = new Padding(2);
+            Margin = new Padding(3, 3, 3, 3);
             Name = "XhsProjectSimulationCorePage";
-            Size = new Size(1206, 700);
+            Size = new Size(1897, 1100);
             ((ISupportInitialize)ribbonControl1).EndInit();
             ((ISupportInitialize)tabPane1).EndInit();
             tabPane1.ResumeLayout(false);
@@ -567,7 +610,7 @@
         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 barBtnHydroVisualList;
         private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
@@ -579,7 +622,6 @@
         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;
@@ -591,7 +633,7 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
-        private DevExpress.XtraBars.BarButtonItem barBtnAnaly;
+        private DevExpress.XtraBars.BarButtonItem barBtnParallelAnaly;
         private DevExpress.XtraBars.BarButtonItem barBtnSearch;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
         private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
@@ -599,8 +641,6 @@
         private DevExpress.XtraBars.BarButtonItem barBtnGradingSet;
         private DevExpress.XtraBars.BarButtonItem barBtnGradingApply;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
-        private DevExpress.XtraBars.BarButtonItem barBtnGradingCancel;
-        private DevExpress.XtraBars.BarButtonItem barBtnProperty;
         private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
         private DevExpress.XtraBars.BarButtonItem barBtnSetMark;
         private DevExpress.XtraBars.BarButtonItem barBtnSetReservoirList;
@@ -613,5 +653,12 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList;
+        private DevExpress.XtraBars.BarButtonItem barBtnLoadFlowDirection;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5;
+        private DevExpress.XtraBars.BarButtonItem barBtnUnloadFlowDirection;
+        public DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
+        private DevExpress.XtraBars.BarButtonItem barBtnClearMark;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup6;
+        private DevExpress.XtraBars.BarButtonItem batBtnCancelGradingApply;
     }
 }

--
Gitblit v1.9.3