From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingDlg.Designer.cs | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingDlg.Designer.cs
index f099f22..5f1a08f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingDlg.Designer.cs
@@ -31,17 +31,19 @@
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ assetsPressmeterSingleMatchingCtrl2 = new AssetsPressmeterSingleMatchingCtrl();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
+ ((ISupportInitialize)layoutControlItem3).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(assetsPressmeterSingleMatchingCtrl2);
layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
@@ -66,18 +68,10 @@
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3 });
Root.Name = "Root";
Root.Size = new Size(978, 552);
Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(958, 502);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
//
// layoutControlItem2
//
@@ -88,6 +82,22 @@
layoutControlItem2.TextSize = new Size(0, 0);
layoutControlItem2.TextVisible = false;
//
+ // assetsPressmeterSingleMatchingCtrl2
+ //
+ assetsPressmeterSingleMatchingCtrl2.Location = new Point(12, 12);
+ assetsPressmeterSingleMatchingCtrl2.Name = "assetsPressmeterSingleMatchingCtrl2";
+ assetsPressmeterSingleMatchingCtrl2.Size = new Size(954, 498);
+ assetsPressmeterSingleMatchingCtrl2.TabIndex = 6;
+ //
+ // layoutControlItem3
+ //
+ layoutControlItem3.Control = assetsPressmeterSingleMatchingCtrl2;
+ layoutControlItem3.Location = new Point(0, 0);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(958, 502);
+ layoutControlItem3.TextSize = new Size(0, 0);
+ layoutControlItem3.TextVisible = false;
+ //
// AssetsPressmeterSingleMatchingDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -96,12 +106,12 @@
Controls.Add(layoutControl1);
Name = "AssetsPressmeterSingleMatchingDlg";
StartPosition = FormStartPosition.CenterParent;
- Text = "姘磋〃";
+ Text = "鍘嬪姏璁�";
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
+ ((ISupportInitialize)layoutControlItem3).EndInit();
ResumeLayout(false);
}
@@ -111,7 +121,8 @@
private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
private AssetsPressmeterSingleMatchingCtrl assetsPressmeterSingleMatchingCtrl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private AssetsPressmeterSingleMatchingCtrl assetsPressmeterSingleMatchingCtrl2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
\ No newline at end of file
--
Gitblit v1.9.3