Skip to content

李娜 / Line-Smart-Workstation

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

界面调整

1 个父辈 f3df745c
内嵌 并排
正在显示 4 个修改的文件 包含 44 行增加 和 18 行删除
TSA-V/Properties/Resource.en-US.resx
......@@ -2289,4 +2289,5 @@
<data name = "用户修改失败" xml:space = "preserve"> <value> Failed to modify user </value> </data>
<data name = "添加用户成功" xml:space = "preserve"> <value> Added user successfully </value> </data>
<data name = "FrmDeviceConfig_lblCode_Text" xml:space = "preserve"> <value> Barcode： </value> </data>
<data name = "FrmPusicanTest_llblClearp_Text" xml:space = "preserve"> <value> Zero position </value> </data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
......@@ -2303,4 +2303,5 @@
<data name = "修改用户失败" xml:space = "preserve"> <value> 修改用户失败 </value> </data>
<data name = "添加用户成功" xml:space = "preserve"> <value> 添加用户成功 </value> </data>
<data name = "FrmDeviceConfig_lblCode_Text" xml:space = "preserve"> <value> 条码： </value> </data>
<data name = "FrmPusicanTest_llblClearp_Text" xml:space = "preserve"> <value> 清零位置 </value> </data>
</root>
\ No newline at end of file
TSA-V/deviceDebug/FrmPusicanTest.Designer.cs
......@@ -54,6 +54,7 @@
this.nudDelSpeed = new System.Windows.Forms.NumericUpDown();
this.btnReadAll = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.llblClearp = new System.Windows.Forms.LinkLabel();
this.btnSetPosition = new System.Windows.Forms.LinkLabel();
this.txtGetPosition = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
......@@ -108,7 +109,7 @@
// btnBack
//
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(602, 478);
this.btnBack.Location = new System.Drawing.Point(564, 526);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(136, 45);
this.btnBack.TabIndex = 6;
......@@ -137,7 +138,7 @@
this.groupBox2.Controls.Add(this.label18);
this.groupBox2.Controls.Add(this.nudDelSpeed);
this.groupBox2.Controls.Add(this.btnReadAll);
this.groupBox2.Location = new System.Drawing.Point(22, 118);
this.groupBox2.Location = new System.Drawing.Point(14, 154);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(716, 171);
this.groupBox2.TabIndex = 35;
......@@ -230,6 +231,7 @@
this.lkSetMaxSpeed.TabIndex = 36;
this.lkSetMaxSpeed.TabStop = true;
this.lkSetMaxSpeed.Text = "设置";
this.lkSetMaxSpeed.Visible = false;
this.lkSetMaxSpeed.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lkSetMaxSpeed_LinkClicked);
//
// nudStartSpeed
......@@ -368,6 +370,7 @@
//
// groupBox1
//
this.groupBox1.Controls.Add(this.llblClearp);
this.groupBox1.Controls.Add(this.btnSetPosition);
this.groupBox1.Controls.Add(this.txtGetPosition);
this.groupBox1.Controls.Add(this.label11);
......@@ -377,23 +380,36 @@
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.cmbNode);
this.groupBox1.Controls.Add(this.txtNode);
this.groupBox1.Location = new System.Drawing.Point(22, 12);
this.groupBox1.Location = new System.Drawing.Point(14, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(716, 100);
this.groupBox1.Size = new System.Drawing.Size(716, 136);
this.groupBox1.TabIndex = 34;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "选择运动节点";
//
// llblClearp
//
this.llblClearp.AutoSize = true;
this.llblClearp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.llblClearp.Location = new System.Drawing.Point(252, 62);
this.llblClearp.Name = "llblClearp";
this.llblClearp.Size = new System.Drawing.Size(74, 21);
this.llblClearp.TabIndex = 57;
this.llblClearp.TabStop = true;
this.llblClearp.Text = "位置清零";
this.llblClearp.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.llblClearp_LinkClicked);
//
// btnSetPosition
//
this.btnSetPosition.AutoSize = true;
this.btnSetPosition.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSetPosition.Location = new System.Drawing.Point(249, 62);
this.btnSetPosition.Location = new System.Drawing.Point(627, 24);
this.btnSetPosition.Name = "btnSetPosition";
this.btnSetPosition.Size = new System.Drawing.Size(42, 21);
this.btnSetPosition.TabIndex = 56;
this.btnSetPosition.TabStop = true;
this.btnSetPosition.Text = "设置";
this.btnSetPosition.Visible = false;
this.btnSetPosition.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.btnSetPosition_LinkClicked);
//
// txtGetPosition
......@@ -416,14 +432,14 @@
//
// lblCanMsg
//
this.lblCanMsg.AutoSize = true;
this.lblCanMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCanMsg.ForeColor = System.Drawing.Color.Red;
this.lblCanMsg.Location = new System.Drawing.Point(531, 65);
this.lblCanMsg.Location = new System.Drawing.Point(368, 62);
this.lblCanMsg.Name = "lblCanMsg";
this.lblCanMsg.Size = new System.Drawing.Size(68, 17);
this.lblCanMsg.Size = new System.Drawing.Size(318, 62);
this.lblCanMsg.TabIndex = 34;
this.lblCanMsg.Text = "设备未连接";
this.lblCanMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// checkBox1
//
......@@ -431,7 +447,7 @@
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(306, 62);
this.checkBox1.Location = new System.Drawing.Point(123, 100);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(112, 24);
this.checkBox1.TabIndex = 55;
......@@ -441,7 +457,7 @@
//
// 节点
//
this.节点.Location = new System.Drawing.Point(13, 25);
this.节点.Location = new System.Drawing.Point(13, 24);
this.节点.Name = "节点";
this.节点.Size = new System.Drawing.Size(100, 20);
this.节点.TabIndex = 50;
......@@ -450,7 +466,7 @@
//
// label1
//
this.label1.Location = new System.Drawing.Point(376, 23);
this.label1.Location = new System.Drawing.Point(376, 24);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(100, 20);
this.label1.TabIndex = 54;
......@@ -482,7 +498,7 @@
//
this.txtNode.Enabled = false;
this.txtNode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtNode.Location = new System.Drawing.Point(479, 22);
this.txtNode.Location = new System.Drawing.Point(479, 21);
this.txtNode.Name = "txtNode";
this.txtNode.Size = new System.Drawing.Size(120, 26);
this.txtNode.TabIndex = 53;
......@@ -501,7 +517,7 @@
this.groupBox5.Controls.Add(this.btnGetStatus);
this.groupBox5.Controls.Add(this.btnClearStatus);
this.groupBox5.Controls.Add(this.label20);
this.groupBox5.Location = new System.Drawing.Point(22, 294);
this.groupBox5.Location = new System.Drawing.Point(14, 330);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(716, 178);
this.groupBox5.TabIndex = 33;
......@@ -623,7 +639,7 @@
//
// label12
//
this.label12.Location = new System.Drawing.Point(57, 474);
this.label12.Location = new System.Drawing.Point(57, 531);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(100, 20);
this.label12.TabIndex = 24;
......@@ -639,7 +655,7 @@
this.cmbMoveType.Items.AddRange(new object[] {
"位置使能",
"速度使能"});
this.cmbMoveType.Location = new System.Drawing.Point(167, 495);
this.cmbMoveType.Location = new System.Drawing.Point(167, 552);
this.cmbMoveType.Name = "cmbMoveType";
this.cmbMoveType.Size = new System.Drawing.Size(120, 28);
this.cmbMoveType.TabIndex = 27;
......@@ -647,7 +663,7 @@
//
// label19
//
this.label19.Location = new System.Drawing.Point(57, 500);
this.label19.Location = new System.Drawing.Point(57, 557);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(100, 20);
this.label19.TabIndex = 26;
......@@ -663,7 +679,7 @@
this.cmbTargetType.Items.AddRange(new object[] {
"正方向",
"反方向"});
this.cmbTargetType.Location = new System.Drawing.Point(167, 469);
this.cmbTargetType.Location = new System.Drawing.Point(167, 526);
this.cmbTargetType.Name = "cmbTargetType";
this.cmbTargetType.Size = new System.Drawing.Size(120, 28);
this.cmbTargetType.TabIndex = 25;
......@@ -673,7 +689,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(768, 535);
this.ClientSize = new System.Drawing.Size(752, 589);
this.Controls.Add(this.lblControlStatus);
this.Controls.Add(this.btnBack);
this.Controls.Add(this.groupBox2);
......@@ -759,5 +775,6 @@
private System.Windows.Forms.Label label19;
private System.Windows.Forms.ComboBox cmbTargetType;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.LinkLabel llblClearp;
}
}
\ No newline at end of file
TSA-V/deviceDebug/FrmPusicanTest.cs
......@@ -71,6 +71,7 @@ namespace TSA_V
checkBox1.Enabled = open;
btnSetPosition.Enabled = open;
btnHomeMove.Enabled = open;
llblClearp.Enabled = open;
}
......@@ -239,6 +240,12 @@ namespace TSA_V
int homeSpeed = FormUtil.GetIntValue(txtHomeMoveSpeed);
PUSICANControl.HomeMove(nodeid, homeSpeed);
}
private void llblClearp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
uint nodeid = GetSelectNode();
PUSICANControl.SetPosition(nodeid, 0);
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!