From ce9752fd657c6689ea64929eb962146e2730624e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 28 三月 2025 14:07:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs | 156 ++++++++++++++++++++++++++--------------------------
1 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs
index a8f0af1..1f3d809 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs
@@ -40,7 +40,6 @@
txtTagName = new TextEdit();
txtDescription = new MemoEdit();
imgCmbPlaceType = new ImageComboBoxEdit();
- mapSetSimpleMarkerContainer1 = new MapSetSimpleMarkerContainer();
txtName = new TextEdit();
txtAddress = new TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -48,15 +47,16 @@
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ mapSetPlaceMarkerContainer1 = new MapSetPlaceMarkerContainer();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtTagName.Properties).BeginInit();
@@ -69,25 +69,25 @@
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
+ ((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlGroup4).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
((ISupportInitialize)layoutControlGroup1).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlGroup3).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(mapSetPlaceMarkerContainer1);
layoutControl1.Controls.Add(placeInfoCtrl1);
layoutControl1.Controls.Add(setFlagsEditCtrl1);
layoutControl1.Controls.Add(txtTagName);
layoutControl1.Controls.Add(txtDescription);
layoutControl1.Controls.Add(imgCmbPlaceType);
- layoutControl1.Controls.Add(mapSetSimpleMarkerContainer1);
layoutControl1.Controls.Add(txtName);
layoutControl1.Controls.Add(txtAddress);
layoutControl1.Dock = DockStyle.Fill;
@@ -101,73 +101,62 @@
//
// placeInfoCtrl1
//
- placeInfoCtrl1.Location = new Point(514, 168);
+ placeInfoCtrl1.Location = new Point(506, 232);
placeInfoCtrl1.Margin = new Padding(3, 4, 3, 4);
placeInfoCtrl1.Name = "placeInfoCtrl1";
- placeInfoCtrl1.Size = new Size(298, 199);
+ placeInfoCtrl1.Size = new Size(306, 210);
placeInfoCtrl1.TabIndex = 7;
//
// setFlagsEditCtrl1
//
- setFlagsEditCtrl1.Location = new Point(599, 66);
+ setFlagsEditCtrl1.Location = new Point(591, 66);
setFlagsEditCtrl1.Margin = new Padding(3, 5, 3, 5);
setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
- setFlagsEditCtrl1.Size = new Size(62, 24);
+ setFlagsEditCtrl1.Size = new Size(66, 24);
setFlagsEditCtrl1.TabIndex = 5;
//
// txtTagName
//
- txtTagName.Location = new Point(750, 66);
+ txtTagName.Location = new Point(746, 66);
txtTagName.Margin = new Padding(3, 4, 3, 4);
txtTagName.Name = "txtTagName";
- txtTagName.Size = new Size(62, 24);
+ txtTagName.Size = new Size(66, 24);
txtTagName.StyleController = layoutControl1;
txtTagName.TabIndex = 4;
//
// txtDescription
//
- txtDescription.Location = new Point(514, 417);
+ txtDescription.Location = new Point(506, 492);
txtDescription.Margin = new Padding(3, 4, 3, 4);
txtDescription.Name = "txtDescription";
- txtDescription.Size = new Size(298, 199);
+ txtDescription.Size = new Size(306, 145);
txtDescription.StyleController = layoutControl1;
txtDescription.TabIndex = 8;
//
// imgCmbPlaceType
//
- imgCmbPlaceType.Location = new Point(750, 38);
+ imgCmbPlaceType.Location = new Point(746, 38);
imgCmbPlaceType.Margin = new Padding(3, 4, 3, 4);
imgCmbPlaceType.Name = "imgCmbPlaceType";
imgCmbPlaceType.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
- imgCmbPlaceType.Size = new Size(62, 24);
+ imgCmbPlaceType.Size = new Size(66, 24);
imgCmbPlaceType.StyleController = layoutControl1;
imgCmbPlaceType.TabIndex = 3;
imgCmbPlaceType.EditValueChanged += imgCmbPlaceType_EditValueChanged;
//
- // mapSetSimpleMarkerContainer1
- //
- mapSetSimpleMarkerContainer1.BorderColor = Color.LightGray;
- mapSetSimpleMarkerContainer1.BorderWidth = 1;
- mapSetSimpleMarkerContainer1.Location = new Point(-95, 27);
- mapSetSimpleMarkerContainer1.Margin = new Padding(4, 4, 4, 4);
- mapSetSimpleMarkerContainer1.Name = "mapSetSimpleMarkerContainer1";
- mapSetSimpleMarkerContainer1.ShowBorder = false;
- mapSetSimpleMarkerContainer1.Size = new Size(596, 600);
- mapSetSimpleMarkerContainer1.TabIndex = 0;
- //
// txtName
//
- txtName.Location = new Point(599, 38);
+ txtName.Location = new Point(591, 38);
txtName.Name = "txtName";
- txtName.Size = new Size(62, 24);
+ txtName.Size = new Size(66, 24);
txtName.StyleController = layoutControl1;
txtName.TabIndex = 2;
//
// txtAddress
//
- txtAddress.Location = new Point(599, 94);
+ txtAddress.Location = new Point(591, 94);
txtAddress.Name = "txtAddress";
- txtAddress.Size = new Size(213, 24);
+ txtAddress.Size = new Size(221, 24);
txtAddress.StyleController = layoutControl1;
txtAddress.TabIndex = 6;
//
@@ -179,19 +168,19 @@
Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
Root.Name = "Root";
columnDefinition1.SizeType = SizeType.Percent;
- columnDefinition1.Width = 65D;
+ columnDefinition1.Width = 60D;
columnDefinition2.SizeType = SizeType.Percent;
- columnDefinition2.Width = 35D;
+ columnDefinition2.Width = 40D;
Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1, columnDefinition2 });
- rowDefinition1.Height = 130D;
- rowDefinition1.SizeType = SizeType.AutoSize;
- rowDefinition2.Height = 249D;
- rowDefinition2.SizeType = SizeType.AutoSize;
- rowDefinition3.Height = 249D;
- rowDefinition3.SizeType = SizeType.AutoSize;
+ rowDefinition1.Height = 30D;
+ rowDefinition1.SizeType = SizeType.Percent;
+ rowDefinition2.Height = 40D;
+ rowDefinition2.SizeType = SizeType.Percent;
+ rowDefinition3.Height = 30D;
+ rowDefinition3.SizeType = SizeType.Percent;
Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3 });
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(920, 628);
+ Root.Size = new Size(824, 649);
Root.TextVisible = false;
//
// layoutControlGroup2
@@ -200,10 +189,10 @@
layoutControlGroup2.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
layoutControlGroup2.GroupStyle = DevExpress.Utils.GroupStyle.Card;
layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem5, layoutControlItem6, layoutControlItem4, layoutControlItem7 });
- layoutControlGroup2.Location = new Point(598, 0);
+ layoutControlGroup2.Location = new Point(494, 0);
layoutControlGroup2.Name = "layoutControlGroup2";
layoutControlGroup2.OptionsTableLayoutItem.ColumnIndex = 1;
- layoutControlGroup2.Size = new Size(322, 130);
+ layoutControlGroup2.Size = new Size(330, 194);
layoutControlGroup2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup2.Text = "鍩虹淇℃伅";
//
@@ -213,7 +202,7 @@
layoutControlItem2.Control = txtName;
layoutControlItem2.Location = new Point(0, 0);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(151, 28);
+ layoutControlItem2.Size = new Size(155, 28);
layoutControlItem2.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem2.TextSize = new Size(73, 18);
//
@@ -221,48 +210,48 @@
//
layoutControlItem5.AllowHtmlStringInCaption = true;
layoutControlItem5.Control = imgCmbPlaceType;
- layoutControlItem5.Location = new Point(151, 0);
+ layoutControlItem5.Location = new Point(155, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(151, 28);
+ layoutControlItem5.Size = new Size(155, 28);
layoutControlItem5.Text = "<color=red>*</color>鍦烘墍绫诲瀷:";
layoutControlItem5.TextSize = new Size(73, 18);
//
// layoutControlItem6
//
layoutControlItem6.Control = txtTagName;
- layoutControlItem6.Location = new Point(151, 28);
+ layoutControlItem6.Location = new Point(155, 28);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(151, 28);
+ layoutControlItem6.Size = new Size(155, 28);
layoutControlItem6.Text = "鏍囧織:";
layoutControlItem6.TextSize = new Size(73, 18);
- //
- // layoutControlItem7
- //
- layoutControlItem7.Control = setFlagsEditCtrl1;
- layoutControlItem7.Location = new Point(0, 28);
- layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(151, 28);
- layoutControlItem7.Text = "鏍囩:";
- layoutControlItem7.TextSize = new Size(73, 18);
//
// layoutControlItem4
//
layoutControlItem4.Control = txtAddress;
layoutControlItem4.Location = new Point(0, 56);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(302, 28);
+ layoutControlItem4.Size = new Size(310, 92);
layoutControlItem4.Text = "鍦板潃:";
layoutControlItem4.TextSize = new Size(73, 18);
+ //
+ // layoutControlItem7
+ //
+ layoutControlItem7.Control = setFlagsEditCtrl1;
+ layoutControlItem7.Location = new Point(0, 28);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(155, 28);
+ layoutControlItem7.Text = "鏍囩:";
+ layoutControlItem7.TextSize = new Size(73, 18);
//
// layoutControlGroup4
//
layoutControlGroup4.GroupStyle = DevExpress.Utils.GroupStyle.Card;
layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem8 });
- layoutControlGroup4.Location = new Point(598, 130);
+ layoutControlGroup4.Location = new Point(494, 194);
layoutControlGroup4.Name = "layoutControlGroup4";
layoutControlGroup4.OptionsTableLayoutItem.ColumnIndex = 1;
layoutControlGroup4.OptionsTableLayoutItem.RowIndex = 1;
- layoutControlGroup4.Size = new Size(322, 249);
+ layoutControlGroup4.Size = new Size(330, 260);
layoutControlGroup4.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup4.Text = "璇︾粏淇℃伅";
//
@@ -271,7 +260,7 @@
layoutControlItem8.Control = placeInfoCtrl1;
layoutControlItem8.Location = new Point(0, 0);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(302, 203);
+ layoutControlItem8.Size = new Size(310, 214);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
@@ -283,29 +272,19 @@
layoutControlGroup1.Name = "layoutControlGroup1";
layoutControlGroup1.OptionsTableLayoutItem.RowSpan = 3;
layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup1.Size = new Size(598, 628);
+ layoutControlGroup1.Size = new Size(494, 649);
layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup1.Text = "鍦板浘";
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = mapSetSimpleMarkerContainer1;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem1.Size = new Size(596, 600);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
//
// layoutControlGroup3
//
layoutControlGroup3.GroupStyle = DevExpress.Utils.GroupStyle.Card;
layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3 });
- layoutControlGroup3.Location = new Point(598, 379);
+ layoutControlGroup3.Location = new Point(494, 454);
layoutControlGroup3.Name = "layoutControlGroup3";
layoutControlGroup3.OptionsTableLayoutItem.ColumnIndex = 1;
layoutControlGroup3.OptionsTableLayoutItem.RowIndex = 2;
- layoutControlGroup3.Size = new Size(322, 249);
+ layoutControlGroup3.Size = new Size(330, 195);
layoutControlGroup3.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup3.Text = "璇存槑";
//
@@ -314,7 +293,7 @@
layoutControlItem3.Control = txtDescription;
layoutControlItem3.Location = new Point(0, 0);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(302, 203);
+ layoutControlItem3.Size = new Size(310, 149);
layoutControlItem3.Text = "璇存槑";
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
@@ -322,6 +301,27 @@
// dxErrorProvider1
//
dxErrorProvider1.ContainerControl = this;
+ //
+ // mapSetPlaceMarkerContainer1
+ //
+ mapSetPlaceMarkerContainer1.BorderColor = Color.LightGray;
+ mapSetPlaceMarkerContainer1.BorderWidth = 1;
+ mapSetPlaceMarkerContainer1.Location = new Point(1, 27);
+ mapSetPlaceMarkerContainer1.Margin = new Padding(4, 4, 4, 4);
+ mapSetPlaceMarkerContainer1.Name = "mapSetPlaceMarkerContainer1";
+ mapSetPlaceMarkerContainer1.ShowBorder = false;
+ mapSetPlaceMarkerContainer1.Size = new Size(492, 621);
+ mapSetPlaceMarkerContainer1.TabIndex = 9;
+ //
+ // layoutControlItem1
+ //
+ layoutControlItem1.Control = mapSetPlaceMarkerContainer1;
+ layoutControlItem1.Location = new Point(0, 0);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlItem1.Size = new Size(492, 621);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
//
// QuickModelingPlaceWizardPage
//
@@ -343,15 +343,15 @@
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
+ ((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlGroup4).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
((ISupportInitialize)layoutControlGroup1).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlGroup3).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
ResumeLayout(false);
}
@@ -359,9 +359,7 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private MapSetSimpleMarkerContainer mapSetSimpleMarkerContainer1;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private TextEdit txtName;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
@@ -380,5 +378,7 @@
private PlaceInfoCtrl placeInfoCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+ private MapSetPlaceMarkerContainer mapSetPlaceMarkerContainer1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
--
Gitblit v1.9.3