Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 1a935e7c 由 LN
选项

1

1 个父辈 a98e5261
内嵌 并排
正在显示 4 个修改的文件 包含 175 行增加 和 189 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -51,22 +51,21 @@
this.btnOpenAutoInOut = new System.Windows.Forms.Button();
this.btnLan = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.btnClearL = new System.Windows.Forms.Button();
this.btnLogDebug = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.chbOpenLog = new System.Windows.Forms.CheckBox();
this.btnHul = new System.Windows.Forms.Button();
this.btnCloseDLed = new System.Windows.Forms.Button();
this.btnOpenDLed = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
this.btnClearLog = new System.Windows.Forms.Button();
this.btnOpenLed = new System.Windows.Forms.Button();
this.btnCloseDoor = new System.Windows.Forms.Button();
this.btnOpenDoor = new System.Windows.Forms.Button();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.btnHul = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl();
this.btnOpenDoor = new System.Windows.Forms.Button();
this.btnCloseDoor = new System.Windows.Forms.Button();
this.btnCloseDLed = new System.Windows.Forms.Button();
this.btnOpenLed = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
this.btnOpenDLed = new System.Windows.Forms.Button();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.groupHistory = new System.Windows.Forms.GroupBox();
......@@ -453,7 +452,6 @@
this.tabPage6.Controls.Add(this.btnOpenAutoInOut);
this.tabPage6.Controls.Add(this.btnLan);
this.tabPage6.Controls.Add(this.button4);
this.tabPage6.Controls.Add(this.btnClearL);
this.tabPage6.Controls.Add(this.btnLogDebug);
this.tabPage6.Location = new System.Drawing.Point(4, 29);
this.tabPage6.Name = "tabPage6";
......@@ -467,7 +465,7 @@
this.btnOpenAutoInOut.BackColor = System.Drawing.Color.Transparent;
this.btnOpenAutoInOut.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAutoInOut.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAutoInOut.Location = new System.Drawing.Point(550, 1);
this.btnOpenAutoInOut.Location = new System.Drawing.Point(417, 1);
this.btnOpenAutoInOut.Name = "btnOpenAutoInOut";
this.btnOpenAutoInOut.Size = new System.Drawing.Size(132, 45);
this.btnOpenAutoInOut.TabIndex = 271;
......@@ -492,7 +490,7 @@
//
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(403, 1);
this.button4.Location = new System.Drawing.Point(270, 1);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(132, 45);
this.button4.TabIndex = 15;
......@@ -500,18 +498,6 @@
this.button4.UseVisualStyleBackColor = true;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
// btnClearL
//
this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearL.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearL.Location = new System.Drawing.Point(270, 1);
this.btnClearL.Name = "btnClearL";
this.btnClearL.Size = new System.Drawing.Size(132, 45);
this.btnClearL.TabIndex = 14;
this.btnClearL.Text = "清理日志";
this.btnClearL.UseVisualStyleBackColor = true;
this.btnClearL.Click += new System.EventHandler(this.btnClearL_Click);
//
// btnLogDebug
//
this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
......@@ -541,14 +527,7 @@
// tabPage3
//
this.tabPage3.Controls.Add(this.chbOpenLog);
this.tabPage3.Controls.Add(this.btnHul);
this.tabPage3.Controls.Add(this.btnCloseDLed);
this.tabPage3.Controls.Add(this.btnOpenDLed);
this.tabPage3.Controls.Add(this.btnCloseLed);
this.tabPage3.Controls.Add(this.btnClearLog);
this.tabPage3.Controls.Add(this.btnOpenLed);
this.tabPage3.Controls.Add(this.btnCloseDoor);
this.tabPage3.Controls.Add(this.btnOpenDoor);
this.tabPage3.Controls.Add(this.richTextBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
......@@ -561,7 +540,7 @@
//
this.chbOpenLog.AutoSize = true;
this.chbOpenLog.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbOpenLog.Location = new System.Drawing.Point(14, 105);
this.chbOpenLog.Location = new System.Drawing.Point(21, 13);
this.chbOpenLog.Name = "chbOpenLog";
this.chbOpenLog.Size = new System.Drawing.Size(84, 24);
this.chbOpenLog.TabIndex = 272;
......@@ -569,12 +548,56 @@
this.chbOpenLog.UseVisualStyleBackColor = true;
this.chbOpenLog.CheckedChanged += new System.EventHandler(this.chbOpenLog_CheckedChanged);
//
// btnClearLog
//
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(390, 3);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(149, 45);
this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// richTextBox1
//
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(5, 52);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(534, 565);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
this.richTextBox1.Visible = false;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.btnHul);
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Controls.Add(this.btnOpenDoor);
this.tabPage1.Controls.Add(this.btnCloseDoor);
this.tabPage1.Controls.Add(this.btnCloseDLed);
this.tabPage1.Controls.Add(this.btnOpenLed);
this.tabPage1.Controls.Add(this.btnCloseLed);
this.tabPage1.Controls.Add(this.btnOpenDLed);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(547, 622);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true;
//
// btnHul
//
this.btnHul.BackColor = System.Drawing.Color.White;
this.btnHul.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHul.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHul.Location = new System.Drawing.Point(383, 4);
this.btnHul.Location = new System.Drawing.Point(375, 6);
this.btnHul.Name = "btnHul";
this.btnHul.Size = new System.Drawing.Size(149, 45);
this.btnHul.TabIndex = 263;
......@@ -583,12 +606,45 @@
this.btnHul.Visible = false;
this.btnHul.Click += new System.EventHandler(this.btnHul_Click);
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(4, 107);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(540, 509);
this.axisMoveControl1.TabIndex = 0;
//
// btnOpenDoor
//
this.btnOpenDoor.BackColor = System.Drawing.Color.White;
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(6, 6);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(117, 45);
this.btnOpenDoor.TabIndex = 257;
this.btnOpenDoor.Text = "打开仓门";
this.btnOpenDoor.UseVisualStyleBackColor = false;
this.btnOpenDoor.Click += new System.EventHandler(this.btnOpenDoor_Click);
//
// btnCloseDoor
//
this.btnCloseDoor.BackColor = System.Drawing.Color.White;
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(6, 56);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(117, 45);
this.btnCloseDoor.TabIndex = 258;
this.btnCloseDoor.Text = "关闭仓门";
this.btnCloseDoor.UseVisualStyleBackColor = false;
this.btnCloseDoor.Click += new System.EventHandler(this.btnCloseDoor_Click);
//
// btnCloseDLed
//
this.btnCloseDLed.BackColor = System.Drawing.Color.White;
this.btnCloseDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDLed.Location = new System.Drawing.Point(260, 54);
this.btnCloseDLed.Location = new System.Drawing.Point(252, 56);
this.btnCloseDLed.Name = "btnCloseDLed";
this.btnCloseDLed.Size = new System.Drawing.Size(117, 45);
this.btnCloseDLed.TabIndex = 262;
......@@ -596,51 +652,12 @@
this.btnCloseDLed.UseVisualStyleBackColor = false;
this.btnCloseDLed.Click += new System.EventHandler(this.btnCloseDLed_Click);
//
// btnOpenDLed
//
this.btnOpenDLed.BackColor = System.Drawing.Color.White;
this.btnOpenDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDLed.Location = new System.Drawing.Point(260, 4);
this.btnOpenDLed.Name = "btnOpenDLed";
this.btnOpenDLed.Size = new System.Drawing.Size(117, 45);
this.btnOpenDLed.TabIndex = 261;
this.btnOpenDLed.Text = "打开设备照明";
this.btnOpenDLed.UseVisualStyleBackColor = false;
this.btnOpenDLed.Click += new System.EventHandler(this.btnOpenDLed_Click);
//
// btnCloseLed
//
this.btnCloseLed.BackColor = System.Drawing.Color.White;
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(137, 54);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(117, 45);
this.btnCloseLed.TabIndex = 260;
this.btnCloseLed.Text = "关闭相机照明";
this.btnCloseLed.UseVisualStyleBackColor = false;
this.btnCloseLed.Click += new System.EventHandler(this.btnCloseLed_Click);
//
// btnClearLog
//
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(383, 54);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(149, 45);
this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// btnOpenLed
//
this.btnOpenLed.BackColor = System.Drawing.Color.White;
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(137, 4);
this.btnOpenLed.Location = new System.Drawing.Point(129, 6);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(117, 45);
this.btnOpenLed.TabIndex = 259;
......@@ -648,62 +665,31 @@
this.btnOpenLed.UseVisualStyleBackColor = false;
this.btnOpenLed.Click += new System.EventHandler(this.btnOpenLed_Click);
//
// btnCloseDoor
//
this.btnCloseDoor.BackColor = System.Drawing.Color.White;
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(14, 54);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(117, 45);
this.btnCloseDoor.TabIndex = 258;
this.btnCloseDoor.Text = "关闭仓门";
this.btnCloseDoor.UseVisualStyleBackColor = false;
this.btnCloseDoor.Click += new System.EventHandler(this.btnCloseDoor_Click);
//
// btnOpenDoor
//
this.btnOpenDoor.BackColor = System.Drawing.Color.White;
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(14, 4);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(117, 45);
this.btnOpenDoor.TabIndex = 257;
this.btnOpenDoor.Text = "打开仓门";
this.btnOpenDoor.UseVisualStyleBackColor = false;
this.btnOpenDoor.Click += new System.EventHandler(this.btnOpenDoor_Click);
//
// richTextBox1
//
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(5, 135);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(534, 482);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
this.richTextBox1.Visible = false;
//
// tabPage1
// btnCloseLed
//
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(547, 622);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true;
this.btnCloseLed.BackColor = System.Drawing.Color.White;
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(129, 56);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(117, 45);
this.btnCloseLed.TabIndex = 260;
this.btnCloseLed.Text = "关闭相机照明";
this.btnCloseLed.UseVisualStyleBackColor = false;
this.btnCloseLed.Click += new System.EventHandler(this.btnCloseLed_Click);
//
// axisMoveControl1
// btnOpenDLed
//
this.axisMoveControl1.Location = new System.Drawing.Point(4, 8);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(540, 529);
this.axisMoveControl1.TabIndex = 0;
this.btnOpenDLed.BackColor = System.Drawing.Color.White;
this.btnOpenDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDLed.Location = new System.Drawing.Point(252, 6);
this.btnOpenDLed.Name = "btnOpenDLed";
this.btnOpenDLed.Size = new System.Drawing.Size(117, 45);
this.btnOpenDLed.TabIndex = 261;
this.btnOpenDLed.Text = "打开设备照明";
this.btnOpenDLed.UseVisualStyleBackColor = false;
this.btnOpenDLed.Click += new System.EventHandler(this.btnOpenDLed_Click);
//
// tabPage2
//
......@@ -729,9 +715,9 @@
this.groupBox7.Controls.Add(this.btnTempClose);
this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox7.Location = new System.Drawing.Point(10, 6);
this.groupBox7.Location = new System.Drawing.Point(8, 6);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(544, 126);
this.groupBox7.Size = new System.Drawing.Size(530, 126);
this.groupBox7.TabIndex = 272;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "温控器调试";
......@@ -2105,7 +2091,6 @@
private System.Windows.Forms.Button btnLogDebug;
private System.Windows.Forms.TabPage tabPage6;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button btnClearL;
private System.Windows.Forms.Button btnStoreStart;
private System.Windows.Forms.Button btnDebug;
private System.Windows.Forms.TextBox txtHistoryTemp;
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -170,6 +170,7 @@ namespace OnlineStore.ACSingleStore
}
LanguageProcess();
LanguagePro();
tabControl1.TabPages.Remove(tabPage3);
richTextBox1.Visible = false;
// this.tabControl1.TabPages.Remove(tabPage3);
// groupCode.Visible = false;
......
source/ACSingleStore/resource/language.resource
......@@ -31,11 +31,11 @@ FrmStoreBox_btnOpenDoor_Text,打开仓门,Open door
FrmStoreBox_tabPage1_Text,伺服调试,Servo debug
FrmStoreBox_axisMoveControl1_Text,FrmStoreBox_axisMoveControl1_Text,FrmStoreBox_axisMoveControl1_Text
FrmStoreBox_groupBox1_Text,伺服状态,Servo state
FrmStoreBox_axis_4_Alarm_Text,FrmStoreBox_axis_4_Alarm_Text,FrmStoreBox_axis_4_Alarm_Text
FrmStoreBox_label1_Text,label1,label1
FrmStoreBox_axis_1_Alarm_Text,FrmStoreBox_axis_1_Alarm_Text,FrmStoreBox_axis_1_Alarm_Text
FrmStoreBox_axis_3_Alarm_Text,FrmStoreBox_axis_3_Alarm_Text,FrmStoreBox_axis_3_Alarm_Text
FrmStoreBox_axis_2_Alarm_Text,FrmStoreBox_axis_2_Alarm_Text,FrmStoreBox_axis_2_Alarm_Text
FrmStoreBox_axis_4_Alarm_Text,,
FrmStoreBox_label1_Text,轴四:压紧轴,Axis 4 pressure axis
FrmStoreBox_axis_1_Alarm_Text,,
FrmStoreBox_axis_3_Alarm_Text,,
FrmStoreBox_axis_2_Alarm_Text,,
FrmStoreBox_label38_Text,ALM:,ALM:
FrmStoreBox_label12_Text,出入库目标值:,Providing target value:
FrmStoreBox_label4_Text,轴三:进出轴,Axis 3 in-out axis
......@@ -67,7 +67,7 @@ FrmStoreBox_btnAxisStop_Text,停止运动,Stop move
FrmStoreBox_label45_Text,端口号:,Port number:
FrmStoreBox_label46_Text,地址:,Address:
FrmStoreBox_label49_Text,AC伺服:,AC server:
FrmStoreBox_tabPage2_Text,压紧轴/温湿度,Temp controller
FrmStoreBox_tabPage2_Text,温湿度,Temp controller
FrmStoreBox_groupCode_Text,扫码测试,scanning test
FrmStoreBox_label32_Text,二维码内容:,Code info:
FrmStoreBox_label31_Text,图片:,Image:
......@@ -172,7 +172,7 @@ FrmAxisDebug_label2_Text,（轴二）升降轴,(Axis 2) lifting axis
FrmAxisDebug_label1_Text,（轴一）旋转轴,(Axis 1) rotation axis
升降轴位置调试:,升降轴位置调试:,Updown-Axis Debug Location:
FrmPositionTool_Text,升降轴位置测试,Updown-Axis Debug Location
FrmPositionTool_groupBox6_Text,FrmPositionTool_groupBox6_Text,FrmPositionTool_groupBox6_Text
FrmPositionTool_groupBox6_Text,,
FrmPositionTool_groupBox2_Text,位置信息,location information
FrmPositionTool_label10_Text,入料缓冲点P4偏移量:,Point P4 offset:
FrmPositionTool_label9_Text,入料前点P3偏移量:,Point P3 offset:
......
source/ACSingleStore/useControl/AxisMoveControl.Designer.cs
......@@ -133,9 +133,9 @@
this.groupAxis.Controls.Add(this.label46);
this.groupAxis.Controls.Add(this.comboBox1);
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(6, 4);
this.groupAxis.Location = new System.Drawing.Point(4, 4);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(529, 312);
this.groupAxis.Size = new System.Drawing.Size(533, 298);
this.groupAxis.TabIndex = 217;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
......@@ -143,7 +143,7 @@
//
// label7
//
this.label7.Location = new System.Drawing.Point(10, 172);
this.label7.Location = new System.Drawing.Point(10, 163);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(99, 17);
this.label7.TabIndex = 328;
......@@ -153,14 +153,14 @@
// txtServoStatue
//
this.txtServoStatue.Enabled = false;
this.txtServoStatue.Location = new System.Drawing.Point(112, 169);
this.txtServoStatue.Location = new System.Drawing.Point(112, 160);
this.txtServoStatue.Name = "txtServoStatue";
this.txtServoStatue.Size = new System.Drawing.Size(25, 23);
this.txtServoStatue.TabIndex = 327;
//
// label17
//
this.label17.Location = new System.Drawing.Point(144, 272);
this.label17.Location = new System.Drawing.Point(144, 263);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(99, 17);
this.label17.TabIndex = 316;
......@@ -170,14 +170,14 @@
// txtLimit2
//
this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(247, 269);
this.txtLimit2.Location = new System.Drawing.Point(247, 260);
this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313;
//
// label19
//
this.label19.Location = new System.Drawing.Point(144, 238);
this.label19.Location = new System.Drawing.Point(144, 229);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(99, 17);
this.label19.TabIndex = 312;
......@@ -187,14 +187,14 @@
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(247, 235);
this.txtLimit1.Location = new System.Drawing.Point(247, 226);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309;
//
// label6
//
this.label6.Location = new System.Drawing.Point(144, 204);
this.label6.Location = new System.Drawing.Point(144, 195);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(99, 17);
this.label6.TabIndex = 300;
......@@ -204,14 +204,14 @@
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(247, 201);
this.txtHomeSingle.Location = new System.Drawing.Point(247, 192);
this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297;
//
// label11
//
this.label11.Location = new System.Drawing.Point(10, 272);
this.label11.Location = new System.Drawing.Point(10, 263);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(99, 17);
this.label11.TabIndex = 292;
......@@ -221,14 +221,14 @@
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(112, 269);
this.txtHomeStatus.Location = new System.Drawing.Point(112, 260);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// label10
//
this.label10.Location = new System.Drawing.Point(10, 238);
this.label10.Location = new System.Drawing.Point(10, 229);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(99, 17);
this.label10.TabIndex = 289;
......@@ -238,14 +238,14 @@
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(112, 235);
this.txtBusyStatus.Location = new System.Drawing.Point(112, 226);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// label2
//
this.label2.Location = new System.Drawing.Point(10, 204);
this.label2.Location = new System.Drawing.Point(10, 195);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(99, 17);
this.label2.TabIndex = 286;
......@@ -255,7 +255,7 @@
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(112, 201);
this.txtAlarmStatus.Location = new System.Drawing.Point(112, 192);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
......@@ -264,7 +264,7 @@
//
this.btnGetAlarm.BackColor = System.Drawing.SystemColors.Control;
this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGetAlarm.Location = new System.Drawing.Point(291, 205);
this.btnGetAlarm.Location = new System.Drawing.Point(291, 196);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(115, 33);
this.btnGetAlarm.TabIndex = 284;
......@@ -279,7 +279,7 @@
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(409, 244);
this.btnReadPosition.Location = new System.Drawing.Point(409, 235);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(115, 33);
......@@ -291,7 +291,7 @@
// label8
//
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(144, 171);
this.label8.Location = new System.Drawing.Point(144, 162);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(99, 17);
this.label8.TabIndex = 255;
......@@ -332,7 +332,7 @@
//
// txtP
//
this.txtP.Location = new System.Drawing.Point(247, 169);
this.txtP.Location = new System.Drawing.Point(247, 160);
this.txtP.Name = "txtP";
this.txtP.ReadOnly = true;
this.txtP.Size = new System.Drawing.Size(87, 23);
......@@ -405,7 +405,7 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(409, 205);
this.btnAxisReturnHome.Location = new System.Drawing.Point(409, 196);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(115, 33);
......@@ -434,7 +434,7 @@
//
this.btnComAlarmClear.BackColor = System.Drawing.SystemColors.Control;
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(291, 244);
this.btnComAlarmClear.Location = new System.Drawing.Point(291, 235);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(115, 33);
this.btnComAlarmClear.TabIndex = 50;
......@@ -570,9 +570,9 @@
this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(6, 315);
this.groupBox1.Location = new System.Drawing.Point(4, 304);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(529, 199);
this.groupBox1.Size = new System.Drawing.Size(533, 203);
this.groupBox1.TabIndex = 218;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态";
......@@ -582,14 +582,14 @@
this.axis_4_Alarm.IOName = "";
this.axis_4_Alarm.IOValue = 0;
this.axis_4_Alarm.isCanClick = false;
this.axis_4_Alarm.Location = new System.Drawing.Point(453, 59);
this.axis_4_Alarm.Location = new System.Drawing.Point(453, 64);
this.axis_4_Alarm.Name = "axis_4_Alarm";
this.axis_4_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_4_Alarm.TabIndex = 271;
//
// txt4Target
//
this.txt4Target.Location = new System.Drawing.Point(430, 163);
this.txt4Target.Location = new System.Drawing.Point(430, 168);
this.txt4Target.Name = "txt4Target";
this.txt4Target.ReadOnly = true;
this.txt4Target.Size = new System.Drawing.Size(87, 23);
......@@ -597,7 +597,7 @@
//
// lblTargetP4
//
this.lblTargetP4.Location = new System.Drawing.Point(430, 135);
this.lblTargetP4.Location = new System.Drawing.Point(430, 140);
this.lblTargetP4.Name = "lblTargetP4";
this.lblTargetP4.ReadOnly = true;
this.lblTargetP4.Size = new System.Drawing.Size(87, 23);
......@@ -605,7 +605,7 @@
//
// lblActual4
//
this.lblActual4.Location = new System.Drawing.Point(430, 107);
this.lblActual4.Location = new System.Drawing.Point(430, 112);
this.lblActual4.Name = "lblActual4";
this.lblActual4.ReadOnly = true;
this.lblActual4.Size = new System.Drawing.Size(87, 23);
......@@ -614,9 +614,9 @@
// label1
//
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(427, 14);
this.label1.Location = new System.Drawing.Point(427, 11);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(94, 42);
this.label1.Size = new System.Drawing.Size(96, 49);
this.label1.TabIndex = 267;
this.label1.Text = "轴四:压紧轴";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -626,7 +626,7 @@
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(148, 60);
this.axis_1_Alarm.Location = new System.Drawing.Point(148, 65);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
......@@ -636,7 +636,7 @@
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(350, 60);
this.axis_3_Alarm.Location = new System.Drawing.Point(350, 65);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
......@@ -646,7 +646,7 @@
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(245, 60);
this.axis_2_Alarm.Location = new System.Drawing.Point(245, 65);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
......@@ -654,7 +654,7 @@
// label38
//
this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label38.Location = new System.Drawing.Point(7, 62);
this.label38.Location = new System.Drawing.Point(7, 67);
this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(116, 17);
this.label38.TabIndex = 263;
......@@ -663,7 +663,7 @@
//
// txtMiddleTarget
//
this.txtMiddleTarget.Location = new System.Drawing.Point(126, 164);
this.txtMiddleTarget.Location = new System.Drawing.Point(126, 169);
this.txtMiddleTarget.Name = "txtMiddleTarget";
this.txtMiddleTarget.ReadOnly = true;
this.txtMiddleTarget.Size = new System.Drawing.Size(87, 23);
......@@ -671,7 +671,7 @@
//
// txtInoutTarget
//
this.txtInoutTarget.Location = new System.Drawing.Point(327, 164);
this.txtInoutTarget.Location = new System.Drawing.Point(327, 169);
this.txtInoutTarget.Name = "txtInoutTarget";
this.txtInoutTarget.ReadOnly = true;
this.txtInoutTarget.Size = new System.Drawing.Size(87, 23);
......@@ -679,7 +679,7 @@
//
// txtUpdownTarget
//
this.txtUpdownTarget.Location = new System.Drawing.Point(227, 164);
this.txtUpdownTarget.Location = new System.Drawing.Point(227, 169);
this.txtUpdownTarget.Name = "txtUpdownTarget";
this.txtUpdownTarget.ReadOnly = true;
this.txtUpdownTarget.Size = new System.Drawing.Size(87, 23);
......@@ -688,7 +688,7 @@
// label12
//
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.Location = new System.Drawing.Point(7, 167);
this.label12.Location = new System.Drawing.Point(7, 172);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(116, 17);
this.label12.TabIndex = 258;
......@@ -697,7 +697,7 @@
//
// lblTargetP1
//
this.lblTargetP1.Location = new System.Drawing.Point(126, 136);
this.lblTargetP1.Location = new System.Drawing.Point(126, 141);
this.lblTargetP1.Name = "lblTargetP1";
this.lblTargetP1.ReadOnly = true;
this.lblTargetP1.Size = new System.Drawing.Size(87, 23);
......@@ -705,7 +705,7 @@
//
// lblActual1
//
this.lblActual1.Location = new System.Drawing.Point(126, 108);
this.lblActual1.Location = new System.Drawing.Point(126, 113);
this.lblActual1.Name = "lblActual1";
this.lblActual1.ReadOnly = true;
this.lblActual1.Size = new System.Drawing.Size(87, 23);
......@@ -713,7 +713,7 @@
//
// lblTargetP3
//
this.lblTargetP3.Location = new System.Drawing.Point(327, 136);
this.lblTargetP3.Location = new System.Drawing.Point(327, 141);
this.lblTargetP3.Name = "lblTargetP3";
this.lblTargetP3.ReadOnly = true;
this.lblTargetP3.Size = new System.Drawing.Size(87, 23);
......@@ -721,7 +721,7 @@
//
// lblActual3
//
this.lblActual3.Location = new System.Drawing.Point(327, 108);
this.lblActual3.Location = new System.Drawing.Point(327, 113);
this.lblActual3.Name = "lblActual3";
this.lblActual3.ReadOnly = true;
this.lblActual3.Size = new System.Drawing.Size(87, 23);
......@@ -729,7 +729,7 @@
//
// lblTargetP2
//
this.lblTargetP2.Location = new System.Drawing.Point(228, 136);
this.lblTargetP2.Location = new System.Drawing.Point(228, 141);
this.lblTargetP2.Name = "lblTargetP2";
this.lblTargetP2.ReadOnly = true;
this.lblTargetP2.Size = new System.Drawing.Size(87, 23);
......@@ -737,7 +737,7 @@
//
// lblActual2
//
this.lblActual2.Location = new System.Drawing.Point(227, 108);
this.lblActual2.Location = new System.Drawing.Point(227, 113);
this.lblActual2.Name = "lblActual2";
this.lblActual2.ReadOnly = true;
this.lblActual2.Size = new System.Drawing.Size(87, 23);
......@@ -746,9 +746,9 @@
// label4
//
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(327, 15);
this.label4.Location = new System.Drawing.Point(327, 12);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(94, 42);
this.label4.Size = new System.Drawing.Size(96, 49);
this.label4.TabIndex = 100;
this.label4.Text = "轴三:进出轴";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -756,9 +756,9 @@
// label3
//
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(227, 15);
this.label3.Location = new System.Drawing.Point(227, 12);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(94, 42);
this.label3.Size = new System.Drawing.Size(96, 49);
this.label3.TabIndex = 99;
this.label3.Text = "轴二:上下轴";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -766,9 +766,9 @@
// label5
//
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(127, 15);
this.label5.Location = new System.Drawing.Point(127, 12);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(94, 42);
this.label5.Size = new System.Drawing.Size(96, 49);
this.label5.TabIndex = 97;
this.label5.Text = "轴一:旋转轴";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -776,7 +776,7 @@
// label43
//
this.label43.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label43.Location = new System.Drawing.Point(7, 110);
this.label43.Location = new System.Drawing.Point(7, 115);
this.label43.Name = "label43";
this.label43.Size = new System.Drawing.Size(116, 17);
this.label43.TabIndex = 23;
......@@ -786,7 +786,7 @@
// label42
//
this.label42.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label42.Location = new System.Drawing.Point(7, 137);
this.label42.Location = new System.Drawing.Point(7, 142);
this.label42.Name = "label42";
this.label42.Size = new System.Drawing.Size(116, 17);
this.label42.TabIndex = 24;
......@@ -799,7 +799,7 @@
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(542, 525);
this.Size = new System.Drawing.Size(542, 514);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupBox1.ResumeLayout(false);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!