From 8dd7b24e5649edf6f73e1146c4db576f7eb3dcdb Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 14:16:54 +0800
Subject: [PATCH] 7.11

---
 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs |  109 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
index 40faa13..842650f 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Bro.UI.Device.Winform.MotionCard
+锘縩amespace Bro.UI.Device.Winform
 {
     partial class CtrlMotionCardAxisStatus
     {
@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.groupBoxAxisStatus = new System.Windows.Forms.GroupBox();
             this.ioIndicatorCtrl2 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
             this.ioIndicatorCtrl10 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
@@ -35,14 +36,15 @@
             this.ioIndicatorCtrl8 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
             this.ioIndicatorCtrl6 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
             this.ioIndicatorCtrl1 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.textBox2 = new System.Windows.Forms.TextBox();
-            this.textBox1 = new System.Windows.Forms.TextBox();
+            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.timerAxisStatus = new System.Windows.Forms.Timer(this.components);
             this.groupBoxAxisStatus.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -54,10 +56,10 @@
             this.groupBoxAxisStatus.Controls.Add(this.ioIndicatorCtrl8);
             this.groupBoxAxisStatus.Controls.Add(this.ioIndicatorCtrl6);
             this.groupBoxAxisStatus.Controls.Add(this.ioIndicatorCtrl1);
-            this.groupBoxAxisStatus.Controls.Add(this.textBox4);
-            this.groupBoxAxisStatus.Controls.Add(this.textBox3);
-            this.groupBoxAxisStatus.Controls.Add(this.textBox2);
-            this.groupBoxAxisStatus.Controls.Add(this.textBox1);
+            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);
@@ -65,7 +67,7 @@
             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, 148);
             this.groupBoxAxisStatus.TabIndex = 5;
             this.groupBoxAxisStatus.TabStop = false;
             this.groupBoxAxisStatus.Text = "杞寸姸鎬�";
@@ -74,16 +76,16 @@
             // 
             this.ioIndicatorCtrl2.Desc = "浼烘湇浣胯兘";
             this.ioIndicatorCtrl2.IsOn = null;
-            this.ioIndicatorCtrl2.Location = new System.Drawing.Point(479, 17);
+            this.ioIndicatorCtrl2.Location = new System.Drawing.Point(344, 22);
             this.ioIndicatorCtrl2.Name = "ioIndicatorCtrl2";
             this.ioIndicatorCtrl2.Size = new System.Drawing.Size(90, 24);
             this.ioIndicatorCtrl2.TabIndex = 4;
             // 
             // ioIndicatorCtrl10
             // 
-            this.ioIndicatorCtrl10.Desc = "鍥為浂鐘舵��";
+            this.ioIndicatorCtrl10.Desc = "杩愬姩鍑洪敊";
             this.ioIndicatorCtrl10.IsOn = null;
-            this.ioIndicatorCtrl10.Location = new System.Drawing.Point(328, 77);
+            this.ioIndicatorCtrl10.Location = new System.Drawing.Point(223, 82);
             this.ioIndicatorCtrl10.Name = "ioIndicatorCtrl10";
             this.ioIndicatorCtrl10.Size = new System.Drawing.Size(90, 24);
             this.ioIndicatorCtrl10.TabIndex = 4;
@@ -92,7 +94,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, 112);
             this.ioIndicatorCtrl9.Name = "ioIndicatorCtrl9";
             this.ioIndicatorCtrl9.Size = new System.Drawing.Size(90, 24);
             this.ioIndicatorCtrl9.TabIndex = 4;
@@ -101,7 +103,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, 52);
             this.ioIndicatorCtrl8.Name = "ioIndicatorCtrl8";
             this.ioIndicatorCtrl8.Size = new System.Drawing.Size(90, 24);
             this.ioIndicatorCtrl8.TabIndex = 4;
@@ -110,7 +112,7 @@
             // 
             this.ioIndicatorCtrl6.Desc = "姝i檺浣�";
             this.ioIndicatorCtrl6.IsOn = null;
-            this.ioIndicatorCtrl6.Location = new System.Drawing.Point(328, 47);
+            this.ioIndicatorCtrl6.Location = new System.Drawing.Point(223, 52);
             this.ioIndicatorCtrl6.Name = "ioIndicatorCtrl6";
             this.ioIndicatorCtrl6.Size = new System.Drawing.Size(90, 24);
             this.ioIndicatorCtrl6.TabIndex = 4;
@@ -119,47 +121,47 @@
             // 
             this.ioIndicatorCtrl1.Desc = "椹卞姩鎶ヨ";
             this.ioIndicatorCtrl1.IsOn = null;
