From 81480d62561dcb75a1fc968814ace1368fe5181b Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 16 七月 2020 11:57:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs | 92 +++++++++++++++++++++-------------------------
1 files changed, 42 insertions(+), 50 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
index 69bd90d..2317ed1 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
@@ -29,7 +29,6 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBoxIOOut = new System.Windows.Forms.GroupBox();
this.ioOut3 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.ioOut2 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
@@ -65,25 +64,11 @@
this.ioIn4 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.ioIn0 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.timerIOStatus = new System.Windows.Forms.Timer(this.components);
- this.tableLayoutPanel1.SuspendLayout();
+ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.groupBoxIOOut.SuspendLayout();
this.groupBoxIOIn.SuspendLayout();
+ this.flowLayoutPanel1.SuspendLayout();
this.SuspendLayout();
- //
- // tableLayoutPanel1
- //
- this.tableLayoutPanel1.ColumnCount = 1;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.Controls.Add(this.groupBoxIOOut, 0, 1);
- this.tableLayoutPanel1.Controls.Add(this.groupBoxIOIn, 0, 0);
- this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
- this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 2;
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(580, 288);
- this.tableLayoutPanel1.TabIndex = 0;
//
// groupBoxIOOut
//
@@ -103,10 +88,9 @@
this.groupBoxIOOut.Controls.Add(this.ioOut5);
this.groupBoxIOOut.Controls.Add(this.ioOut4);
this.groupBoxIOOut.Controls.Add(this.ioOut0);
- this.groupBoxIOOut.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxIOOut.Location = new System.Drawing.Point(3, 147);
this.groupBoxIOOut.Name = "groupBoxIOOut";
- this.groupBoxIOOut.Size = new System.Drawing.Size(574, 138);
+ this.groupBoxIOOut.Size = new System.Drawing.Size(434, 138);
this.groupBoxIOOut.TabIndex = 8;
this.groupBoxIOOut.TabStop = false;
this.groupBoxIOOut.Text = "鏁板瓧閲忚緭鍑�";
@@ -115,7 +99,7 @@
//
this.ioOut3.Desc = "OUT 3";
this.ioOut3.IsOn = null;
- this.ioOut3.Location = new System.Drawing.Point(477, 18);
+ this.ioOut3.Location = new System.Drawing.Point(335, 18);
this.ioOut3.Name = "ioOut3";
this.ioOut3.Size = new System.Drawing.Size(90, 24);
this.ioOut3.TabIndex = 4;
@@ -124,7 +108,7 @@
//
this.ioOut2.Desc = "OUT 2";
this.ioOut2.IsOn = null;
- this.ioOut2.Location = new System.Drawing.Point(306, 18);
+ this.ioOut2.Location = new System.Drawing.Point(209, 18);
this.ioOut2.Name = "ioOut2";
this.ioOut2.Size = new System.Drawing.Size(90, 24);
this.ioOut2.TabIndex = 4;
@@ -133,7 +117,7 @@
//
this.ioOut1.Desc = "OUT 1";
this.ioOut1.IsOn = null;
- this.ioOut1.Location = new System.Drawing.Point(145, 18);
+ this.ioOut1.Location = new System.Drawing.Point(102, 18);
this.ioOut1.Name = "ioOut1";
this.ioOut1.Size = new System.Drawing.Size(90, 24);
this.ioOut1.TabIndex = 4;
@@ -142,7 +126,7 @@
//
this.ioOut15.Desc = "OUT 15";
this.ioOut15.IsOn = null;
- this.ioOut15.Location = new System.Drawing.Point(477, 107);
+ this.ioOut15.Location = new System.Drawing.Point(335, 107);
this.ioOut15.Name = "ioOut15";
this.ioOut15.Size = new System.Drawing.Size(90, 24);
this.ioOut15.TabIndex = 4;
@@ -151,7 +135,7 @@
//
this.ioOut14.Desc = "OUT 14";
this.ioOut14.IsOn = null;
- this.ioOut14.Location = new System.Drawing.Point(306, 107);
+ this.ioOut14.Location = new System.Drawing.Point(209, 107);
this.ioOut14.Name = "ioOut14";
this.ioOut14.Size = new System.Drawing.Size(90, 24);
this.ioOut14.TabIndex = 4;
@@ -160,7 +144,7 @@
//
this.ioOut13.Desc = "OUT 13";
this.ioOut13.IsOn = null;
- this.ioOut13.Location = new System.Drawing.Point(145, 107);
+ this.ioOut13.Location = new System.Drawing.Point(102, 107);
this.ioOut13.Name = "ioOut13";
this.ioOut13.Size = new System.Drawing.Size(90, 24);
this.ioOut13.TabIndex = 4;
@@ -187,7 +171,7 @@
//
this.ioOut7.Desc = "OUT 7";
this.ioOut7.IsOn = null;
- this.ioOut7.Location = new System.Drawing.Point(477, 48);
+ this.ioOut7.Location = new System.Drawing.Point(335, 48);
this.ioOut7.Name = "ioOut7";
this.ioOut7.Size = new System.Drawing.Size(90, 24);
this.ioOut7.TabIndex = 4;
@@ -196,7 +180,7 @@
//
this.ioOut6.Desc = "OUT 6";
this.ioOut6.IsOn = null;
- this.ioOut6.Location = new System.Drawing.Point(306, 48);
+ this.ioOut6.Location = new System.Drawing.Point(209, 48);
this.ioOut6.Name = "ioOut6";
this.ioOut6.Size = new System.Drawing.Size(90, 24);
this.ioOut6.TabIndex = 4;
@@ -205,7 +189,7 @@
//
this.ioOut11.Desc = "OUT 11";
this.ioOut11.IsOn = null;
- this.ioOut11.Location = new System.Drawing.Point(477, 77);
+ this.ioOut11.Location = new System.Drawing.Point(335, 77);
this.ioOut11.Name = "ioOut11";
this.ioOut11.Size = new System.Drawing.Size(90, 24);
this.ioOut11.TabIndex = 4;
@@ -214,7 +198,7 @@
//
this.ioOut10.Desc = "OUT 10";
this.ioOut10.IsOn = null;
- this.ioOut10.Location = new System.Drawing.Point(306, 77);
+ this.ioOut10.Location = new System.Drawing.Point(209, 77);
this.ioOut10.Name = "ioOut10";
this.ioOut10.Size = new System.Drawing.Size(90, 24);
this.ioOut10.TabIndex = 4;
@@ -223,7 +207,7 @@
//
this.ioOut9.Desc = "OUT 9";
this.ioOut9.IsOn = null;
- this.ioOut9.Location = new System.Drawing.Point(145, 77);
+ this.ioOut9.Location = new System.Drawing.Point(102, 77);
this.ioOut9.Name = "ioOut9";
this.ioOut9.Size = new System.Drawing.Size(90, 24);
this.ioOut9.TabIndex = 4;
@@ -232,7 +216,7 @@
//
this.ioOut5.Desc = "OUT 5";
this.ioOut5.IsOn = null;
- this.ioOut5.Location = new System.Drawing.Point(145, 48);
+ this.ioOut5.Location = new System.Drawing.Point(102, 48);
this.ioOut5.Name = "ioOut5";
this.ioOut5.Size = new System.Drawing.Size(90, 24);
this.ioOut5.TabIndex = 4;
@@ -273,10 +257,9 @@
this.groupBoxIOIn.Controls.Add(this.ioIn5);
this.groupBoxIOIn.Controls.Add(this.ioIn4);
this.groupBoxIOIn.Controls.Add(this.ioIn0);
- this.groupBoxIOIn.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxIOIn.Location = new System.Drawing.Point(3, 3);
this.groupBoxIOIn.Name = "groupBoxIOIn";
- this.groupBoxIOIn.Size = new System.Drawing.Size(574, 138);
+ this.groupBoxIOIn.Size = new System.Drawing.Size(434, 138);
this.groupBoxIOIn.TabIndex = 7;
this.groupBoxIOIn.TabStop = false;
this.groupBoxIOIn.Text = "鏁板瓧閲忚緭鍏�";
@@ -285,7 +268,7 @@
//
this.ioIn3.Desc = "IN 3";
this.ioIn3.IsOn = null;
- this.ioIn3.Location = new System.Drawing.Point(477, 18);
+ this.ioIn3.Location = new System.Drawing.Point(335, 18);
this.ioIn3.Name = "ioIn3";
this.ioIn3.Size = new System.Drawing.Size(90, 24);
this.ioIn3.TabIndex = 4;
@@ -294,7 +277,7 @@
//
this.ioIn2.Desc = "IN 2";
this.ioIn2.IsOn = null;
- this.ioIn2.Location = new System.Drawing.Point(306, 18);
+ this.ioIn2.Location = new System.Drawing.Point(209, 18);
this.ioIn2.Name = "ioIn2";
this.ioIn2.Size = new System.Drawing.Size(90, 24);
this.ioIn2.TabIndex = 4;
@@ -303,7 +286,7 @@
//
this.ioIn1.Desc = "IN 1";
this.ioIn1.IsOn = null;
- this.ioIn1.Location = new System.Drawing.Point(145, 18);
+ this.ioIn1.Location = new System.Drawing.Point(102, 18);
this.ioIn1.Name = "ioIn1";
this.ioIn1.Size = new System.Drawing.Size(90, 24);
this.ioIn1.TabIndex = 4;
@@ -312,7 +295,7 @@
//
this.ioIn15.Desc = "IN 15";
this.ioIn15.IsOn = null;
- this.ioIn15.Location = new System.Drawing.Point(477, 107);
+ this.ioIn15.Location = new System.Drawing.Point(335, 107);
this.ioIn15.Name = "ioIn15";
this.ioIn15.Size = new System.Drawing.Size(90, 24);
this.ioIn15.TabIndex = 4;
@@ -321,7 +304,7 @@
//
this.ioIn14.Desc = "IN 14";
this.ioIn14.IsOn = null;
- this.ioIn14.Location = new System.Drawing.Point(306, 107);
+ this.ioIn14.Location = new System.Drawing.Point(209, 107);
this.ioIn14.Name = "ioIn14";
this.ioIn14.Size = new System.Drawing.Size(90, 24);
this.ioIn14.TabIndex = 4;
@@ -330,7 +313,7 @@
//
this.ioIn13.Desc = "IN 13";
this.ioIn13.IsOn = null;
- this.ioIn13.Location = new System.Drawing.Point(145, 107);
+ this.ioIn13.Location = new System.Drawing.Point(102, 107);
this.ioIn13.Name = "ioIn13";
this.ioIn13.Size = new System.Drawing.Size(90, 24);
this.ioIn13.TabIndex = 4;
@@ -357,7 +340,7 @@
//
this.ioIn7.Desc = "IN 7";
this.ioIn7.IsOn = null;
- this.ioIn7.Location = new System.Drawing.Point(477, 48);
+ this.ioIn7.Location = new System.Drawing.Point(335, 48);
this.ioIn7.Name = "ioIn7";
this.ioIn7.Size = new System.Drawing.Size(90, 24);
this.ioIn7.TabIndex = 4;
@@ -366,7 +349,7 @@
//
this.ioIn6.Desc = "IN 6";
this.ioIn6.IsOn = null;
- this.ioIn6.Location = new System.Drawing.Point(306, 48);
+ this.ioIn6.Location = new System.Drawing.Point(209, 48);
this.ioIn6.Name = "ioIn6";
this.ioIn6.Size = new System.Drawing.Size(90, 24);
this.ioIn6.TabIndex = 4;
@@ -375,7 +358,7 @@
//
this.ioIn11.Desc = "IN 11";
this.ioIn11.IsOn = null;
- this.ioIn11.Location = new System.Drawing.Point(477, 77);
+ this.ioIn11.Location = new System.Drawing.Point(335, 77);
this.ioIn11.Name = "ioIn11";
this.ioIn11.Size = new System.Drawing.Size(90, 24);
this.ioIn11.TabIndex = 4;
@@ -384,7 +367,7 @@
//
this.ioIn10.Desc = "IN 10";
this.ioIn10.IsOn = null;
- this.ioIn10.Location = new System.Drawing.Point(306, 77);
+ this.ioIn10.Location = new System.Drawing.Point(209, 77);
this.ioIn10.Name = "ioIn10";
this.ioIn10.Size = new System.Drawing.Size(90, 24);
this.ioIn10.TabIndex = 4;
@@ -393,7 +376,7 @@
//
this.ioIn9.Desc = "IN 9";
this.ioIn9.IsOn = null;
- this.ioIn9.Location = new System.Drawing.Point(145, 77);
+ this.ioIn9.Location = new System.Drawing.Point(102, 77);
this.ioIn9.Name = "ioIn9";
this.ioIn9.Size = new System.Drawing.Size(90, 24);
this.ioIn9.TabIndex = 4;
@@ -402,7 +385,7 @@
//
this.ioIn5.Desc = "IN 5";
this.ioIn5.IsOn = null;
- this.ioIn5.Location = new System.Drawing.Point(145, 48);
+ this.ioIn5.Location = new System.Drawing.Point(102, 48);
this.ioIn5.Name = "ioIn5";
this.ioIn5.Size = new System.Drawing.Size(90, 24);
this.ioIn5.TabIndex = 4;
@@ -431,23 +414,31 @@
this.timerIOStatus.Interval = 200;
this.timerIOStatus.Tick += new System.EventHandler(this.RefreshIOStatus);
//
+ // flowLayoutPanel1
+ //
+ this.flowLayoutPanel1.Controls.Add(this.groupBoxIOIn);
+ this.flowLayoutPanel1.Controls.Add(this.groupBoxIOOut);
+ this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+ this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(440, 288);
+ this.flowLayoutPanel1.TabIndex = 1;
+ //
// CtrlMotionCardIOStatus
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.tableLayoutPanel1);
+ this.Controls.Add(this.flowLayoutPanel1);
this.Name = "CtrlMotionCardIOStatus";
- this.Size = new System.Drawing.Size(580, 288);
- this.tableLayoutPanel1.ResumeLayout(false);
+ this.Size = new System.Drawing.Size(440, 288);
this.groupBoxIOOut.ResumeLayout(false);
this.groupBoxIOIn.ResumeLayout(false);
+ this.flowLayoutPanel1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
-
- private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.GroupBox groupBoxIOIn;
private Model.Winform.IOIndicatorCtrl ioIn3;
private Model.Winform.IOIndicatorCtrl ioIn2;
@@ -483,5 +474,6 @@
private Model.Winform.IOIndicatorCtrl ioOut4;
private Model.Winform.IOIndicatorCtrl ioOut0;
private System.Windows.Forms.Timer timerIOStatus;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
}
}
--
Gitblit v1.8.0