From 57051b41eb245cd3dc68ed9167f492df5de9d04c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 九月 2024 15:35:59 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 88 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 23 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 8360ec9..935bc9a 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
@@ -58,6 +58,9 @@
docPnlProperty = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
xhsProjectSimulationPropertyCtrl1 = new XhsProjectSimulationPropertyCtrl();
+ 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();
@@ -73,6 +76,8 @@
((ISupportInitialize)dockManager1).BeginInit();
docPnlProperty.SuspendLayout();
dockPanel1_Container.SuspendLayout();
+ docPnlHydroParterList.SuspendLayout();
+ controlContainer3.SuspendLayout();
docPnlHydroCalcu.SuspendLayout();
controlContainer2.SuspendLayout();
docPnlHydroCheck.SuspendLayout();
@@ -92,7 +97,7 @@
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
- ribbonControl1.Size = new Size(1051, 101);
+ ribbonControl1.Size = new Size(1161, 128);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnHydroCheck
@@ -235,12 +240,12 @@
tabPane1.Controls.Add(pageBimface);
tabPane1.Controls.Add(pageQ3d);
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(776, 161);
+ tabPane1.RegularSize = new Size(886, 208);
tabPane1.SelectedPage = pageBimface;
- tabPane1.Size = new Size(776, 161);
+ tabPane1.Size = new Size(886, 208);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -249,14 +254,14 @@
pageBimface.Caption = "涓夌淮妯″瀷";
pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(776, 128);
+ pageBimface.Size = new Size(886, 175);
//
// xhsProjectSimulationBimfaceCtrl1
//
xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
- xhsProjectSimulationBimfaceCtrl1.Size = new Size(776, 128);
+ xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 175);
xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent;
//
@@ -278,7 +283,7 @@
// dockManager1
//
dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroCalcu, docPnlHydroCheck });
+ dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck });
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
@@ -286,10 +291,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(776, 101);
+ docPnlProperty.Location = new Point(886, 128);
docPnlProperty.Name = "docPnlProperty";
docPnlProperty.OriginalSize = new Size(275, 200);
- docPnlProperty.Size = new Size(275, 649);
+ docPnlProperty.Size = new Size(275, 960);
docPnlProperty.Text = "灞炴��";
//
// dockPanel1_Container
@@ -297,7 +302,7 @@
dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
dockPanel1_Container.Location = new Point(4, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(268, 620);
+ dockPanel1_Container.Size = new Size(268, 931);
dockPanel1_Container.TabIndex = 0;
//
// xhsProjectSimulationPropertyCtrl1
@@ -305,8 +310,39 @@
xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 620);
+ xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 931);
xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
+ xhsProjectSimulationPropertyCtrl1.GetHydroInfoEvent += xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent;
+ //
+ // docPnlHydroParterList
+ //
+ docPnlHydroParterList.Controls.Add(controlContainer3);
+ docPnlHydroParterList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
+ docPnlHydroParterList.FloatVertical = true;
+ docPnlHydroParterList.ID = new Guid("facc1bde-3cf7-455c-b59c-8377daa6b90e");
+ docPnlHydroParterList.Location = new Point(0, 797);
+ docPnlHydroParterList.Name = "docPnlHydroParterList";
+ docPnlHydroParterList.OriginalSize = new Size(200, 291);
+ docPnlHydroParterList.Size = new Size(886, 291);
+ docPnlHydroParterList.Text = "鏋勪欢鏄庣粏";
+ //
+ // controlContainer3
+ //
+ controlContainer3.Controls.Add(hydroParterListCtrl1);
+ controlContainer3.Location = new Point(3, 27);
+ controlContainer3.Name = "controlContainer3";
+ controlContainer3.Size = new Size(880, 261);
+ controlContainer3.TabIndex = 0;
+ //
+ // hydroParterListCtrl1
+ //
+ hydroParterListCtrl1.Dock = DockStyle.Fill;
+ hydroParterListCtrl1.HidePageWhenListIsNull = true;
+ hydroParterListCtrl1.Location = new Point(0, 0);
+ hydroParterListCtrl1.Name = "hydroParterListCtrl1";
+ hydroParterListCtrl1.Size = new Size(880, 261);
+ hydroParterListCtrl1.TabIndex = 0;
+ hydroParterListCtrl1.HydroClickEvent += hydroParterListCtrl1_HydroClickEvent;
//
// docPnlHydroCalcu
//
@@ -314,10 +350,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, 262);
+ docPnlHydroCalcu.Location = new Point(0, 561);
docPnlHydroCalcu.Name = "docPnlHydroCalcu";
docPnlHydroCalcu.OriginalSize = new Size(200, 236);
- docPnlHydroCalcu.Size = new Size(776, 236);
+ docPnlHydroCalcu.Size = new Size(886, 236);
docPnlHydroCalcu.Text = "姘村姏璁＄畻";
//
// controlContainer2
@@ -325,7 +361,7 @@
controlContainer2.Controls.Add(xhsProjectSimulationHydroCalcuFailedCtrl1);
controlContainer2.Location = new Point(3, 27);
controlContainer2.Name = "controlContainer2";
- controlContainer2.Size = new Size(770, 206);
+ controlContainer2.Size = new Size(880, 206);
controlContainer2.TabIndex = 0;
//
// xhsProjectSimulationHydroCalcuFailedCtrl1
@@ -333,7 +369,7 @@
xhsProjectSimulationHydroCalcuFailedCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationHydroCalcuFailedCtrl1.Location = new Point(0, 0);
xhsProjectSimulationHydroCalcuFailedCtrl1.Name = "xhsProjectSimulationHydroCalcuFailedCtrl1";
- xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(770, 206);
+ xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(880, 206);
xhsProjectSimulationHydroCalcuFailedCtrl1.TabIndex = 0;
//
// docPnlHydroCheck
@@ -341,12 +377,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, 262);
+ docPnlHydroCheck.Location = new Point(0, 336);
docPnlHydroCheck.Name = "docPnlHydroCheck";
- docPnlHydroCheck.OriginalSize = new Size(200, 252);
+ docPnlHydroCheck.OriginalSize = new Size(200, 225);
docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroCheck.SavedIndex = 1;
- docPnlHydroCheck.Size = new Size(776, 252);
+ docPnlHydroCheck.Size = new Size(886, 225);
docPnlHydroCheck.Text = "姘村姏鏍￠獙";
//
// controlContainer1
@@ -354,7 +390,7 @@
controlContainer1.Controls.Add(xhsProjectSimulationHydroCheckFailedCtrl1);
controlContainer1.Location = new Point(3, 27);
controlContainer1.Name = "controlContainer1";
- controlContainer1.Size = new Size(770, 222);
+ controlContainer1.Size = new Size(880, 195);
controlContainer1.TabIndex = 0;
//
// xhsProjectSimulationHydroCheckFailedCtrl1
@@ -362,7 +398,7 @@
xhsProjectSimulationHydroCheckFailedCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationHydroCheckFailedCtrl1.Location = new Point(0, 0);
xhsProjectSimulationHydroCheckFailedCtrl1.Name = "xhsProjectSimulationHydroCheckFailedCtrl1";
- xhsProjectSimulationHydroCheckFailedCtrl1.Size = new Size(770, 222);
+ xhsProjectSimulationHydroCheckFailedCtrl1.Size = new Size(880, 195);
xhsProjectSimulationHydroCheckFailedCtrl1.TabIndex = 0;
xhsProjectSimulationHydroCheckFailedCtrl1.HydroClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
//
@@ -378,13 +414,14 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
- Controls.Add(docPnlHydroCalcu);
- Controls.Add(docPnlProperty);
Controls.Add(docPnlHydroCheck);
+ Controls.Add(docPnlHydroCalcu);
+ Controls.Add(docPnlHydroParterList);
+ Controls.Add(docPnlProperty);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(1051, 750);
+ Size = new Size(1161, 1088);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
@@ -393,6 +430,8 @@
((ISupportInitialize)dockManager1).EndInit();
docPnlProperty.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
+ docPnlHydroParterList.ResumeLayout(false);
+ controlContainer3.ResumeLayout(false);
docPnlHydroCalcu.ResumeLayout(false);
controlContainer2.ResumeLayout(false);
docPnlHydroCheck.ResumeLayout(false);
@@ -439,5 +478,8 @@
private DevExpress.XtraBars.Docking.DockPanel docPnlHydroCalcu;
private DevExpress.XtraBars.Docking.ControlContainer controlContainer2;
private XhsProjectSimulationHydroCalcuFailedCtrl xhsProjectSimulationHydroCalcuFailedCtrl1;
+ private DevExpress.XtraBars.Docking.DockPanel docPnlHydroParterList;
+ private DevExpress.XtraBars.Docking.ControlContainer controlContainer3;
+ private HydroParterListCtrl hydroParterListCtrl1;
}
}
--
Gitblit v1.9.3