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 | 104 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 45 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 48d5e6b..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,12 @@
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();
@@ -75,7 +74,9 @@
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();
@@ -94,16 +95,18 @@
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, barBtnUnMatchingList });
+ 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 = 20;
+ ribbonControl1.MaxItemId = 21;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -160,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
//
@@ -204,14 +207,6 @@
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;
- //
// barBtnUnMatchingList
//
barBtnUnMatchingList.Caption = "鏈尮閰嶅垪琛�";
@@ -228,10 +223,10 @@
//
// ribbonPageGroup1
//
- ribbonPageGroup1.ItemLinks.Add(barBtnAllAutoMatching);
+ ribbonPageGroup1.ItemLinks.Add(barBtnAutoMatching);
+ ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList);
ribbonPageGroup1.ItemLinks.Add(barBtnSingleMatching);
ribbonPageGroup1.ItemLinks.Add(barBtnShowHide);
- ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "妯″瀷";
//
@@ -247,7 +242,6 @@
// ribbonPageGroup3
//
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
- ribbonPageGroup3.ItemLinks.Add(BtnPerformChart);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
//
@@ -265,9 +259,9 @@
tabPane1.Location = new Point(0, 128);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d, tabPageL3d });
- tabPane1.RegularSize = new Size(886, 169);
+ tabPane1.RegularSize = new Size(886, 218);
tabPane1.SelectedPage = pageBimface;
- tabPane1.Size = new Size(886, 169);
+ tabPane1.Size = new Size(886, 218);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -276,30 +270,31 @@
pageBimface.Caption = "涓夌淮妯″瀷";
pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(886, 136);
+ 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, 136);
+ 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
@@ -307,14 +302,14 @@
tabPageL3d.Caption = "L3d";
tabPageL3d.Controls.Add(xhsProjectSimulationL3dCtrl1);
tabPageL3d.Name = "tabPageL3d";
- tabPageL3d.Size = new Size(886, 195);
+ 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, 195);
+ xhsProjectSimulationL3dCtrl1.Size = new Size(886, 185);
xhsProjectSimulationL3dCtrl1.TabIndex = 0;
//
// dockManager1
@@ -331,7 +326,7 @@
docPnlProperty.Location = new Point(886, 128);
docPnlProperty.Name = "docPnlProperty";
docPnlProperty.OriginalSize = new Size(275, 200);
- docPnlProperty.Size = new Size(275, 562);
+ docPnlProperty.Size = new Size(275, 611);
docPnlProperty.Text = "灞炴��";
//
// dockPanel1_Container
@@ -339,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, 533);
+ dockPanel1_Container.Size = new Size(268, 582);
dockPanel1_Container.TabIndex = 0;
//
// xhsProjectSimulationPropertyCtrl1
@@ -347,7 +342,7 @@
xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 533);
+ xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 582);
xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
xhsProjectSimulationPropertyCtrl1.GetHydroInfoEvent += xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent;
//
@@ -357,7 +352,7 @@
docPnlMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlMatchingList.FloatVertical = true;
docPnlMatchingList.ID = new Guid("19fbbff8-5202-46bc-b9f4-472249e3c49a");
- docPnlMatchingList.Location = new Point(0, 297);
+ docPnlMatchingList.Location = new Point(0, 680);
docPnlMatchingList.Name = "docPnlMatchingList";
docPnlMatchingList.OriginalSize = new Size(200, 59);
docPnlMatchingList.Size = new Size(886, 59);
@@ -385,7 +380,7 @@
docPnlHydroParterList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroParterList.FloatVertical = true;
docPnlHydroParterList.ID = new Guid("facc1bde-3cf7-455c-b59c-8377daa6b90e");
- docPnlHydroParterList.Location = new Point(0, 552);
+ docPnlHydroParterList.Location = new Point(0, 601);
docPnlHydroParterList.Name = "docPnlHydroParterList";
docPnlHydroParterList.OriginalSize = new Size(200, 79);
docPnlHydroParterList.Size = new Size(886, 79);
@@ -415,7 +410,7 @@
docPnlHydroCalcu.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroCalcu.FloatVertical = true;
docPnlHydroCalcu.ID = new Guid("ac7055c0-e9fe-40c2-bf51-83dde5710cd4");
- docPnlHydroCalcu.Location = new Point(0, 468);
+ docPnlHydroCalcu.Location = new Point(0, 517);
docPnlHydroCalcu.Name = "docPnlHydroCalcu";
docPnlHydroCalcu.OriginalSize = new Size(200, 84);
docPnlHydroCalcu.Size = new Size(886, 84);
@@ -442,7 +437,7 @@
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, 380);
+ docPnlHydroCheck.Location = new Point(0, 429);
docPnlHydroCheck.Name = "docPnlHydroCheck";
docPnlHydroCheck.OriginalSize = new Size(200, 88);
docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
@@ -472,7 +467,7 @@
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, 297);
+ docPnlUnMatchingList.Location = new Point(0, 346);
docPnlUnMatchingList.Name = "docPnlUnMatchingList";
docPnlUnMatchingList.OriginalSize = new Size(200, 83);
docPnlUnMatchingList.Size = new Size(886, 83);
@@ -480,15 +475,32 @@
//
// 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
//
@@ -497,16 +509,16 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
- Controls.Add(docPnlMatchingList);
- Controls.Add(docPnlProperty);
Controls.Add(docPnlUnMatchingList);
Controls.Add(docPnlHydroCheck);
Controls.Add(docPnlHydroCalcu);
Controls.Add(docPnlHydroParterList);
+ Controls.Add(docPnlMatchingList);
+ Controls.Add(docPnlProperty);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(1161, 690);
+ Size = new Size(1161, 739);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
@@ -525,7 +537,9 @@
docPnlHydroCheck.ResumeLayout(false);
controlContainer1.ResumeLayout(false);
docPnlUnMatchingList.ResumeLayout(false);
+ controlContainer4.ResumeLayout(false);
((ISupportInitialize)svgImg32).EndInit();
+ ((ISupportInitialize)radialMenu1).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -544,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;
@@ -560,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;
@@ -572,12 +585,13 @@
private HydroParterListCtrl hydroParterListCtrl1;
private DevExpress.XtraBars.Docking.DockPanel docPnlUnMatchingList;
private DevExpress.XtraBars.Docking.ControlContainer controlContainer4;
- private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
private DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageL3d;
- private XhsProjectSimulationL3dCtrl xhsProjectSimulationL3dCtrl1;
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