From b2e753b7d889e1a1fbc17f8b43c3dd02aa0faad4 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 九月 2024 15:35:30 +0800
Subject: [PATCH] 自动匹配界面修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 146 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 115 insertions(+), 31 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index 8059e40..8360ec9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -33,7 +33,6 @@
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barBtnHydroCheck = new DevExpress.XtraBars.BarButtonItem();
barBtnHydroCalcu = new DevExpress.XtraBars.BarButtonItem();
- barBtnParterList = new DevExpress.XtraBars.BarButtonItem();
barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
barBtnSave = new DevExpress.XtraBars.BarButtonItem();
barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
@@ -44,6 +43,7 @@
barBtnValveMatching = new DevExpress.XtraBars.BarButtonItem();
barBtnPipeMatching = new DevExpress.XtraBars.BarButtonItem();
barBtn = new DevExpress.XtraBars.BarButtonItem();
+ BtnPerformChart = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -58,6 +58,12 @@
docPnlProperty = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
xhsProjectSimulationPropertyCtrl1 = new XhsProjectSimulationPropertyCtrl();
+ 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();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
@@ -67,6 +73,10 @@
((ISupportInitialize)dockManager1).BeginInit();
docPnlProperty.SuspendLayout();
dockPanel1_Container.SuspendLayout();
+ docPnlHydroCalcu.SuspendLayout();
+ controlContainer2.SuspendLayout();
+ docPnlHydroCheck.SuspendLayout();
+ controlContainer1.SuspendLayout();
((ISupportInitialize)svgImg32).BeginInit();
SuspendLayout();
//
@@ -74,15 +84,15 @@
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnParterList, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnAllAutoMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnAllAutoMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn, BtnPerformChart });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 18;
+ ribbonControl1.MaxItemId = 19;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
- ribbonControl1.Size = new Size(951, 128);
+ ribbonControl1.Size = new Size(1051, 101);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnHydroCheck
@@ -91,7 +101,7 @@
barBtnHydroCheck.Id = 1;
barBtnHydroCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCheck.ImageOptions.SvgImage");
barBtnHydroCheck.Name = "barBtnHydroCheck";
- barBtnHydroCheck.ItemClick += barBtnCheck_ItemClick;
+ barBtnHydroCheck.ItemClick += barBtnHydroCheck_ItemClick;
//
// barBtnHydroCalcu
//
@@ -99,15 +109,7 @@
barBtnHydroCalcu.Id = 2;
barBtnHydroCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCalcu.ImageOptions.SvgImage");
barBtnHydroCalcu.Name = "barBtnHydroCalcu";
- barBtnHydroCalcu.ItemClick += barBtnCalcu_ItemClick;
- //
- // barBtnParterList
- //
- barBtnParterList.Caption = "鏋勪欢鏄庣粏";
- barBtnParterList.Id = 3;
- barBtnParterList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParterList.ImageOptions.SvgImage");
- barBtnParterList.Name = "barBtnParterList";
- barBtnParterList.ItemClick += barBtnParter_ItemClick;
+ barBtnHydroCalcu.ItemClick += barBtnHydroCalcu_ItemClick;
//
// barBtnHydroExportInp
//
@@ -115,7 +117,7 @@
barBtnHydroExportInp.Id = 4;
barBtnHydroExportInp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroExportInp.ImageOptions.SvgImage");
barBtnHydroExportInp.Name = "barBtnHydroExportInp";
- barBtnHydroExportInp.ItemClick += barBtnInp_ItemClick;
+ barBtnHydroExportInp.ItemClick += barBtnHydroExportInp_ItemClick;
//
// barBtnSave
//
@@ -131,6 +133,7 @@
barBtnHydroParterList.Id = 8;
barBtnHydroParterList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
barBtnHydroParterList.Name = "barBtnHydroParterList";
+ barBtnHydroParterList.ItemClick += barBtnHydroParterList_ItemClick;
//
// barBtnShowHide
//
@@ -138,6 +141,7 @@
barBtnShowHide.Id = 9;
barBtnShowHide.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnShowHide.ImageOptions.SvgImage");
barBtnShowHide.Name = "barBtnShowHide";
+ barBtnShowHide.ItemClick += barBtnShowHide_ItemClick;
//
// barBtnAllAutoMatching
//
@@ -145,6 +149,7 @@
barBtnAllAutoMatching.Id = 10;
barBtnAllAutoMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAllAutoMatching.ImageOptions.SvgImage");
barBtnAllAutoMatching.Name = "barBtnAllAutoMatching";
+ barBtnAllAutoMatching.ItemClick += barBtnAllAutoMatching_ItemClick;
//
// barBtnSingleMatching
//
@@ -182,6 +187,14 @@
barBtn.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtn.ImageOptions.SvgImage");
barBtn.Name = "barBtn";
//
+ // BtnPerformChart
+ //
+ BtnPerformChart.Caption = "鏄剧ず鏇茬嚎";
+ BtnPerformChart.Id = 18;
+ BtnPerformChart.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnPerformChart.ImageOptions.SvgImage");
+ BtnPerformChart.Name = "BtnPerformChart";
+ BtnPerformChart.ItemClick += BtnPerformChart_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
@@ -192,7 +205,6 @@
//
ribbonPageGroup1.ItemLinks.Add(barBtnAllAutoMatching);
ribbonPageGroup1.ItemLinks.Add(barBtnSingleMatching);
- ribbonPageGroup1.ItemLinks.Add(barBtnParterList);
ribbonPageGroup1.ItemLinks.Add(barBtnShowHide);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "妯″瀷";
@@ -209,6 +221,7 @@
// ribbonPageGroup3
//
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
+ ribbonPageGroup3.ItemLinks.Add(BtnPerformChart);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
//
@@ -222,12 +235,12 @@
tabPane1.Controls.Add(pageBimface);
tabPane1.Controls.Add(pageQ3d);
tabPane1.Dock = DockStyle.Fill;
- tabPane1.Location = new Point(0, 128);
+ tabPane1.Location = new Point(0, 101);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d });
- tabPane1.RegularSize = new Size(651, 459);
+ tabPane1.RegularSize = new Size(776, 161);
tabPane1.SelectedPage = pageBimface;
- tabPane1.Size = new Size(651, 459);
+ tabPane1.Size = new Size(776, 161);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -236,35 +249,36 @@
pageBimface.Caption = "涓夌淮妯″瀷";
pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(651, 426);
+ pageBimface.Size = new Size(776, 128);
//
// xhsProjectSimulationBimfaceCtrl1
//
xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
- xhsProjectSimulationBimfaceCtrl1.Size = new Size(651, 426);
+ xhsProjectSimulationBimfaceCtrl1.Size = new Size(776, 128);
xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
+ xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent;
//
// pageQ3d
//
pageQ3d.Caption = "姘村姏妯″瀷";
pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1);
pageQ3d.Name = "pageQ3d";
- pageQ3d.Size = new Size(651, 426);
+ pageQ3d.Size = new Size(776, 301);
//
// xhsProjectSimulationQ3dCtrl1
//
xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
- xhsProjectSimulationQ3dCtrl1.Size = new Size(651, 426);
+ xhsProjectSimulationQ3dCtrl1.Size = new Size(776, 301);
xhsProjectSimulationQ3dCtrl1.TabIndex = 0;
//
// dockManager1
//
dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty });
+ dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroCalcu, docPnlHydroCheck });
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
@@ -272,10 +286,10 @@
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(651, 128);
+ docPnlProperty.Location = new Point(776, 101);
docPnlProperty.Name = "docPnlProperty";
- docPnlProperty.OriginalSize = new Size(300, 200);
- docPnlProperty.Size = new Size(300, 459);
+ docPnlProperty.OriginalSize = new Size(275, 200);
+ docPnlProperty.Size = new Size(275, 649);
docPnlProperty.Text = "灞炴��";
//
// dockPanel1_Container
@@ -283,7 +297,7 @@
dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
dockPanel1_Container.Location = new Point(4, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(293, 430);
+ dockPanel1_Container.Size = new Size(268, 620);
dockPanel1_Container.TabIndex = 0;
//
// xhsProjectSimulationPropertyCtrl1
@@ -291,8 +305,66 @@
xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(293, 430);
+ xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 620);
xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
+ //
+ // 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, 262);
+ docPnlHydroCalcu.Name = "docPnlHydroCalcu";
+ docPnlHydroCalcu.OriginalSize = new Size(200, 236);
+ docPnlHydroCalcu.Size = new Size(776, 236);
+ docPnlHydroCalcu.Text = "姘村姏璁＄畻";
+ //
+ // controlContainer2
+ //
+ controlContainer2.Controls.Add(xhsProjectSimulationHydroCalcuFailedCtrl1);
+ controlContainer2.Location = new Point(3, 27);
+ controlContainer2.Name = "controlContainer2";
+ controlContainer2.Size = new Size(770, 206);
+ controlContainer2.TabIndex = 0;
+ //
+ // xhsProjectSimulationHydroCalcuFailedCtrl1
+ //
+ xhsProjectSimulationHydroCalcuFailedCtrl1.Dock = DockStyle.Fill;
+ xhsProjectSimulationHydroCalcuFailedCtrl1.Location = new Point(0, 0);
+ xhsProjectSimulationHydroCalcuFailedCtrl1.Name = "xhsProjectSimulationHydroCalcuFailedCtrl1";
+ xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(770, 206);
+ xhsProjectSimulationHydroCalcuFailedCtrl1.TabIndex = 0;
+ //
+ // docPnlHydroCheck
+ //
+ docPnlHydroCheck.Controls.Add(controlContainer1);
+ docPnlHydroCheck.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
+ docPnlHydroCheck.ID = new Guid("dee18895-8b3d-44cd-9001-28bee516095d");
+ docPnlHydroCheck.Location = new Point(0, 262);
+ docPnlHydroCheck.Name = "docPnlHydroCheck";
+ docPnlHydroCheck.OriginalSize = new Size(200, 252);
+ docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
+ docPnlHydroCheck.SavedIndex = 1;
+ docPnlHydroCheck.Size = new Size(776, 252);
+ docPnlHydroCheck.Text = "姘村姏鏍￠獙";
+ //
+ // controlContainer1
+ //
+ controlContainer1.Controls.Add(xhsProjectSimulationHydroCheckFailedCtrl1);
+ controlContainer1.Location = new Point(3, 27);
+ controlContainer1.Name = "controlContainer1";
+ controlContainer1.Size = new Size(770, 222);
+ controlContainer1.TabIndex = 0;
+ //
+ // xhsProjectSimulationHydroCheckFailedCtrl1
+ //
+ xhsProjectSimulationHydroCheckFailedCtrl1.Dock = DockStyle.Fill;
+ xhsProjectSimulationHydroCheckFailedCtrl1.Location = new Point(0, 0);
+ xhsProjectSimulationHydroCheckFailedCtrl1.Name = "xhsProjectSimulationHydroCheckFailedCtrl1";
+ xhsProjectSimulationHydroCheckFailedCtrl1.Size = new Size(770, 222);
+ xhsProjectSimulationHydroCheckFailedCtrl1.TabIndex = 0;
+ xhsProjectSimulationHydroCheckFailedCtrl1.HydroClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
//
// svgImg32
//
@@ -306,11 +378,13 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
+ Controls.Add(docPnlHydroCalcu);
Controls.Add(docPnlProperty);
+ Controls.Add(docPnlHydroCheck);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(951, 587);
+ Size = new Size(1051, 750);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
@@ -319,6 +393,10 @@
((ISupportInitialize)dockManager1).EndInit();
docPnlProperty.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
+ docPnlHydroCalcu.ResumeLayout(false);
+ controlContainer2.ResumeLayout(false);
+ docPnlHydroCheck.ResumeLayout(false);
+ controlContainer1.ResumeLayout(false);
((ISupportInitialize)svgImg32).EndInit();
ResumeLayout(false);
PerformLayout();
@@ -329,7 +407,6 @@
private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
private DevExpress.XtraBars.BarButtonItem barBtnHydroCheck;
private DevExpress.XtraBars.BarButtonItem barBtnHydroCalcu;
- private DevExpress.XtraBars.BarButtonItem barBtnParterList;
private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
private DevExpress.XtraBars.BarButtonItem barBtnHydroExportInp;
@@ -355,5 +432,12 @@
private XhsProjectSimulationQ3dCtrl xhsProjectSimulationQ3dCtrl1;
private XhsProjectSimulationPropertyCtrl xhsProjectSimulationPropertyCtrl1;
private DevExpress.Utils.SvgImageCollection svgImg32;
+ private DevExpress.XtraBars.BarButtonItem BtnPerformChart;
+ 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;
}
}
--
Gitblit v1.9.3