From 8cbf4a6b9f334246d88c8101ae3db9a21f1bab3f Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 28 四月 2021 11:40:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs | 63 ++++++++++---------------------
1 files changed, 21 insertions(+), 42 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
index e35b793..0e89807 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
@@ -38,13 +38,11 @@
this.ioIndicatorCtrl1 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.textBoxCurVel = new System.Windows.Forms.TextBox();
this.textBoxPrfVel = new System.Windows.Forms.TextBox();
- this.textBoxCurPosition = new System.Windows.Forms.TextBox();
this.textBoxPrfPositon = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
- this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timerAxisStatus = new System.Windows.Forms.Timer(this.components);
this.groupBoxAxisStatus.SuspendLayout();
this.SuspendLayout();
//
@@ -58,16 +56,14 @@
this.groupBoxAxisStatus.Controls.Add(this.ioIndicatorCtrl1);
this.groupBoxAxisStatus.Controls.Add(this.textBoxCurVel);
this.groupBoxAxisStatus.Controls.Add(this.textBoxPrfVel);
- this.groupBoxAxisStatus.Controls.Add(this.textBoxCurPosition);
this.groupBoxAxisStatus.Controls.Add(this.textBoxPrfPositon);
this.groupBoxAxisStatus.Controls.Add(this.label5);
this.groupBoxAxisStatus.Controls.Add(this.label4);
- this.groupBoxAxisStatus.Controls.Add(this.label3);
this.groupBoxAxisStatus.Controls.Add(this.label2);
this.groupBoxAxisStatus.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxAxisStatus.Location = new System.Drawing.Point(0, 0);
this.groupBoxAxisStatus.Name = "groupBoxAxisStatus";
- this.groupBoxAxisStatus.Size = new System.Drawing.Size(580, 148);
+ this.groupBoxAxisStatus.Size = new System.Drawing.Size(440, 111);
this.groupBoxAxisStatus.TabIndex = 5;
this.groupBoxAxisStatus.TabStop = false;
this.groupBoxAxisStatus.Text = "杞寸姸鎬�";
@@ -76,7 +72,7 @@
//
this.ioIndicatorCtrl2.Desc = "浼烘湇浣胯兘";
this.ioIndicatorCtrl2.IsOn = null;
- this.ioIndicatorCtrl2.Location = new System.Drawing.Point(479, 17);
+ this.ioIndicatorCtrl2.Location = new System.Drawing.Point(223, 22);
this.ioIndicatorCtrl2.Name = "ioIndicatorCtrl2";
this.ioIndicatorCtrl2.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl2.TabIndex = 4;
@@ -85,7 +81,7 @@
//
this.ioIndicatorCtrl10.Desc = "杩愬姩鍑洪敊";
this.ioIndicatorCtrl10.IsOn = null;
- this.ioIndicatorCtrl10.Location = new System.Drawing.Point(328, 77);
+ this.ioIndicatorCtrl10.Location = new System.Drawing.Point(223, 75);
this.ioIndicatorCtrl10.Name = "ioIndicatorCtrl10";
this.ioIndicatorCtrl10.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl10.TabIndex = 4;
@@ -94,7 +90,7 @@
//
this.ioIndicatorCtrl9.Desc = "杩愬姩鐘舵��";
this.ioIndicatorCtrl9.IsOn = null;
- this.ioIndicatorCtrl9.Location = new System.Drawing.Point(328, 107);
+ this.ioIndicatorCtrl9.Location = new System.Drawing.Point(223, 48);
this.ioIndicatorCtrl9.Name = "ioIndicatorCtrl9";
this.ioIndicatorCtrl9.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl9.TabIndex = 4;
@@ -103,7 +99,7 @@
//
this.ioIndicatorCtrl8.Desc = "璐熼檺浣�";
this.ioIndicatorCtrl8.IsOn = null;
- this.ioIndicatorCtrl8.Location = new System.Drawing.Point(479, 47);
+ this.ioIndicatorCtrl8.Location = new System.Drawing.Point(344, 48);
this.ioIndicatorCtrl8.Name = "ioIndicatorCtrl8";
this.ioIndicatorCtrl8.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl8.TabIndex = 4;
@@ -112,7 +108,7 @@
//
this.ioIndicatorCtrl6.Desc = "姝ｉ檺浣�";
this.ioIndicatorCtrl6.IsOn = null;
- this.ioIndicatorCtrl6.Location = new System.Drawing.Point(328, 47);
+ this.ioIndicatorCtrl6.Location = new System.Drawing.Point(344, 19);
this.ioIndicatorCtrl6.Name = "ioIndicatorCtrl6";
this.ioIndicatorCtrl6.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl6.TabIndex = 4;
@@ -121,14 +117,14 @@
//
this.ioIndicatorCtrl1.Desc = "椹卞姩鎶ヨ";
this.ioIndicatorCtrl1.IsOn = null;
- this.ioIndicatorCtrl1.Location = new System.Drawing.Point(328, 17);
+ this.ioIndicatorCtrl1.Location = new System.Drawing.Point(344, 75);
this.ioIndicatorCtrl1.Name = "ioIndicatorCtrl1";
this.ioIndicatorCtrl1.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl1.TabIndex = 4;
//
// textBoxCurVel
//
- this.textBoxCurVel.Location = new System.Drawing.Point(85, 113);
+ this.textBoxCurVel.Location = new System.Drawing.Point(76, 79);
this.textBoxCurVel.Name = "textBoxCurVel";
this.textBoxCurVel.ReadOnly = true;
this.textBoxCurVel.Size = new System.Drawing.Size(116, 21);
@@ -136,23 +132,15 @@
//
// textBoxPrfVel
//
- this.textBoxPrfVel.Location = new System.Drawing.Point(85, 84);
+ this.textBoxPrfVel.Location = new System.Drawing.Point(76, 50);
this.textBoxPrfVel.Name = "textBoxPrfVel";
this.textBoxPrfVel.ReadOnly = true;
this.textBoxPrfVel.Size = new System.Drawing.Size(116, 21);
this.textBoxPrfVel.TabIndex = 3;
//
- // textBoxCurPosition
- //
- this.textBoxCurPosition.Location = new System.Drawing.Point(85, 55);
- this.textBoxCurPosition.Name = "textBoxCurPosition";
- this.textBoxCurPosition.ReadOnly = true;
- this.textBoxCurPosition.Size = new System.Drawing.Size(116, 21);
- this.textBoxCurPosition.TabIndex = 3;
- //
// textBoxPrfPositon
//
- this.textBoxPrfPositon.Location = new System.Drawing.Point(85, 23);
+ this.textBoxPrfPositon.Location = new System.Drawing.Point(76, 22);
this.textBoxPrfPositon.Name = "textBoxPrfPositon";
this.textBoxPrfPositon.ReadOnly = true;
this.textBoxPrfPositon.Size = new System.Drawing.Size(116, 21);
@@ -161,7 +149,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(23, 116);
+ this.label5.Location = new System.Drawing.Point(14, 82);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(65, 12);
this.label5.TabIndex = 2;
@@ -170,33 +158,26 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(23, 87);
+ this.label4.Location = new System.Drawing.Point(14, 53);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(65, 12);
this.label4.TabIndex = 2;
this.label4.Text = "瑙勫垝閫熷害锛�";
//
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(23, 58);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(65, 12);
- this.label3.TabIndex = 2;
- this.label3.Text = "瀹為檯浣嶇疆锛�";
- //
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(23, 26);
+ this.label2.Location = new System.Drawing.Point(14, 25);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 2;
- this.label2.Text = "瑙勫垝浣嶇疆锛�";
+ this.label2.Text = "鐩爣浣嶇疆锛�";
//
- // timer1
+ // timerAxisStatus
//
- this.timer1.Tick += new System.EventHandler(this.RefreshStatus);
+ this.timerAxisStatus.Enabled = true;
+ this.timerAxisStatus.Interval = 200;
+ this.timerAxisStatus.Tick += new System.EventHandler(this.RefreshStatus);
//
// CtrlMotionCardAxisStatus
//
@@ -204,7 +185,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBoxAxisStatus);
this.Name = "CtrlMotionCardAxisStatus";
- this.Size = new System.Drawing.Size(580, 148);
+ this.Size = new System.Drawing.Size(440, 111);
this.groupBoxAxisStatus.ResumeLayout(false);
this.groupBoxAxisStatus.PerformLayout();
this.ResumeLayout(false);
@@ -222,12 +203,10 @@
private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl1;
private System.Windows.Forms.TextBox textBoxCurVel;
private System.Windows.Forms.TextBox textBoxPrfVel;
- private System.Windows.Forms.TextBox textBoxCurPosition;
private System.Windows.Forms.TextBox textBoxPrfPositon;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Timer timerAxisStatus;
}
}
--
Gitblit v1.8.0