-            this.ioIndicatorCtrl1.Location = new System.Drawing.Point(328, 17);
+            this.ioIndicatorCtrl1.Location = new System.Drawing.Point(223, 22);
             this.ioIndicatorCtrl1.Name = "ioIndicatorCtrl1";
             this.ioIndicatorCtrl1.Size = new System.Drawing.Size(90, 24);
             this.ioIndicatorCtrl1.TabIndex = 4;
             // 
-            // textBox4
+            // textBoxCurVel
             // 
-            this.textBox4.Location = new System.Drawing.Point(85, 114);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.ReadOnly = true;
-            this.textBox4.Size = new System.Drawing.Size(116, 21);
-            this.textBox4.TabIndex = 3;
+            this.textBoxCurVel.Location = new System.Drawing.Point(76, 113);
+            this.textBoxCurVel.Name = "textBoxCurVel";
+            this.textBoxCurVel.ReadOnly = true;
+            this.textBoxCurVel.Size = new System.Drawing.Size(116, 21);
+            this.textBoxCurVel.TabIndex = 3;
             // 
-            // textBox3
+            // textBoxPrfVel
             // 
-            this.textBox3.Location = new System.Drawing.Point(85, 53);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.ReadOnly = true;
-            this.textBox3.Size = new System.Drawing.Size(116, 21);
-            this.textBox3.TabIndex = 3;
+            this.textBoxPrfVel.Location = new System.Drawing.Point(76, 84);
+            this.textBoxPrfVel.Name = "textBoxPrfVel";
+            this.textBoxPrfVel.ReadOnly = true;
+            this.textBoxPrfVel.Size = new System.Drawing.Size(116, 21);
+            this.textBoxPrfVel.TabIndex = 3;
             // 
-            // textBox2
+            // textBoxCurPosition
             // 
-            this.textBox2.Location = new System.Drawing.Point(85, 83);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.ReadOnly = true;
-            this.textBox2.Size = new System.Drawing.Size(116, 21);
-            this.textBox2.TabIndex = 3;
+            this.textBoxCurPosition.Location = new System.Drawing.Point(76, 55);
+            this.textBoxCurPosition.Name = "textBoxCurPosition";
+            this.textBoxCurPosition.ReadOnly = true;
+            this.textBoxCurPosition.Size = new System.Drawing.Size(116, 21);
+            this.textBoxCurPosition.TabIndex = 3;
             // 
-            // textBox1
+            // textBoxPrfPositon
             // 
-            this.textBox1.Location = new System.Drawing.Point(85, 22);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.ReadOnly = true;
-            this.textBox1.Size = new System.Drawing.Size(116, 21);
-            this.textBox1.TabIndex = 3;
+            this.textBoxPrfPositon.Location = new System.Drawing.Point(76, 23);
+            this.textBoxPrfPositon.Name = "textBoxPrfPositon";
+            this.textBoxPrfPositon.ReadOnly = true;
+            this.textBoxPrfPositon.Size = new System.Drawing.Size(116, 21);
+            this.textBoxPrfPositon.TabIndex = 3;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(23, 117);
+            this.label5.Location = new System.Drawing.Point(14, 116);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(65, 12);
             this.label5.TabIndex = 2;
@@ -168,7 +170,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(23, 56);
+            this.label4.Location = new System.Drawing.Point(14, 87);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(65, 12);
             this.label4.TabIndex = 2;
@@ -177,7 +179,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(23, 86);
+            this.label3.Location = new System.Drawing.Point(14, 58);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(65, 12);
             this.label3.TabIndex = 2;
@@ -186,11 +188,17 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(23, 25);
+            this.label2.Location = new System.Drawing.Point(14, 26);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(65, 12);
             this.label2.TabIndex = 2;
             this.label2.Text = "瑙勫垝浣嶇疆锛�";
+            // 
+            // timerAxisStatus
+            // 
+            this.timerAxisStatus.Enabled = true;
+            this.timerAxisStatus.Interval = 200;
+            this.timerAxisStatus.Tick += new System.EventHandler(this.RefreshStatus);
             // 
             // CtrlMotionCardAxisStatus
             // 
@@ -198,7 +206,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, 148);
             this.groupBoxAxisStatus.ResumeLayout(false);
             this.groupBoxAxisStatus.PerformLayout();
             this.ResumeLayout(false);
@@ -214,13 +222,14 @@
         private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl8;
         private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl6;
         private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl1;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.TextBox textBox1;
+        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 timerAxisStatus;
     }
 }

--
Gitblit v1.8.0