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/CtrlMotionCardAxisOperation.Designer.cs | 213 ++++++++++++++++++++++++++++-------------------------
1 files changed, 113 insertions(+), 100 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
index aa563fb..0e3e8f1 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
@@ -31,24 +31,24 @@
this.groupBoxAxisOperration = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel2 = new System.Windows.Forms.Panel();
- this.button3 = new System.Windows.Forms.Button();
- this.button2 = new System.Windows.Forms.Button();
+ this.buttonStop = new System.Windows.Forms.Button();
+ this.buttonStart = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
- this.textBox5 = new System.Windows.Forms.TextBox();
- this.textBox4 = new System.Windows.Forms.TextBox();
- this.textBox7 = new System.Windows.Forms.TextBox();
- this.textBox6 = new System.Windows.Forms.TextBox();
+ this.textBoxP2PVel = new System.Windows.Forms.TextBox();
+ this.textBoxP2PPrfPosition = new System.Windows.Forms.TextBox();
+ this.textBoxP2PDec = new System.Windows.Forms.TextBox();
+ this.textBoxP2PAcc = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
- this.button1 = new System.Windows.Forms.Button();
- this.textBox3 = new System.Windows.Forms.TextBox();
- this.buttonClearStatus = new System.Windows.Forms.Button();
- this.textBox2 = new System.Windows.Forms.TextBox();
+ this.buttonNegative = new System.Windows.Forms.Button();
+ this.textBoxJogDec = new System.Windows.Forms.TextBox();
+ this.buttonPositive = new System.Windows.Forms.Button();
+ this.textBoxJogAcc = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
- this.textBox1 = new System.Windows.Forms.TextBox();
+ this.textBoxJogVel = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
@@ -88,13 +88,13 @@
//
// panel2
//
- this.panel2.Controls.Add(this.button3);
- this.panel2.Controls.Add(this.button2);
+ this.panel2.Controls.Add(this.buttonStop);
+ this.panel2.Controls.Add(this.buttonStart);
this.panel2.Controls.Add(this.label1);
- this.panel2.Controls.Add(this.textBox5);
- this.panel2.Controls.Add(this.textBox4);
- this.panel2.Controls.Add(this.textBox7);
- this.panel2.Controls.Add(this.textBox6);
+ this.panel2.Controls.Add(this.textBoxP2PVel);
+ this.panel2.Controls.Add(this.textBoxP2PPrfPosition);
+ this.panel2.Controls.Add(this.textBoxP2PDec);
+ this.panel2.Controls.Add(this.textBoxP2PAcc);
this.panel2.Controls.Add(this.label7);
this.panel2.Controls.Add(this.label6);
this.panel2.Controls.Add(this.label9);
@@ -105,23 +105,25 @@
this.panel2.Size = new System.Drawing.Size(535, 58);
this.panel2.TabIndex = 3;
//
- // button3
+ // buttonStop
//
- this.button3.Location = new System.Drawing.Point(462, 31);
- this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(70, 25);
- this.button3.TabIndex = 6;
- this.button3.Text = "鍋滄";
- this.button3.UseVisualStyleBackColor = true;
+ this.buttonStop.Location = new System.Drawing.Point(462, 31);
+ this.buttonStop.Name = "buttonStop";
+ this.buttonStop.Size = new System.Drawing.Size(70, 25);
+ this.buttonStop.TabIndex = 6;
+ this.buttonStop.Text = "鍋滄";
+ this.buttonStop.UseVisualStyleBackColor = true;
+ this.buttonStop.Click += new System.EventHandler(this.buttonStop_Click);
//
- // button2
+ // buttonStart
//
- this.button2.Location = new System.Drawing.Point(462, 3);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(70, 25);
- this.button2.TabIndex = 6;
- this.button2.Text = "寮�濮�";
- this.button2.UseVisualStyleBackColor = true;
+ this.buttonStart.Location = new System.Drawing.Point(462, 3);
+ this.buttonStart.Name = "buttonStart";
+ this.buttonStart.Size = new System.Drawing.Size(70, 25);
+ this.buttonStart.TabIndex = 6;
+ this.buttonStart.Text = "寮�濮�";
+ this.buttonStart.UseVisualStyleBackColor = true;
+ this.buttonStart.Click += new System.EventHandler(this.buttonStart_Click);
//
// label1
//
@@ -136,38 +138,42 @@
this.label1.Text = "P2P妯″紡";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // textBox5
+ // textBoxP2PVel
//
- this.textBox5.Location = new System.Drawing.Point(154, 34);
- this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(116, 21);
- this.textBox5.TabIndex = 5;
+ this.textBoxP2PVel.Location = new System.Drawing.Point(340, 7);
+ this.textBoxP2PVel.Name = "textBoxP2PVel";
+ this.textBoxP2PVel.Size = new System.Drawing.Size(116, 21);
+ this.textBoxP2PVel.TabIndex = 5;
+ this.textBoxP2PVel.Text = "50";
//
- // textBox4
+ // textBoxP2PPrfPosition
//
- this.textBox4.Location = new System.Drawing.Point(154, 4);
- this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(116, 21);
- this.textBox4.TabIndex = 5;
+ this.textBoxP2PPrfPosition.Location = new System.Drawing.Point(154, 4);
+ this.textBoxP2PPrfPosition.Name = "textBoxP2PPrfPosition";
+ this.textBoxP2PPrfPosition.Size = new System.Drawing.Size(116, 21);
+ this.textBoxP2PPrfPosition.TabIndex = 5;
+ this.textBoxP2PPrfPosition.Text = "20000";
//
- // textBox7
+ // textBoxP2PDec
//
- this.textBox7.Location = new System.Drawing.Point(340, 34);
- this.textBox7.Name = "textBox7";
- this.textBox7.Size = new System.Drawing.Size(116, 21);
- this.textBox7.TabIndex = 5;
+ this.textBoxP2PDec.Location = new System.Drawing.Point(340, 34);
+ this.textBoxP2PDec.Name = "textBoxP2PDec";
+ this.textBoxP2PDec.Size = new System.Drawing.Size(116, 21);
+ this.textBoxP2PDec.TabIndex = 5;
+ this.textBoxP2PDec.Text = "0.5";
//
- // textBox6
+ // textBoxP2PAcc
//
- this.textBox6.Location = new System.Drawing.Point(340, 4);
- this.textBox6.Name = "textBox6";
- this.textBox6.Size = new System.Drawing.Size(116, 21);
- this.textBox6.TabIndex = 5;
+ this.textBoxP2PAcc.Location = new System.Drawing.Point(154, 35);
+ this.textBoxP2PAcc.Name = "textBoxP2PAcc";
+ this.textBoxP2PAcc.Size = new System.Drawing.Size(116, 21);
+ this.textBoxP2PAcc.TabIndex = 5;
+ this.textBoxP2PAcc.Text = "0.5";
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(92, 37);
+ this.label7.Location = new System.Drawing.Point(278, 10);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(41, 12);
this.label7.TabIndex = 4;
@@ -180,7 +186,7 @@
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(65, 12);
this.label6.TabIndex = 4;
- this.label6.Text = "瑙勫垝浣嶇疆锛�";
+ this.label6.Text = "鐩爣浣嶇疆锛�";
//
// label9
//
@@ -194,7 +200,7 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(278, 7);
+ this.label8.Location = new System.Drawing.Point(92, 38);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(53, 12);
this.label8.TabIndex = 4;
@@ -202,12 +208,12 @@
//
// panel1
//
- this.panel1.Controls.Add(this.button1);
- this.panel1.Controls.Add(this.textBox3);
- this.panel1.Controls.Add(this.buttonClearStatus);
- this.panel1.Controls.Add(this.textBox2);
+ this.panel1.Controls.Add(this.buttonNegative);
+ this.panel1.Controls.Add(this.textBoxJogDec);
+ this.panel1.Controls.Add(this.buttonPositive);
+ this.panel1.Controls.Add(this.textBoxJogAcc);
this.panel1.Controls.Add(this.label5);
- this.panel1.Controls.Add(this.textBox1);
+ this.panel1.Controls.Add(this.textBoxJogVel);
this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.label2);
@@ -217,53 +223,60 @@
this.panel1.Size = new System.Drawing.Size(535, 58);
this.panel1.TabIndex = 2;
//
- // button1
+ // buttonNegative
//
- this.button1.Location = new System.Drawing.Point(462, 33);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(70, 25);
- this.button1.TabIndex = 6;
- this.button1.Text = "璐熷悜";
- this.button1.UseVisualStyleBackColor = true;
+ this.buttonNegative.Location = new System.Drawing.Point(462, 33);
+ this.buttonNegative.Name = "buttonNegative";
+ this.buttonNegative.Size = new System.Drawing.Size(70, 25);
+ this.buttonNegative.TabIndex = 6;
+ this.buttonNegative.Text = "璐熷悜";
+ this.buttonNegative.UseVisualStyleBackColor = true;
+ this.buttonNegative.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonNegative_MouseDown);
+ this.buttonNegative.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttonNegative_MouseUp);
//
- // textBox3
+ // textBoxJogDec
//
- this.textBox3.Location = new System.Drawing.Point(340, 4);
- this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(116, 21);
- this.textBox3.TabIndex = 5;
+ this.textBoxJogDec.Location = new System.Drawing.Point(340, 34);
+ this.textBoxJogDec.Name = "textBoxJogDec";
+ this.textBoxJogDec.Size = new System.Drawing.Size(116, 21);
+ this.textBoxJogDec.TabIndex = 5;
+ this.textBoxJogDec.Text = "0.1";
//
- // buttonClearStatus
+ // buttonPositive
//
- this.buttonClearStatus.Location = new System.Drawing.Point(462, 3);
- this.buttonClearStatus.Name = "buttonClearStatus";
- this.buttonClearStatus.Size = new System.Drawing.Size(70, 25);
- this.buttonClearStatus.TabIndex = 6;
- this.buttonClearStatus.Text = "姝ｅ悜";
- this.buttonClearStatus.UseVisualStyleBackColor = true;
+ this.buttonPositive.Location = new System.Drawing.Point(462, 3);
+ this.buttonPositive.Name = "buttonPositive";
+ this.buttonPositive.Size = new System.Drawing.Size(70, 25);
+ this.buttonPositive.TabIndex = 6;
+ this.buttonPositive.Text = "姝ｅ悜";
+ this.buttonPositive.UseVisualStyleBackColor = true;
+ this.buttonPositive.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonPositive_MouseDown);
+ this.buttonPositive.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttonPositive_MouseUp);
//
- // textBox2
+ // textBoxJogAcc
//
- this.textBox2.Location = new System.Drawing.Point(154, 35);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(116, 21);
- this.textBox2.TabIndex = 5;
+ this.textBoxJogAcc.Location = new System.Drawing.Point(154, 35);
+ this.textBoxJogAcc.Name = "textBoxJogAcc";
+ this.textBoxJogAcc.Size = new System.Drawing.Size(116, 21);
+ this.textBoxJogAcc.TabIndex = 5;
+ this.textBoxJogAcc.Text = "0.1";
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(278, 7);
+ this.label5.Location = new System.Drawing.Point(278, 37);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(53, 12);
this.label5.TabIndex = 4;
this.label5.Text = "鍑忛�熷害锛�";
//
- // textBox1
+ // textBoxJogVel
//
- this.textBox1.Location = new System.Drawing.Point(154, 4);
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(116, 21);
- this.textBox1.TabIndex = 5;
+ this.textBoxJogVel.Location = new System.Drawing.Point(154, 4);
+ this.textBoxJogVel.Name = "textBoxJogVel";
+ this.textBoxJogVel.Size = new System.Drawing.Size(116, 21);
+ this.textBoxJogVel.TabIndex = 5;
+ this.textBoxJogVel.Text = "50";
//
// label4
//
@@ -321,20 +334,20 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox textBox2;
- private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.TextBox textBoxJogAcc;
+ private System.Windows.Forms.TextBox textBoxJogVel;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Button button1;
- private System.Windows.Forms.Button buttonClearStatus;
- private System.Windows.Forms.TextBox textBox3;
+ private System.Windows.Forms.Button buttonNegative;
+ private System.Windows.Forms.Button buttonPositive;
+ private System.Windows.Forms.TextBox textBoxJogDec;
private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Button button3;
- private System.Windows.Forms.Button button2;
- private System.Windows.Forms.TextBox textBox5;
- private System.Windows.Forms.TextBox textBox4;
- private System.Windows.Forms.TextBox textBox7;
- private System.Windows.Forms.TextBox textBox6;
+ private System.Windows.Forms.Button buttonStop;
+ private System.Windows.Forms.Button buttonStart;
+ private System.Windows.Forms.TextBox textBoxP2PVel;
+ private System.Windows.Forms.TextBox textBoxP2PPrfPosition;
+ private System.Windows.Forms.TextBox textBoxP2PDec;
+ private System.Windows.Forms.TextBox textBoxP2PAcc;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label9;
--
Gitblit v1.8.0