From ef6bff7f82b6cb9c37213fc6bc8c48acfb7ab2d6 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 10:19:43 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs | 114 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
index 5ab7756..b5ff08a 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,15 +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.label7 = new System.Windows.Forms.Label();
+ 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();
//
@@ -55,11 +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.label7);
+ 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);
@@ -67,8 +67,8 @@
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, 141);
- this.groupBoxAxisStatus.TabIndex = 4;
+ this.groupBoxAxisStatus.Size = new System.Drawing.Size(580, 148);
+ this.groupBoxAxisStatus.TabIndex = 5;
this.groupBoxAxisStatus.TabStop = false;
this.groupBoxAxisStatus.Text = "杞寸姸鎬�";
//
@@ -83,7 +83,7 @@
//
// ioIndicatorCtrl10
//
- this.ioIndicatorCtrl10.Desc = "鍥為浂鐘舵��";
+ this.ioIndicatorCtrl10.Desc = "杩愬姩鍑洪敊";
this.ioIndicatorCtrl10.IsOn = null;
this.ioIndicatorCtrl10.Location = new System.Drawing.Point(328, 77);
this.ioIndicatorCtrl10.Name = "ioIndicatorCtrl10";
@@ -126,50 +126,42 @@
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(85, 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(85, 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(85, 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;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(7, 214);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(0, 12);
- this.label7.TabIndex = 2;
+ this.textBoxPrfPositon.Location = new System.Drawing.Point(85, 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(23, 116);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(65, 12);
this.label5.TabIndex = 2;
@@ -178,7 +170,7 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(23, 56);
+ this.label4.Location = new System.Drawing.Point(23, 87);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(65, 12);
this.label4.TabIndex = 2;
@@ -187,7 +179,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(23, 86);
+ 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;
@@ -196,19 +188,25 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(23, 25);
+ this.label2.Location = new System.Drawing.Point(23, 26);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 2;
this.label2.Text = "瑙勫垝浣嶇疆锛�";
//
- // CtrlMotionCardRunStatus
+ // timerAxisStatus
+ //
+ this.timerAxisStatus.Enabled = true;
+ this.timerAxisStatus.Interval = 200;
+ this.timerAxisStatus.Tick += new System.EventHandler(this.RefreshStatus);
+ //
+ // CtrlMotionCardAxisStatus
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBoxAxisStatus);
- this.Name = "CtrlMotionCardRunStatus";
- this.Size = new System.Drawing.Size(580, 141);
+ this.Name = "CtrlMotionCardAxisStatus";
+ this.Size = new System.Drawing.Size(580, 148);
this.groupBoxAxisStatus.ResumeLayout(false);
this.groupBoxAxisStatus.PerformLayout();
this.ResumeLayout(false);
@@ -224,14 +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.Label label7;
+ 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