From 158292021eb0b31e494b5fdc26a31c58af0bf01b Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 11:55:04 +0800
Subject: [PATCH] 匹配修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 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 1eda443..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,14 +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();
barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
- barBtnOpenView = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -77,6 +76,7 @@
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();
@@ -97,13 +97,14 @@
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, barBtnAutoMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn, barBtnUnMatchingList });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.MaxItemId = 21;
ribbonControl1.Name = "ribbonControl1";
@@ -162,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
//
@@ -214,14 +215,6 @@
barBtnUnMatchingList.Name = "barBtnUnMatchingList";
barBtnUnMatchingList.ItemClick += barBtnUnMatchingList_ItemClick;
//
- // barBtnOpenView
- //
- 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;
- //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
@@ -230,11 +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.ItemLinks.Add(barBtnOpenView);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "妯″瀷";
//
@@ -287,8 +279,8 @@
xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 185);
xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
- xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent;
- xhsProjectSimulationBimfaceCtrl1.GetHydroInfoEvent += xhsProjectSimulationBimfaceCtrl1_GetHydroInfoEvent;
+ xhsProjectSimulationBimfaceCtrl1.HydroClickEvent += xhsProjectSimulationBimfaceCtrl1_HydroClickEvent;
+ xhsProjectSimulationBimfaceCtrl1.LoadCompletedEvent += xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent;
//
// pageQ3d
//
@@ -310,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
@@ -505,6 +497,11 @@
svgImg32.ImageSize = new Size(32, 32);
svgImg32.Add("calculatesheet", "image://svgimages/spreadsheet/calculatesheet.svg");
//
+ // radialMenu1
+ //
+ radialMenu1.Name = "radialMenu1";
+ radialMenu1.Ribbon = ribbonControl1;
+ //
// XhsProjectSimulationCorePage
//
Appearance.BackColor = SystemColors.Control;
@@ -542,6 +539,7 @@
docPnlUnMatchingList.ResumeLayout(false);
controlContainer4.ResumeLayout(false);
((ISupportInitialize)svgImg32).EndInit();
+ ((ISupportInitialize)radialMenu1).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -560,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;
@@ -589,11 +587,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 XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
- private DevExpress.XtraBars.BarButtonItem barBtnOpenView;
+ private XhsProjectSimulationL3dCtrl xhsProjectSimulationL3dCtrl1;
+ private DevExpress.XtraBars.Ribbon.RadialMenu radialMenu1;
}
}
--
Gitblit v1.9.3