From 01a87d5aafc5cf63275d73f0c8cfd5e626d74261 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 九月 2024 23:40:24 +0800
Subject: [PATCH] 新增未匹配列表
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 108 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 28 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 5101527..3f45632 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
@@ -44,6 +44,7 @@
barBtnPipeMatching = new DevExpress.XtraBars.BarButtonItem();
barBtn = new DevExpress.XtraBars.BarButtonItem();
BtnPerformChart = new DevExpress.XtraBars.BarButtonItem();
+ barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -67,6 +68,9 @@
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();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
@@ -82,6 +86,8 @@
controlContainer2.SuspendLayout();
docPnlHydroCheck.SuspendLayout();
controlContainer1.SuspendLayout();
+ docPnlUnMatchingList.SuspendLayout();
+ controlContainer4.SuspendLayout();
((ISupportInitialize)svgImg32).BeginInit();
SuspendLayout();
//
@@ -89,9 +95,9 @@
//
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, barBtnAllAutoMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn, BtnPerformChart });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnAllAutoMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn, BtnPerformChart, barBtnUnMatchingList });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 19;
+ ribbonControl1.MaxItemId = 20;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -200,6 +206,14 @@
BtnPerformChart.Name = "BtnPerformChart";
BtnPerformChart.ItemClick += BtnPerformChart_ItemClick;
//
+ // barBtnUnMatchingList
+ //
+ barBtnUnMatchingList.Caption = "鏈尮閰嶅垪琛�";
+ barBtnUnMatchingList.Id = 19;
+ barBtnUnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUnMatchingList.ImageOptions.SvgImage");
+ barBtnUnMatchingList.Name = "barBtnUnMatchingList";
+ barBtnUnMatchingList.ItemClick += barBtnUnMatchingList_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
@@ -211,6 +225,7 @@
ribbonPageGroup1.ItemLinks.Add(barBtnAllAutoMatching);
ribbonPageGroup1.ItemLinks.Add(barBtnSingleMatching);
ribbonPageGroup1.ItemLinks.Add(barBtnShowHide);
+ ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "妯″瀷";
//
@@ -243,9 +258,9 @@
tabPane1.Location = new Point(0, 128);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d });
- tabPane1.RegularSize = new Size(886, 208);
+ tabPane1.RegularSize = new Size(886, 228);
tabPane1.SelectedPage = pageBimface;
- tabPane1.Size = new Size(886, 208);
+ tabPane1.Size = new Size(886, 228);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -254,14 +269,14 @@
pageBimface.Caption = "涓夌淮妯″瀷";
pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(886, 202);
+ pageBimface.Size = new Size(886, 195);
//
// xhsProjectSimulationBimfaceCtrl1
//
xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
- xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 202);
+ xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 195);
xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent;
//
@@ -283,7 +298,7 @@
// dockManager1
//
dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck });
+ dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck, docPnlUnMatchingList });
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
@@ -294,7 +309,7 @@
docPnlProperty.Location = new Point(886, 128);
docPnlProperty.Name = "docPnlProperty";
docPnlProperty.OriginalSize = new Size(275, 200);
- docPnlProperty.Size = new Size(275, 960);
+ docPnlProperty.Size = new Size(275, 562);
docPnlProperty.Text = "灞炴��";
//
// dockPanel1_Container
@@ -302,7 +317,7 @@
dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
dockPanel1_Container.Location = new Point(4, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(268, 931);
+ dockPanel1_Container.Size = new Size(268, 533);
dockPanel1_Container.TabIndex = 0;
//
// xhsProjectSimulationPropertyCtrl1
@@ -310,7 +325,7 @@
xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 931);
+ xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 533);
xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
xhsProjectSimulationPropertyCtrl1.GetHydroInfoEvent += xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent;
//
@@ -320,10 +335,10 @@
docPnlHydroParterList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroParterList.FloatVertical = true;
docPnlHydroParterList.ID = new Guid("facc1bde-3cf7-455c-b59c-8377daa6b90e");
- docPnlHydroParterList.Location = new Point(0, 797);
+ docPnlHydroParterList.Location = new Point(0, 611);
docPnlHydroParterList.Name = "docPnlHydroParterList";
- docPnlHydroParterList.OriginalSize = new Size(200, 291);
- docPnlHydroParterList.Size = new Size(886, 291);
+ docPnlHydroParterList.OriginalSize = new Size(200, 79);
+ docPnlHydroParterList.Size = new Size(886, 79);
docPnlHydroParterList.Text = "鏋勪欢鏄庣粏";
//
// controlContainer3
@@ -331,7 +346,7 @@
controlContainer3.Controls.Add(hydroParterListCtrl1);
controlContainer3.Location = new Point(3, 27);
controlContainer3.Name = "controlContainer3";
- controlContainer3.Size = new Size(880, 261);
+ controlContainer3.Size = new Size(880, 49);
controlContainer3.TabIndex = 0;
//
// hydroParterListCtrl1
@@ -340,7 +355,7 @@
hydroParterListCtrl1.HidePageWhenListIsNull = true;
hydroParterListCtrl1.Location = new Point(0, 0);
hydroParterListCtrl1.Name = "hydroParterListCtrl1";
- hydroParterListCtrl1.Size = new Size(880, 261);
+ hydroParterListCtrl1.Size = new Size(880, 49);
hydroParterListCtrl1.TabIndex = 0;
hydroParterListCtrl1.HydroClickEvent += hydroParterListCtrl1_HydroClickEvent;
//
@@ -350,10 +365,10 @@
docPnlHydroCalcu.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroCalcu.FloatVertical = true;
docPnlHydroCalcu.ID = new Guid("ac7055c0-e9fe-40c2-bf51-83dde5710cd4");
- docPnlHydroCalcu.Location = new Point(0, 561);
+ docPnlHydroCalcu.Location = new Point(0, 527);
docPnlHydroCalcu.Name = "docPnlHydroCalcu";
- docPnlHydroCalcu.OriginalSize = new Size(200, 236);
- docPnlHydroCalcu.Size = new Size(886, 236);
+ docPnlHydroCalcu.OriginalSize = new Size(200, 84);
+ docPnlHydroCalcu.Size = new Size(886, 84);
docPnlHydroCalcu.Text = "姘村姏璁＄畻";
//
// controlContainer2
@@ -361,7 +376,7 @@
controlContainer2.Controls.Add(xhsProjectSimulationHydroCalcuFailedCtrl1);
controlContainer2.Location = new Point(3, 27);
controlContainer2.Name = "controlContainer2";
- controlContainer2.Size = new Size(880, 206);
+ controlContainer2.Size = new Size(880, 54);
controlContainer2.TabIndex = 0;
//
// xhsProjectSimulationHydroCalcuFailedCtrl1
@@ -369,7 +384,7 @@
xhsProjectSimulationHydroCalcuFailedCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationHydroCalcuFailedCtrl1.Location = new Point(0, 0);
xhsProjectSimulationHydroCalcuFailedCtrl1.Name = "xhsProjectSimulationHydroCalcuFailedCtrl1";
- xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(880, 206);
+ xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(880, 54);
xhsProjectSimulationHydroCalcuFailedCtrl1.TabIndex = 0;
//
// docPnlHydroCheck
@@ -377,12 +392,12 @@
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, 336);
+ docPnlHydroCheck.Location = new Point(0, 439);
docPnlHydroCheck.Name = "docPnlHydroCheck";
- docPnlHydroCheck.OriginalSize = new Size(200, 225);
+ docPnlHydroCheck.OriginalSize = new Size(200, 88);
docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroCheck.SavedIndex = 1;
- docPnlHydroCheck.Size = new Size(886, 225);
+ docPnlHydroCheck.Size = new Size(886, 88);
docPnlHydroCheck.Text = "姘村姏鏍￠獙";
//
// controlContainer1
@@ -390,7 +405,7 @@
controlContainer1.Controls.Add(xhsProjectSimulationHydroCheckFailedCtrl1);
controlContainer1.Location = new Point(3, 27);
controlContainer1.Name = "controlContainer1";
- controlContainer1.Size = new Size(880, 195);
+ controlContainer1.Size = new Size(880, 58);
controlContainer1.TabIndex = 0;
//
// xhsProjectSimulationHydroCheckFailedCtrl1
@@ -398,9 +413,39 @@
xhsProjectSimulationHydroCheckFailedCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationHydroCheckFailedCtrl1.Location = new Point(0, 0);
xhsProjectSimulationHydroCheckFailedCtrl1.Name = "xhsProjectSimulationHydroCheckFailedCtrl1";
- xhsProjectSimulationHydroCheckFailedCtrl1.Size = new Size(880, 195);
+ 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.ID = new Guid("fdc5c4e2-7bd3-4114-90a6-3cd0ed365103");
+ docPnlUnMatchingList.Location = new Point(0, 356);
+ 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;
//
// svgImg32
//
@@ -414,14 +459,15 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
- Controls.Add(docPnlProperty);
+ Controls.Add(docPnlUnMatchingList);
+ Controls.Add(docPnlHydroCheck);
Controls.Add(docPnlHydroCalcu);
Controls.Add(docPnlHydroParterList);
- Controls.Add(docPnlHydroCheck);
+ Controls.Add(docPnlProperty);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(1161, 1088);
+ Size = new Size(1161, 690);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
@@ -436,6 +482,8 @@
controlContainer2.ResumeLayout(false);
docPnlHydroCheck.ResumeLayout(false);
controlContainer1.ResumeLayout(false);
+ docPnlUnMatchingList.ResumeLayout(false);
+ controlContainer4.ResumeLayout(false);
((ISupportInitialize)svgImg32).EndInit();
ResumeLayout(false);
PerformLayout();
@@ -481,5 +529,9 @@
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 XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
+ private DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
}
}
--
Gitblit v1.9.3