From eefee3b1cee392b480bd6c29109ad3d8e3cb89c1 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 14 十月 2024 16:02:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 137 +++++++++++++++++----------------------------
1 files changed, 53 insertions(+), 84 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index 6fe4649..fb07945 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -53,6 +53,7 @@
barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
barBtnFeatCurve = new DevExpress.XtraBars.BarButtonItem();
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
+ barBtnMark = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -60,14 +61,11 @@
ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
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();
+ tabPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
+ tabPageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
- docPnlProperty = new DevExpress.XtraBars.Docking.DockPanel();
- dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- xhsProjectSimulationPropertyCtrl1 = new XhsProjectSimulationPropertyCtrl();
+ docPnlRight = new DevExpress.XtraBars.Docking.DockPanel();
+ controlContainerRight = new DevExpress.XtraBars.Docking.ControlContainer();
docPnlBottom = new DevExpress.XtraBars.Docking.DockPanel();
controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
@@ -75,11 +73,8 @@
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
- pageBimface.SuspendLayout();
- pageQ3d.SuspendLayout();
((ISupportInitialize)dockManager1).BeginInit();
- docPnlProperty.SuspendLayout();
- dockPanel1_Container.SuspendLayout();
+ docPnlRight.SuspendLayout();
docPnlBottom.SuspendLayout();
((ISupportInitialize)svgImg32).BeginInit();
((ISupportInitialize)rmSet).BeginInit();
@@ -89,9 +84,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, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnFeatCurve, barBtnSearch });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnFeatCurve, barBtnSearch, barBtnMark });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 33;
+ ribbonControl1.MaxItemId = 34;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -253,6 +248,14 @@
barBtnSearch.Name = "barBtnSearch";
barBtnSearch.ItemClick += barBtnSearch_ItemClick;
//
+ // barBtnMark
+ //
+ barBtnMark.Caption = "鏍囨敞";
+ barBtnMark.Id = 33;
+ barBtnMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMark.ImageOptions.SvgImage");
+ barBtnMark.Name = "barBtnMark";
+ barBtnMark.ItemClick += barBtnMark_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup2, ribbonPageGroup3 });
@@ -269,10 +272,11 @@
// pageGroupModel
//
pageGroupModel.ItemLinks.Add(barBtnShowHide);
+ pageGroupModel.ItemLinks.Add(barBtnSearch);
pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barBtnSearch);
pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
+ pageGroupModel.ItemLinks.Add(barBtnMark);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
//
@@ -285,8 +289,8 @@
//
// ribbonPageGroup3
//
- ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
+ ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
//
@@ -297,83 +301,53 @@
//
// tabPane1
//
- tabPane1.Controls.Add(pageBimface);
- tabPane1.Controls.Add(pageQ3d);
+ tabPane1.Controls.Add(tabPageBimface);
+ tabPane1.Controls.Add(tabPageQ3d);
tabPane1.Dock = DockStyle.Fill;
tabPane1.Location = new Point(0, 128);
tabPane1.Name = "tabPane1";
- tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d });
+ tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
tabPane1.RegularSize = new Size(692, 340);
- tabPane1.SelectedPage = pageBimface;
+ tabPane1.SelectedPage = tabPageBimface;
tabPane1.Size = new Size(692, 340);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
- // pageBimface
+ // tabPageBimface
//
- pageBimface.Caption = "涓夌淮妯″瀷";
- pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
- pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(692, 307);
+ tabPageBimface.Caption = "涓夌淮妯″瀷";
+ tabPageBimface.Name = "tabPageBimface";
+ tabPageBimface.Size = new Size(692, 307);
//
- // xhsProjectSimulationBimfaceCtrl1
+ // tabPageQ3d
//
- xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
- xhsProjectSimulationBimfaceCtrl1.Size = new Size(692, 307);
- xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
- xhsProjectSimulationBimfaceCtrl1.HydroClickEvent += xhsProjectSimulationBimfaceCtrl1_HydroClickEvent;
- xhsProjectSimulationBimfaceCtrl1.LoadCompletedEvent += xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent;
- //
- // pageQ3d
- //
- pageQ3d.Caption = "姘村姏妯″瀷";
- pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1);
- pageQ3d.Name = "pageQ3d";
- pageQ3d.Size = new Size(692, 307);
- //
- // xhsProjectSimulationQ3dCtrl1
- //
- xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
- xhsProjectSimulationQ3dCtrl1.Size = new Size(692, 307);
- xhsProjectSimulationQ3dCtrl1.TabIndex = 0;
- xhsProjectSimulationQ3dCtrl1.ClickParterEvent += xhsProjectSimulationQ3dCtrl1_ClickParterEvent;
+ tabPageQ3d.Caption = "姘村姏妯″瀷";
+ tabPageQ3d.Name = "tabPageQ3d";
+ tabPageQ3d.Size = new Size(692, 307);
//
// dockManager1
//
dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlBottom });
+ dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlRight, docPnlBottom });
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
+ // docPnlRight
//
- 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(692, 128);
- docPnlProperty.Name = "docPnlProperty";
- docPnlProperty.OriginalSize = new Size(275, 200);
- docPnlProperty.Size = new Size(275, 505);
- docPnlProperty.Text = "灞炴��";
+ docPnlRight.Controls.Add(controlContainerRight);
+ docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+ docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
+ docPnlRight.Location = new Point(692, 128);
+ docPnlRight.Name = "docPnlRight";
+ docPnlRight.OriginalSize = new Size(275, 200);
+ docPnlRight.Size = new Size(275, 505);
+ docPnlRight.Text = "灞炴��";
//
- // dockPanel1_Container
+ // controlContainerRight
//
- dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
- dockPanel1_Container.Location = new Point(4, 26);
- dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(268, 476);
- dockPanel1_Container.TabIndex = 0;
- //
- // xhsProjectSimulationPropertyCtrl1
- //
- xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 476);
- xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
+ controlContainerRight.Location = new Point(4, 26);
+ controlContainerRight.Name = "controlContainerRight";
+ controlContainerRight.Size = new Size(268, 476);
+ controlContainerRight.TabIndex = 0;
//
// docPnlBottom
//
@@ -422,7 +396,7 @@
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
Controls.Add(docPnlBottom);
- Controls.Add(docPnlProperty);
+ Controls.Add(docPnlRight);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
@@ -430,11 +404,8 @@
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
- pageBimface.ResumeLayout(false);
- pageQ3d.ResumeLayout(false);
((ISupportInitialize)dockManager1).EndInit();
- docPnlProperty.ResumeLayout(false);
- dockPanel1_Container.ResumeLayout(false);
+ docPnlRight.ResumeLayout(false);
docPnlBottom.ResumeLayout(false);
((ISupportInitialize)svgImg32).EndInit();
((ISupportInitialize)rmSet).EndInit();
@@ -458,14 +429,11 @@
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
private DevExpress.XtraBars.BarButtonItem barBtnMatchingList;
private DevExpress.XtraBars.Navigation.TabPane tabPane1;
- private DevExpress.XtraBars.Navigation.TabNavigationPage pageBimface;
- private DevExpress.XtraBars.Navigation.TabNavigationPage pageQ3d;
+ private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageBimface;
+ private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageQ3d;
private DevExpress.XtraBars.Docking.DockManager dockManager1;
- private DevExpress.XtraBars.Docking.DockPanel docPnlProperty;
- private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
- private XhsProjectSimulationBimfaceCtrl xhsProjectSimulationBimfaceCtrl1;
- private XhsProjectSimulationQ3dCtrl xhsProjectSimulationQ3dCtrl1;
- private XhsProjectSimulationPropertyCtrl xhsProjectSimulationPropertyCtrl1;
+ private DevExpress.XtraBars.Docking.DockPanel docPnlRight;
+ private DevExpress.XtraBars.Docking.ControlContainer controlContainerRight;
private DevExpress.Utils.SvgImageCollection svgImg32;
private DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
@@ -484,5 +452,6 @@
private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
private DevExpress.XtraBars.Docking.ControlContainer controlContainerBottom;
+ private DevExpress.XtraBars.BarButtonItem barBtnMark;
}
}
--
Gitblit v1.9.3