Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-13 54f0329172de152cf95644f6d427971542e9f42c

 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs

@@ -140,11 +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 = "10";
            this.textBoxP2PVel.Text = "50";
            // 
            // textBoxP2PPrfPosition
            // 
@@ -164,7 +164,7 @@
            // 
            // 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;
@@ -173,7 +173,7 @@
            // 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;
@@ -186,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
            // 
@@ -200,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;
@@ -236,7 +236,7 @@
            // 
            // 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;
@@ -264,7 +264,7 @@
            // 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;
@@ -276,7 +276,7 @@
            this.textBoxJogVel.Name = "textBoxJogVel";
            this.textBoxJogVel.Size = new System.Drawing.Size(116, 21);
            this.textBoxJogVel.TabIndex = 5;
            this.textBoxJogVel.Text = "5";
            this.textBoxJogVel.Text = "50";
            // 
            // label4
            //