From 30e078df2eae453b8ea39680816d5abbf5c51b25 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 14:01:07 +0800
Subject: [PATCH] Xhs匹配改造，有错误
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 146 +++++++-----------------------------------------
1 files changed, 21 insertions(+), 125 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 f437c4f..64deb50 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,7 +37,7 @@
barBtnSave = new DevExpress.XtraBars.BarButtonItem();
barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
barBtnShowHide = new DevExpress.XtraBars.BarButtonItem();
- barBtnAllAutoMatching = new DevExpress.XtraBars.BarButtonItem();
+ barBtnMatching = new DevExpress.XtraBars.BarButtonItem();
barBtnSingleMatching = new DevExpress.XtraBars.BarSubItem();
barBtnPumpMatching = new DevExpress.XtraBars.BarButtonItem();
barBtnValveMatching = new DevExpress.XtraBars.BarButtonItem();
@@ -51,59 +51,44 @@
ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
pageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
- 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();
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();
docPnlUnMatchingList = new DevExpress.XtraBars.Docking.DockPanel();
controlContainer4 = new DevExpress.XtraBars.Docking.ControlContainer();
- xhsProjectSimulationUnMatchingListCtrl1 = new XhsProjectSimulationUnMatchingListCtrl();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
- barBtnOpenView = new DevExpress.XtraBars.BarButtonItem();
+ 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, barBtnUnMatchingList, barBtnOpenView });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn, barBtnUnMatchingList });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.MaxItemId = 21;
ribbonControl1.Name = "ribbonControl1";
@@ -162,13 +147,13 @@
barBtnShowHide.Name = "barBtnShowHide";
barBtnShowHide.ItemClick += barBtnShowHide_ItemClick;
//
- // barBtnAllAutoMatching
+ // barBtnMatching
//
- barBtnAllAutoMatching.Caption = "鑷姩鍖归厤";
- barBtnAllAutoMatching.Id = 10;
- barBtnAllAutoMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAllAutoMatching.ImageOptions.SvgImage");
- barBtnAllAutoMatching.Name = "barBtnAllAutoMatching";
- barBtnAllAutoMatching.ItemClick += barBtnAllAutoMatching_ItemClick;
+ barBtnMatching.Caption = "鑷姩鍖归厤";
+ barBtnMatching.Id = 10;
+ barBtnMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAutoMatching.ImageOptions.SvgImage");
+ barBtnMatching.Name = "barBtnMatching";
+ barBtnMatching.ItemClick += barBtnMatching_ItemClick;
//
// barBtnSingleMatching
//
@@ -222,11 +207,10 @@
//
// ribbonPageGroup1
//
- ribbonPageGroup1.ItemLinks.Add(barBtnAllAutoMatching);
+ ribbonPageGroup1.ItemLinks.Add(barBtnMatching);
+ ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList);
ribbonPageGroup1.ItemLinks.Add(barBtnSingleMatching);
ribbonPageGroup1.ItemLinks.Add(barBtnShowHide);
- ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList);
- ribbonPageGroup1.ItemLinks.Add(barBtnOpenView);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "妯″瀷";
//
@@ -268,48 +252,20 @@
// pageBimface
//
pageBimface.Caption = "涓夌淮妯″瀷";
- pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
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, 185);
- xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
- xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent;
//
// pageQ3d
//
pageQ3d.Caption = "姘村姏妯″瀷";
- pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1);
pageQ3d.Name = "pageQ3d";
pageQ3d.Size = new Size(886, 185);
- //
- // xhsProjectSimulationQ3dCtrl1
- //
- xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
- 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, 195);
- //
- // xhsProjectSimulationL3dCtrl1
- //
- xhsProjectSimulationL3dCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationL3dCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationL3dCtrl1.Name = "xhsProjectSimulationL3dCtrl1";
- xhsProjectSimulationL3dCtrl1.Size = new Size(886, 195);
- xhsProjectSimulationL3dCtrl1.TabIndex = 0;
+ tabPageL3d.Size = new Size(886, 185);
//
// dockManager1
//
@@ -330,20 +286,10 @@
//
// dockPanel1_Container
//
- dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
dockPanel1_Container.Location = new Point(4, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
dockPanel1_Container.Size = new Size(268, 582);
dockPanel1_Container.TabIndex = 0;
- //
- // xhsProjectSimulationPropertyCtrl1
- //
- xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 582);
- xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
- xhsProjectSimulationPropertyCtrl1.GetHydroInfoEvent += xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent;
//
// docPnlMatchingList
//
@@ -359,19 +305,10 @@
//
// 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
//
@@ -417,19 +354,10 @@
//
// controlContainer2
//
- controlContainer2.Controls.Add(xhsProjectSimulationHydroCalcuFailedCtrl1);
controlContainer2.Location = new Point(3, 27);
controlContainer2.Name = "controlContainer2";
controlContainer2.Size = new Size(880, 54);
controlContainer2.TabIndex = 0;
- //
- // xhsProjectSimulationHydroCalcuFailedCtrl1
- //
- xhsProjectSimulationHydroCalcuFailedCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationHydroCalcuFailedCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationHydroCalcuFailedCtrl1.Name = "xhsProjectSimulationHydroCalcuFailedCtrl1";
- xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(880, 54);
- xhsProjectSimulationHydroCalcuFailedCtrl1.TabIndex = 0;
//
// docPnlHydroCheck
//
@@ -446,20 +374,10 @@
//
// controlContainer1
//
- controlContainer1.Controls.Add(xhsProjectSimulationHydroCheckFailedCtrl1);
controlContainer1.Location = new Point(3, 27);
controlContainer1.Name = "controlContainer1";
controlContainer1.Size = new Size(880, 58);
controlContainer1.TabIndex = 0;
- //
- // xhsProjectSimulationHydroCheckFailedCtrl1
- //
- xhsProjectSimulationHydroCheckFailedCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationHydroCheckFailedCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationHydroCheckFailedCtrl1.Name = "xhsProjectSimulationHydroCheckFailedCtrl1";
- xhsProjectSimulationHydroCheckFailedCtrl1.Size = new Size(880, 58);
- xhsProjectSimulationHydroCheckFailedCtrl1.TabIndex = 0;
- xhsProjectSimulationHydroCheckFailedCtrl1.HydroClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
//
// docPnlUnMatchingList
//
@@ -474,35 +392,20 @@
//
// 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");
//
- // barBtnOpenView
+ // radialMenu1
//
- barBtnOpenView.Caption = "Open";
- barBtnOpenView.Id = 20;
- barBtnOpenView.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnOpenView.ImageOptions.SvgImage");
- barBtnOpenView.Name = "barBtnOpenView";
- barBtnOpenView.ItemClick += barBtnOpenView_ItemClick;
+ radialMenu1.Name = "radialMenu1";
+ radialMenu1.Ribbon = ribbonControl1;
//
// XhsProjectSimulationCorePage
//
@@ -524,23 +427,16 @@
((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();
}
@@ -559,7 +455,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 barBtnMatching;
private DevExpress.XtraBars.BarSubItem barBtnSingleMatching;
private DevExpress.XtraBars.BarButtonItem barBtnPumpMatching;
private DevExpress.XtraBars.BarButtonItem barBtnValveMatching;
@@ -588,11 +484,11 @@
private DevExpress.XtraBars.Docking.ControlContainer controlContainer4;
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 Xhs.XhsProjectSimulationMatchingListCtrl assetsMainChoicePage1;
private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
- private DevExpress.XtraBars.BarButtonItem barBtnOpenView;
+ private XhsProjectSimulationL3dCtrl xhsProjectSimulationL3dCtrl1;
+ private DevExpress.XtraBars.Ribbon.RadialMenu radialMenu1;
}
}
--
Gitblit v1.9.3