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 | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
index 629efc2..0e3e8f1 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
@@ -140,10 +140,11 @@
//
// textBoxP2PVel
//
- this.textBoxP2PVel.Location = new System.Drawing.Point(154, 34);
+ 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";
//
// textBoxP2PPrfPosition
//
@@ -151,6 +152,7 @@
this.textBoxP2PPrfPosition.Name = "textBoxP2PPrfPosition";
this.textBoxP2PPrfPosition.Size = new System.Drawing.Size(116, 21);
this.textBoxP2PPrfPosition.TabIndex = 5;
+ this.textBoxP2PPrfPosition.Text = "20000";
//
// textBoxP2PDec
//
@@ -158,18 +160,20 @@
this.textBoxP2PDec.Name = "textBoxP2PDec";
this.textBoxP2PDec.Size = new System.Drawing.Size(116, 21);
this.textBoxP2PDec.TabIndex = 5;
+ this.textBoxP2PDec.Text = "0.5";
//
// textBoxP2PAcc
//
- this.textBoxP2PAcc.Location = new System.Drawing.Point(340, 4);
+ 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;
@@ -182,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
//
@@ -196,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;
@@ -227,16 +231,16 @@
this.buttonNegative.TabIndex = 6;
this.buttonNegative.Text = "璐熷悜";
this.buttonNegative.UseVisualStyleBackColor = true;
- this.buttonNegative.Click += new System.EventHandler(this.buttonNegative_Click);
this.buttonNegative.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonNegative_MouseDown);
this.buttonNegative.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttonNegative_MouseUp);
//
// textBoxJogDec
//
- this.textBoxJogDec.Location = new System.Drawing.Point(340, 4);
+ 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";
//
// buttonPositive
//
@@ -246,7 +250,6 @@
this.buttonPositive.TabIndex = 6;
this.buttonPositive.Text = "姝ｅ悜";
this.buttonPositive.UseVisualStyleBackColor = true;
- this.buttonPositive.Click += new System.EventHandler(this.buttonPositive_Click);
this.buttonPositive.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonPositive_MouseDown);
this.buttonPositive.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttonPositive_MouseUp);
//
@@ -256,11 +259,12 @@
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;
@@ -272,6 +276,7 @@
this.textBoxJogVel.Name = "textBoxJogVel";
this.textBoxJogVel.Size = new System.Drawing.Size(116, 21);
this.textBoxJogVel.TabIndex = 5;
+ this.textBoxJogVel.Text = "50";
//
// label4
//
--
Gitblit v1.8.0