From a332decd68d6d8bb5678d8ec95e6c65e0ccf9f33 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 02 七月 2020 17:14:45 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperation.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs
similarity index 96%
rename from src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperation.Designer.cs
rename to src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs
index a7875c8..e61e4f4 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperation.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace Bro.UI.Device.Winform
{
- partial class CtrlMotionCardOperation
+ partial class CtrlMotionCardOperationBase
{
/// <summary>
/// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
@@ -28,14 +28,14 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CtrlMotionCardOperation));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CtrlMotionCardOperationBase));
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.listBoxMsg = new System.Windows.Forms.ListBox();
this.groupBoxPara = new System.Windows.Forms.GroupBox();
this.propGrid = new System.Windows.Forms.PropertyGrid();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.groupBoxMoveModel = new System.Windows.Forms.GroupBox();
this.radioGoHome = new System.Windows.Forms.RadioButton();
this.radioJog = new System.Windows.Forms.RadioButton();
this.radioP2P = new System.Windows.Forms.RadioButton();
@@ -86,7 +86,7 @@
this.tableLayoutPanel2.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBoxPara.SuspendLayout();
- this.groupBox1.SuspendLayout();
+ this.groupBoxMoveModel.SuspendLayout();
this.groupBoxCommBtn.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
this.groupBox5.SuspendLayout();
@@ -114,7 +114,7 @@
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Controls.Add(this.groupBox2, 0, 3);
this.tableLayoutPanel2.Controls.Add(this.groupBoxPara, 0, 2);
- this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1);
+ this.tableLayoutPanel2.Controls.Add(this.groupBoxMoveModel, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBoxCommBtn, 0, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3);
@@ -169,18 +169,18 @@
this.propGrid.Size = new System.Drawing.Size(374, 438);
this.propGrid.TabIndex = 1;
//
- // groupBox1
+ // groupBoxMoveModel
//
- this.groupBox1.Controls.Add(this.radioGoHome);
- this.groupBox1.Controls.Add(this.radioJog);
- this.groupBox1.Controls.Add(this.radioP2P);
- this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.groupBox1.Location = new System.Drawing.Point(3, 93);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(380, 44);
- this.groupBox1.TabIndex = 5;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "杩愬姩绫诲瀷";
+ this.groupBoxMoveModel.Controls.Add(this.radioGoHome);
+ this.groupBoxMoveModel.Controls.Add(this.radioJog);
+ this.groupBoxMoveModel.Controls.Add(this.radioP2P);
+ this.groupBoxMoveModel.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBoxMoveModel.Location = new System.Drawing.Point(3, 93);
+ this.groupBoxMoveModel.Name = "groupBoxMoveModel";
+ this.groupBoxMoveModel.Size = new System.Drawing.Size(380, 44);
+ this.groupBoxMoveModel.TabIndex = 5;
+ this.groupBoxMoveModel.TabStop = false;
+ this.groupBoxMoveModel.Text = "杩愬姩绫诲瀷";
//
// radioGoHome
//
@@ -666,19 +666,19 @@
this.flowLayoutPanelRunStatus.Size = new System.Drawing.Size(578, 422);
this.flowLayoutPanelRunStatus.TabIndex = 8;
//
- // CtrlMotionCardRunBase
+ // CtrlMotionCardOperation
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.tableLayoutPanel1);
- this.Name = "CtrlMotionCardRunBase";
+ this.Name = "CtrlMotionCardOperation";
this.Size = new System.Drawing.Size(982, 720);
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBoxPara.ResumeLayout(false);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
+ this.groupBoxMoveModel.ResumeLayout(false);
+ this.groupBoxMoveModel.PerformLayout();
this.groupBoxCommBtn.ResumeLayout(false);
this.groupBoxCommBtn.PerformLayout();
this.tableLayoutPanel3.ResumeLayout(false);
@@ -694,7 +694,7 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.GroupBox groupBoxCommBtn;
private System.Windows.Forms.GroupBox groupBoxPara;
- private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.GroupBox groupBoxMoveModel;
private System.Windows.Forms.Button buttonClearStatus;
private System.Windows.Forms.Button buttonEmergencyStop;
private System.Windows.Forms.Button buttonServoEnable;
--
Gitblit v1.8.0