From 82dfff29bca77a1e11459fb7a69f729a09f4345c Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 15:05:05 +0800
Subject: [PATCH] 计算优化,标注优化

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  148 ++++++++++++++++++++++++++++---------------------
 1 files changed, 85 insertions(+), 63 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 b708591..fb08121 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
@@ -54,9 +54,17 @@
             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();
@@ -70,12 +78,6 @@
             controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
             svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
             rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
-            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
-            barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
-            barBtnGradingCancel = new DevExpress.XtraBars.BarButtonItem();
-            ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            barBtnMarkCancel = new DevExpress.XtraBars.BarButtonItem();
             ((ISupportInitialize)ribbonControl1).BeginInit();
             ((ISupportInitialize)tabPane1).BeginInit();
             tabPane1.SuspendLayout();
@@ -90,16 +92,16 @@
             // 
             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, barBtnAnaly, barBtnSearch, barBtnMarkSet, barBtnGradingSet, barBtnGradingApply, barBtnGradingCancel, barBtnMarkCancel });
+            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, barBtnAnaly, barBtnSearch, barBtnMarkSet, barBtnGradingSet, barBtnGradingApply, barBtnGradingCancel, barBtnMarkCancel, barBtnProperty, barBtnRefresh });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 38;
+            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(1118, 128);
+            ribbonControl1.Size = new Size(1206, 128);
             ribbonControl1.Toolbar.ShowCustomizeItem = false;
             ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
             // 
@@ -242,7 +244,7 @@
             // 
             barBtnAnaly.Caption = "缁煎悎鍒嗘瀽";
             barBtnAnaly.Id = 31;
-            barBtnAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFeatCurve.ImageOptions.SvgImage");
+            barBtnAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnaly.ImageOptions.SvgImage");
             barBtnAnaly.Name = "barBtnAnaly";
             barBtnAnaly.ItemClick += barBtnFeatCurve_ItemClick;
             // 
@@ -258,9 +260,53 @@
             // 
             barBtnMarkSet.Caption = "搴旂敤";
             barBtnMarkSet.Id = 33;
-            barBtnMarkSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMark.ImageOptions.SvgImage");
+            barBtnMarkSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMarkSet.ImageOptions.SvgImage");
             barBtnMarkSet.Name = "barBtnMarkSet";
-            barBtnMarkSet.ItemClick += barBtnMark_ItemClick;
+            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";
+            // 
+            // barBtnGradingApply
+            // 
+            barBtnGradingApply.Caption = "搴旂敤";
+            barBtnGradingApply.Id = 35;
+            barBtnGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingApply.ImageOptions.SvgImage");
+            barBtnGradingApply.Name = "barBtnGradingApply";
+            // 
+            // barBtnGradingCancel
+            // 
+            barBtnGradingCancel.Caption = "鍏抽棴";
+            barBtnGradingCancel.Id = 36;
+            barBtnGradingCancel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingCancel.ImageOptions.SvgImage");
+            barBtnGradingCancel.Name = "barBtnGradingCancel";
+            // 
+            // 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
             // 
@@ -281,9 +327,24 @@
             pageGroupModel.ItemLinks.Add(barBtnSearch);
             pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
             pageGroupModel.ItemLinks.Add(barBtnSetList);
-            pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
+            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(barBtnGradingSet);
+            ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
+            ribbonPageGroup1.ItemLinks.Add(barBtnGradingCancel);
+            ribbonPageGroup1.Name = "ribbonPageGroup1";
+            ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
             // 
             // ribbonPageGroup2
             // 
@@ -296,6 +357,8 @@
             // ribbonPageGroup3
             // 
             ribbonPageGroup3.ItemLinks.Add(barBtnSave);
+            ribbonPageGroup3.ItemLinks.Add(barBtnHydroExportInp);
+            ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
             ribbonPageGroup3.Name = "ribbonPageGroup3";
             ribbonPageGroup3.Text = "鏇村...";
             // 
@@ -312,9 +375,9 @@
             tabPane1.Location = new Point(0, 128);
             tabPane1.Name = "tabPane1";
             tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
-            tabPane1.RegularSize = new Size(843, 407);
+            tabPane1.RegularSize = new Size(931, 407);
             tabPane1.SelectedPage = tabPageBimface;
