From 2bbfc173c71bdd549a42bf31eee81b9432c2dbed Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 29 十月 2024 21:30:30 +0800
Subject: [PATCH] 优化计算控件

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |   63 ++++++++++---------------------
 1 files changed, 21 insertions(+), 42 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..b6e087c 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
@@ -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();
@@ -100,7 +98,7 @@
             // 
             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, barBtnHydroParterList, 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 });
             ribbonControl1.Location = new Point(0, 0);
             ribbonControl1.MaxItemId = 51;
             ribbonControl1.Name = "ribbonControl1";
@@ -109,13 +107,13 @@
             ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
             ribbonControl1.ShowQatLocationSelector = false;
             ribbonControl1.ShowToolbarCustomizeItem = false;
-            ribbonControl1.Size = new Size(1206, 101);
+            ribbonControl1.Size = new Size(1206, 128);
             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";
@@ -248,13 +246,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,28 +278,13 @@
             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
             // 
@@ -398,7 +381,6 @@
             pageGroupModel.ItemLinks.Add(barBtnSearch);
             pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
             pageGroupModel.ItemLinks.Add(barBtnSetList);
-            pageGroupModel.ItemLinks.Add(barBtnProperty);
             pageGroupModel.ItemLinks.Add(barBtnSetMark);
             pageGroupModel.Name = "pageGroupModel";
             pageGroupModel.Text = "妯″瀷";
@@ -407,13 +389,12 @@
             // 
             ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
             ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
-            ribbonPageGroup1.ItemLinks.Add(barBtnGradingCancel);
             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,12 +418,12 @@
             tabPane1.Controls.Add(tabPageBimface);
             tabPane1.Controls.Add(tabPageQ3d);
             tabPane1.Dock = DockStyle.Fill;
-            tabPane1.Location = new Point(0, 101);
+            tabPane1.Location = new Point(0, 128);
             tabPane1.Name = "tabPane1";
             tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
-            tabPane1.RegularSize = new Size(931, 434);
+            tabPane1.RegularSize = new Size(931, 407);
             tabPane1.SelectedPage = tabPageBimface;
-            tabPane1.Size = new Size(931, 434);
+            tabPane1.Size = new Size(931, 407);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
@@ -450,7 +431,7 @@
             // 
             tabPageBimface.Caption = "涓夌淮妯″瀷";
             tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(931, 401);
+            tabPageBimface.Size = new Size(931, 374);
             // 
             // tabPageQ3d
             // 
@@ -469,17 +450,17 @@
             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(931, 128);
             docPnlRight.Name = "docPnlRight";
             docPnlRight.OriginalSize = new Size(275, 200);
-            docPnlRight.Size = new Size(275, 599);
+            docPnlRight.Size = new Size(275, 572);
             docPnlRight.Text = "灞炴��";
             // 
             // controlContainerRight
             // 
             controlContainerRight.Location = new Point(4, 26);
             controlContainerRight.Name = "controlContainerRight";
-            controlContainerRight.Size = new Size(268, 570);
+            controlContainerRight.Size = new Size(268, 543);
             controlContainerRight.TabIndex = 0;
             // 
             // docPnlBottom
@@ -539,8 +520,8 @@
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabPane1);
-            Controls.Add(docPnlRight);
             Controls.Add(docPnlBottom);
+            Controls.Add(docPnlRight);
             Controls.Add(ribbonControl1);
             Margin = new Padding(2);
             Name = "XhsProjectSimulationCorePage";
@@ -591,7 +572,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 +580,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;

--
Gitblit v1.9.3