From 9c8743941f556a486ba2cc5bcb8a7a6ec1079d0a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 11:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 216 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 164 insertions(+), 52 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 77e0c48..dfd4d74 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
@@ -37,13 +37,13 @@
barBtnSave = new DevExpress.XtraBars.BarButtonItem();
barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
barBtnShowHide = new DevExpress.XtraBars.BarButtonItem();
- barBtnAllAutoMatching = new DevExpress.XtraBars.BarButtonItem();
+ barBtnAutoMatching = new DevExpress.XtraBars.BarButtonItem();
barBtnSingleMatching = new DevExpress.XtraBars.BarSubItem();
barBtnPumpMatching = new DevExpress.XtraBars.BarButtonItem();
barBtnValveMatching = new DevExpress.XtraBars.BarButtonItem();
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();
@@ -54,10 +54,15 @@
xhsProjectSimulationBimfaceCtrl1 = new XhsProjectSimulationBimfaceCtrl();
pageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
xhsProjectSimulationQ3dCtrl1 = new XhsProjectSimulationQ3dCtrl();
+ tabPageL3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
+ xhsProjectSimulationL3dCtrl1 = new XhsProjectSimulationL3dCtrl();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
docPnlProperty = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
xhsProjectSimulationPropertyCtrl1 = new XhsProjectSimulationPropertyCtrl();
+ docPnlMatchingList = new DevExpress.XtraBars.Docking.DockPanel();
+ controlContainer5 = new DevExpress.XtraBars.Docking.ControlContainer();
+ assetsMainChoicePage1 = new Xhs.AssetsMainChoicePage();
docPnlHydroParterList = new DevExpress.XtraBars.Docking.DockPanel();
controlContainer3 = new DevExpress.XtraBars.Docking.ControlContainer();
hydroParterListCtrl1 = new HydroParterListCtrl();
@@ -67,37 +72,47 @@
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);
+ radialMenu1 = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
pageBimface.SuspendLayout();
pageQ3d.SuspendLayout();
+ tabPageL3d.SuspendLayout();
((ISupportInitialize)dockManager1).BeginInit();
docPnlProperty.SuspendLayout();
dockPanel1_Container.SuspendLayout();
+ docPnlMatchingList.SuspendLayout();
+ controlContainer5.SuspendLayout();
docPnlHydroParterList.SuspendLayout();
controlContainer3.SuspendLayout();
docPnlHydroCalcu.SuspendLayout();
controlContainer2.SuspendLayout();
docPnlHydroCheck.SuspendLayout();
controlContainer1.SuspendLayout();
+ docPnlUnMatchingList.SuspendLayout();
+ controlContainer4.SuspendLayout();
((ISupportInitialize)svgImg32).BeginInit();
+ ((ISupportInitialize)radialMenu1).BeginInit();
SuspendLayout();
//
// ribbonControl1
//
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, barBtnAutoMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn, barBtnUnMatchingList });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 19;
+ ribbonControl1.MaxItemId = 21;
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(1161, 101);
+ ribbonControl1.Size = new Size(1161, 128);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnHydroCheck
@@ -148,13 +163,13 @@
barBtnShowHide.Name = "barBtnShowHide";
barBtnShowHide.ItemClick += barBtnShowHide_ItemClick;
//
- // barBtnAllAutoMatching
+ // barBtnAutoMatching
//
- barBtnAllAutoMatching.Caption = "鑷姩鍖归厤";
- barBtnAllAutoMatching.Id = 10;
- barBtnAllAutoMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAllAutoMatching.ImageOptions.SvgImage");
- barBtnAllAutoMatching.Name = "barBtnAllAutoMatching";
- barBtnAllAutoMatching.ItemClick += barBtnAllAutoMatching_ItemClick;
+ barBtnAutoMatching.Caption = "鑷姩鍖归厤";
+ barBtnAutoMatching.Id = 10;
+ barBtnAutoMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAutoMatching.ImageOptions.SvgImage");
+ barBtnAutoMatching.Name = "barBtnAutoMatching";
+ barBtnAutoMatching.ItemClick += barBtnAutoMatching_ItemClick;
//
// barBtnSingleMatching
//
@@ -192,13 +207,13 @@
barBtn.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtn.ImageOptions.SvgImage");
barBtn.Name = "barBtn";
//
- // BtnPerformChart
+ // barBtnUnMatchingList
//
- BtnPerformChart.Caption = "鏄剧ず鏇茬嚎";
- BtnPerformChart.Id = 18;
- BtnPerformChart.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnPerformChart.ImageOptions.SvgImage");
- BtnPerformChart.Name = "BtnPerformChart";
- BtnPerformChart.ItemClick += BtnPerformChart_ItemClick;
+ 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
//
@@ -208,7 +223,8 @@
//
// ribbonPageGroup1
//
- ribbonPageGroup1.ItemLinks.Add(barBtnAllAutoMatching);
+ ribbonPageGroup1.ItemLinks.Add(barBtnAutoMatching);
+ ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList);
ribbonPageGroup1.ItemLinks.Add(barBtnSingleMatching);
ribbonPageGroup1.ItemLinks.Add(barBtnShowHide);
ribbonPageGroup1.Name = "ribbonPageGroup1";
@@ -226,7 +242,6 @@
// ribbonPageGroup3
//
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
- ribbonPageGroup3.ItemLinks.Add(BtnPerformChart);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
//
@@ -239,13 +254,14 @@
//
tabPane1.Controls.Add(pageBimface);
tabPane1.Controls.Add(pageQ3d);
+ tabPane1.Controls.Add(tabPageL3d);
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[] { pageBimface, pageQ3d });
- tabPane1.RegularSize = new Size(886, 235);
+ tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d, tabPageL3d });
+ tabPane1.RegularSize = new Size(886, 218);
tabPane1.SelectedPage = pageBimface;
- tabPane1.Size = new Size(886, 235);
+ tabPane1.Size = new Size(886, 218);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -254,36 +270,52 @@
pageBimface.Caption = "涓夌淮妯″瀷";
pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(886, 202);
+ pageBimface.Size = new Size(886, 185);
//
// 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, 185);
xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
- xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent;
+ xhsProjectSimulationBimfaceCtrl1.HydroClickEvent += xhsProjectSimulationBimfaceCtrl1_HydroClickEvent;
+ xhsProjectSimulationBimfaceCtrl1.LoadCompletedEvent += xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent;
//
// pageQ3d
//
pageQ3d.Caption = "姘村姏妯″瀷";
pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1);
pageQ3d.Name = "pageQ3d";
- pageQ3d.Size = new Size(776, 301);
+ pageQ3d.Size = new Size(886, 185);
//
// xhsProjectSimulationQ3dCtrl1
//
xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
- xhsProjectSimulationQ3dCtrl1.Size = new Size(776, 301);
+ xhsProjectSimulationQ3dCtrl1.Size = new Size(886, 185);
xhsProjectSimulationQ3dCtrl1.TabIndex = 0;
+ //
+ // tabPageL3d
+ //
+ tabPageL3d.Caption = "L3d";
+ tabPageL3d.Controls.Add(xhsProjectSimulationL3dCtrl1);
+ tabPageL3d.Name = "tabPageL3d";
+ tabPageL3d.Size = new Size(886, 185);
+ //
+ // xhsProjectSimulationL3dCtrl1
+ //
+ xhsProjectSimulationL3dCtrl1.Dock = DockStyle.Fill;
+ xhsProjectSimulationL3dCtrl1.Location = new Point(0, 0);
+ xhsProjectSimulationL3dCtrl1.Name = "xhsProjectSimulationL3dCtrl1";
+ xhsProjectSimulationL3dCtrl1.Size = new Size(886, 185);
+ xhsProjectSimulationL3dCtrl1.TabIndex = 0;
//
// 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, docPnlMatchingList, 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
@@ -291,10 +323,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(886, 101);
+ docPnlProperty.Location = new Point(886, 128);
docPnlProperty.Name = "docPnlProperty";
docPnlProperty.OriginalSize = new Size(275, 200);
- docPnlProperty.Size = new Size(275, 987);
+ docPnlProperty.Size = new Size(275, 611);
docPnlProperty.Text = "灞炴��";
//
// dockPanel1_Container
@@ -302,7 +334,7 @@
dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
dockPanel1_Container.Location = new Point(4, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(268, 958);
+ dockPanel1_Container.Size = new Size(268, 582);
dockPanel1_Container.TabIndex = 0;
//
// xhsProjectSimulationPropertyCtrl1
@@ -310,9 +342,37 @@
xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 958);
+ xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 582);
xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
xhsProjectSimulationPropertyCtrl1.GetHydroInfoEvent += xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent;
+ //
+ // docPnlMatchingList
+ //
+ docPnlMatchingList.Controls.Add(controlContainer5);
+ docPnlMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
+ docPnlMatchingList.FloatVertical = true;
+ docPnlMatchingList.ID = new Guid("19fbbff8-5202-46bc-b9f4-472249e3c49a");
+ docPnlMatchingList.Location = new Point(0, 680);
+ docPnlMatchingList.Name = "docPnlMatchingList";
+ docPnlMatchingList.OriginalSize = new Size(200, 59);
+ docPnlMatchingList.Size = new Size(886, 59);
+ docPnlMatchingList.Text = "鍖归厤鍒楄〃";
+ //
+ // controlContainer5
+ //
+ controlContainer5.Controls.Add(assetsMainChoicePage1);
+ controlContainer5.Location = new Point(3, 27);
+ controlContainer5.Name = "controlContainer5";
+ controlContainer5.Size = new Size(880, 29);
+ controlContainer5.TabIndex = 0;
+ //
+ // assetsMainChoicePage1
+ //
+ assetsMainChoicePage1.Dock = DockStyle.Fill;
+ assetsMainChoicePage1.Location = new Point(0, 0);
+ assetsMainChoicePage1.Name = "assetsMainChoicePage1";
+ assetsMainChoicePage1.Size = new Size(880, 29);
+ assetsMainChoicePage1.TabIndex = 0;
//
// docPnlHydroParterList
//
@@ -320,10 +380,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, 572);
+ docPnlHydroParterList.Location = new Point(0, 601);
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 +391,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 +400,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 +410,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, 336);
+ docPnlHydroCalcu.Location = new Point(0, 517);
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 +421,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 +429,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 +437,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, 429);
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 +450,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,14 +458,49 @@
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, 346);
+ 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
//
svgImg32.ImageSize = new Size(32, 32);
svgImg32.Add("calculatesheet", "image://svgimages/spreadsheet/calculatesheet.svg");
+ //
+ // radialMenu1
+ //
+ radialMenu1.Name = "radialMenu1";
+ radialMenu1.Ribbon = ribbonControl1;
//
// XhsProjectSimulationCorePage
//
@@ -414,29 +509,37 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
+ Controls.Add(docPnlUnMatchingList);
+ Controls.Add(docPnlHydroCheck);
Controls.Add(docPnlHydroCalcu);
Controls.Add(docPnlHydroParterList);
+ Controls.Add(docPnlMatchingList);
Controls.Add(docPnlProperty);
- Controls.Add(docPnlHydroCheck);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(1161, 1088);
+ Size = new Size(1161, 739);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
pageBimface.ResumeLayout(false);
pageQ3d.ResumeLayout(false);
+ tabPageL3d.ResumeLayout(false);
((ISupportInitialize)dockManager1).EndInit();
docPnlProperty.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
+ docPnlMatchingList.ResumeLayout(false);
+ controlContainer5.ResumeLayout(false);
docPnlHydroParterList.ResumeLayout(false);
controlContainer3.ResumeLayout(false);
docPnlHydroCalcu.ResumeLayout(false);
controlContainer2.ResumeLayout(false);
docPnlHydroCheck.ResumeLayout(false);
controlContainer1.ResumeLayout(false);
+ docPnlUnMatchingList.ResumeLayout(false);
+ controlContainer4.ResumeLayout(false);
((ISupportInitialize)svgImg32).EndInit();
+ ((ISupportInitialize)radialMenu1).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -455,7 +558,7 @@
private DevExpress.XtraBars.BarButtonItem barBtnShowHide;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
- private DevExpress.XtraBars.BarButtonItem barBtnAllAutoMatching;
+ private DevExpress.XtraBars.BarButtonItem barBtnAutoMatching;
private DevExpress.XtraBars.BarSubItem barBtnSingleMatching;
private DevExpress.XtraBars.BarButtonItem barBtnPumpMatching;
private DevExpress.XtraBars.BarButtonItem barBtnValveMatching;
@@ -471,7 +574,6 @@
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;
@@ -481,5 +583,15 @@
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 DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
+ private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageL3d;
+ private DevExpress.XtraBars.Docking.DockPanel docPnlMatchingList;
+ private DevExpress.XtraBars.Docking.ControlContainer controlContainer5;
+ private Xhs.AssetsMainChoicePage assetsMainChoicePage1;
+ private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
+ private XhsProjectSimulationL3dCtrl xhsProjectSimulationL3dCtrl1;
+ private DevExpress.XtraBars.Ribbon.RadialMenu radialMenu1;
}
}
--
Gitblit v1.9.3