From 51e9d01e923727047de0b82576611c3859a2bf99 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 九月 2024 11:04:18 +0800
Subject: [PATCH] 同步
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 118 +++++++++++++++++++++++++---------------------------------
1 files changed, 51 insertions(+), 67 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 b4e64b2..48d5e6b 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
@@ -61,6 +61,9 @@
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();
@@ -72,11 +75,7 @@
xhsProjectSimulationHydroCheckFailedCtrl1 = new XhsProjectSimulationHydroCheckFailedCtrl();
docPnlUnMatchingList = new DevExpress.XtraBars.Docking.DockPanel();
controlContainer4 = new DevExpress.XtraBars.Docking.ControlContainer();
- xhsProjectSimulationUnMatchingListCtrl1 = new XhsProjectSimulationUnMatchingListCtrl();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
- docPnlMatchingList = new DevExpress.XtraBars.Docking.DockPanel();
- controlContainer5 = new DevExpress.XtraBars.Docking.ControlContainer();
- assetsMainChoicePage1 = new Xhs.AssetsMainChoicePage();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
@@ -86,6 +85,8 @@
((ISupportInitialize)dockManager1).BeginInit();
docPnlProperty.SuspendLayout();
dockPanel1_Container.SuspendLayout();
+ docPnlMatchingList.SuspendLayout();
+ controlContainer5.SuspendLayout();
docPnlHydroParterList.SuspendLayout();
controlContainer3.SuspendLayout();
docPnlHydroCalcu.SuspendLayout();
@@ -93,10 +94,7 @@
docPnlHydroCheck.SuspendLayout();
controlContainer1.SuspendLayout();
docPnlUnMatchingList.SuspendLayout();
- controlContainer4.SuspendLayout();
((ISupportInitialize)svgImg32).BeginInit();
- docPnlMatchingList.SuspendLayout();
- controlContainer5.SuspendLayout();
SuspendLayout();
//
// ribbonControl1
@@ -111,7 +109,7 @@
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
- ribbonControl1.Size = new Size(1161, 101);
+ ribbonControl1.Size = new Size(1161, 128);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnHydroCheck
@@ -264,12 +262,12 @@
tabPane1.Controls.Add(pageQ3d);
tabPane1.Controls.Add(tabPageL3d);
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, tabPageL3d });
- tabPane1.RegularSize = new Size(886, 191);
+ tabPane1.RegularSize = new Size(886, 169);
tabPane1.SelectedPage = pageBimface;
- tabPane1.Size = new Size(886, 191);
+ tabPane1.Size = new Size(886, 169);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -278,14 +276,14 @@
pageBimface.Caption = "涓夌淮妯″瀷";
pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(886, 158);
+ pageBimface.Size = new Size(886, 136);
//
// xhsProjectSimulationBimfaceCtrl1
//
xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
- xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 158);
+ xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 136);
xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent;
//
@@ -330,10 +328,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(886, 101);
+ docPnlProperty.Location = new Point(886, 128);
docPnlProperty.Name = "docPnlProperty";
docPnlProperty.OriginalSize = new Size(275, 200);
- docPnlProperty.Size = new Size(275, 589);
+ docPnlProperty.Size = new Size(275, 562);
docPnlProperty.Text = "灞炴��";
//
// dockPanel1_Container
@@ -341,7 +339,7 @@
dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
dockPanel1_Container.Location = new Point(4, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(268, 560);
+ dockPanel1_Container.Size = new Size(268, 533);
dockPanel1_Container.TabIndex = 0;
//
// xhsProjectSimulationPropertyCtrl1
@@ -349,9 +347,37 @@
xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 560);
+ xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 533);
xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
xhsProjectSimulationPropertyCtrl1.GetHydroInfoEvent += xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent;
+ //
+ // docPnlMatchingList
+ //
+ docPnlMatchingList.Controls.Add(controlContainer5);
+ 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.Name = "docPnlMatchingList";
+ docPnlMatchingList.OriginalSize = new Size(200, 59);
+ docPnlMatchingList.Size = new Size(886, 59);
+ docPnlMatchingList.Text = "鍖归厤鍒楄〃";
+ //
+ // 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
//
@@ -359,11 +385,9 @@
docPnlHydroParterList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroParterList.FloatVertical = true;
docPnlHydroParterList.ID = new Guid("facc1bde-3cf7-455c-b59c-8377daa6b90e");
- docPnlHydroParterList.Location = new Point(0, 547);
+ docPnlHydroParterList.Location = new Point(0, 552);
docPnlHydroParterList.Name = "docPnlHydroParterList";
docPnlHydroParterList.OriginalSize = new Size(200, 79);
- docPnlHydroParterList.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
- docPnlHydroParterList.SavedIndex = 1;
docPnlHydroParterList.Size = new Size(886, 79);
docPnlHydroParterList.Text = "鏋勪欢鏄庣粏";
//
@@ -391,7 +415,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, 463);
+ docPnlHydroCalcu.Location = new Point(0, 468);
docPnlHydroCalcu.Name = "docPnlHydroCalcu";
docPnlHydroCalcu.OriginalSize = new Size(200, 84);
docPnlHydroCalcu.Size = new Size(886, 84);
@@ -418,7 +442,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, 375);
+ docPnlHydroCheck.Location = new Point(0, 380);
docPnlHydroCheck.Name = "docPnlHydroCheck";
docPnlHydroCheck.OriginalSize = new Size(200, 88);
docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
@@ -448,7 +472,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, 292);
+ docPnlUnMatchingList.Location = new Point(0, 297);
docPnlUnMatchingList.Name = "docPnlUnMatchingList";
docPnlUnMatchingList.OriginalSize = new Size(200, 83);
docPnlUnMatchingList.Size = new Size(886, 83);
@@ -456,54 +480,15 @@
//
// 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");
- //
- // docPnlMatchingList
- //
- docPnlMatchingList.Controls.Add(controlContainer5);
- docPnlMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
- docPnlMatchingList.ID = new Guid("60b9a8b8-0bf4-4f86-a966-85e5d520f431");
- docPnlMatchingList.Location = new Point(0, 626);
- docPnlMatchingList.Name = "docPnlMatchingList";
- docPnlMatchingList.OriginalSize = new Size(200, 64);
- docPnlMatchingList.Size = new Size(886, 64);
- docPnlMatchingList.Text = "鍖归厤鍒楄〃";
- //
- // controlContainer5
- //
- controlContainer5.Controls.Add(assetsMainChoicePage1);
- controlContainer5.Location = new Point(3, 27);
- controlContainer5.Name = "controlContainer5";
- controlContainer5.Size = new Size(880, 34);
- controlContainer5.TabIndex = 0;
- //
- // assetsMainChoicePage1
- //
- assetsMainChoicePage1.Dock = DockStyle.Fill;
- assetsMainChoicePage1.Location = new Point(0, 0);
- assetsMainChoicePage1.Name = "assetsMainChoicePage1";
- assetsMainChoicePage1.Size = new Size(880, 34);
- assetsMainChoicePage1.TabIndex = 0;
//
// XhsProjectSimulationCorePage
//
@@ -512,12 +497,12 @@
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";
@@ -531,6 +516,8 @@
((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);
@@ -538,10 +525,7 @@
docPnlHydroCheck.ResumeLayout(false);
controlContainer1.ResumeLayout(false);
docPnlUnMatchingList.ResumeLayout(false);
- controlContainer4.ResumeLayout(false);
((ISupportInitialize)svgImg32).EndInit();
- docPnlMatchingList.ResumeLayout(false);
- controlContainer5.ResumeLayout(false);
ResumeLayout(false);
PerformLayout();
}
--
Gitblit v1.9.3