-            tabPane1.Size = new Size(843, 407);
+            tabPane1.Size = new Size(931, 407);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
@@ -322,7 +385,7 @@
             // 
             tabPageBimface.Caption = "涓夌淮妯″瀷";
             tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(843, 374);
+            tabPageBimface.Size = new Size(931, 374);
             // 
             // tabPageQ3d
             // 
@@ -341,7 +404,7 @@
             docPnlRight.Controls.Add(controlContainerRight);
             docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
             docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
-            docPnlRight.Location = new Point(843, 128);
+            docPnlRight.Location = new Point(931, 128);
             docPnlRight.Name = "docPnlRight";
             docPnlRight.OriginalSize = new Size(275, 200);
             docPnlRight.Size = new Size(275, 572);
@@ -362,14 +425,14 @@
             docPnlBottom.Location = new Point(0, 535);
             docPnlBottom.Name = "docPnlBottom";
             docPnlBottom.OriginalSize = new Size(200, 165);
-            docPnlBottom.Size = new Size(843, 165);
+            docPnlBottom.Size = new Size(931, 165);
             docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
             // 
             // controlContainerBottom
             // 
             controlContainerBottom.Location = new Point(3, 27);
             controlContainerBottom.Name = "controlContainerBottom";
-            controlContainerBottom.Size = new Size(837, 135);
+            controlContainerBottom.Size = new Size(925, 135);
             controlContainerBottom.TabIndex = 0;
             // 
             // svgImg32
@@ -393,49 +456,6 @@
             rmSet.Name = "rmSet";
             rmSet.Ribbon = ribbonControl1;
             // 
-            // ribbonPageGroup1
-            // 
-            ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
-            ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
-            ribbonPageGroup1.ItemLinks.Add(barBtnGradingCancel);
-            ribbonPageGroup1.Name = "ribbonPageGroup1";
-            ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
-            // 
-            // barBtnGradingSet
-            // 
-            barBtnGradingSet.Caption = "閰嶇疆";
-            barBtnGradingSet.Id = 34;
-            barBtnGradingSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingSet.ImageOptions.SvgImage");
-            barBtnGradingSet.Name = "barBtnGradingSet";
-            // 
-            // barBtnGradingApply
-            // 
-            barBtnGradingApply.Caption = "搴旂敤";
-            barBtnGradingApply.Id = 35;
-            barBtnGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingApply.ImageOptions.SvgImage");
-            barBtnGradingApply.Name = "barBtnGradingApply";
-            // 
-            // barBtnGradingCancel
-            // 
-            barBtnGradingCancel.Caption = "鍏抽棴";
-            barBtnGradingCancel.Id = 36;
-            barBtnGradingCancel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingCancel.ImageOptions.SvgImage");
-            barBtnGradingCancel.Name = "barBtnGradingCancel";
-            // 
-            // ribbonPageGroup5
-            // 
-            ribbonPageGroup5.ItemLinks.Add(barBtnMarkSet);
-            ribbonPageGroup5.ItemLinks.Add(barBtnMarkCancel);
-            ribbonPageGroup5.Name = "ribbonPageGroup5";
-            ribbonPageGroup5.Text = "鏍囨敞";
-            // 
-            // barBtnMarkCancel
-            // 
-            barBtnMarkCancel.Caption = "鍙栨秷";
-            barBtnMarkCancel.Id = 37;
-            barBtnMarkCancel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMarkCancel.ImageOptions.SvgImage");
-            barBtnMarkCancel.Name = "barBtnMarkCancel";
-            // 
             // XhsProjectSimulationCorePage
             // 
             Appearance.BackColor = SystemColors.Control;
@@ -448,7 +468,7 @@
             Controls.Add(ribbonControl1);
             Margin = new Padding(2);
             Name = "XhsProjectSimulationCorePage";
-            Size = new Size(1118, 700);
+            Size = new Size(1206, 700);
             ((ISupportInitialize)ribbonControl1).EndInit();
             ((ISupportInitialize)tabPane1).EndInit();
             tabPane1.ResumeLayout(false);
@@ -507,5 +527,7 @@
         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