Skip to content

孙克 / RC30-AutoInOutStore

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

升降轴位置调试界面增加中英文

1 个父辈 95a351e2
内嵌 并排
正在显示 10 个修改的文件 包含 301 行增加 和 91 行删除
source/ACSingleStore/FrmStoreBox.cs
......@@ -106,7 +106,7 @@ namespace OnlineStore.AutoInOutStore
private string AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
private string AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
public static string cannotMove = ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴");
public static string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
public static string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
public void processMenu()
{
......@@ -121,12 +121,12 @@ namespace OnlineStore.AutoInOutStore
StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,StartAuto);
StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, StopAuto);
AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
//摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
//toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
ToolStripItemCollection collection = menuStrip1.Items;
for (int i = 0; i < collection.Count; i++)
{
......
source/ACSingleStore/Properties/Resource.en-US.resx
......@@ -1258,4 +1258,69 @@
<data name="Y22" xml:space="preserve">
<value>Loosen the clamping cylinder SOL</value>
</data>
<data name="FrmPositionTool_btnAbsMove_Text" xml:space="preserve">
<value>Start </value>
</data>
<data name="FrmPositionTool_btnClear_Text" xml:space="preserve">
<value>Clear</value>
</data>
<data name="FrmPositionTool_btnExit_Text" xml:space="preserve">
<value>Exit</value>
</data>
<data name="FrmPositionTool_btnGetActualPosition_Text" xml:space="preserve">
<value>Update location</value>
</data>
<data name="FrmPositionTool_btnHomeMove_Text" xml:space="preserve">
<value>Back to home</value>
</data>
<data name="FrmPositionTool_btnOpenFolder_Text" xml:space="preserve">
<value>Open the folder </value>
</data>
<data name="FrmPositionTool_btnSdStop_Text" xml:space="preserve">
<value>Stop</value>
</data>
<data name="FrmPositionTool_btnServoOff_Text" xml:space="preserve">
<value>Close servo</value>
</data>
<data name="FrmPositionTool_btnServoOn_Text" xml:space="preserve">
<value>Open servo</value>
</data>
<data name="FrmPositionTool_groupBox6_Text" xml:space="preserve">
<value>Servo motion test</value>
</data>
<data name="FrmPositionTool_label12_Text" xml:space="preserve">
<value>Port number：</value>
</data>
<data name="FrmPositionTool_label13_Text" xml:space="preserve">
<value>position ：</value>
</data>
<data name="FrmPositionTool_label18_Text" xml:space="preserve">
<value>Servo address：</value>
</data>
<data name="FrmPositionTool_label1_Text" xml:space="preserve">
<value>IP :</value>
</data>
<data name="FrmPositionTool_label2_Text" xml:space="preserve">
<value>signal address：</value>
</data>
<data name="FrmPositionTool_label3_Text" xml:space="preserve">
<value> file name：</value>
</data>
<data name="FrmPositionTool_label6_Text" xml:space="preserve">
<value>target location：</value>
</data>
<data name="FrmPositionTool_label7_Text" xml:space="preserve">
<value>actual position：</value>
</data>
<data name="FrmPositionTool_label8_Text" xml:space="preserve">
<value>Speed：</value>
</data>
<data name="FrmPositionTool_Text" xml:space="preserve">
<value>Updown-Axis Debug Location</value>
</data>
<data name="FrmStoreBox_升降轴位置调试ToolStripMenuItem_Text" xml:space="preserve">
<value>Updown-Axis Debug Location</value>
</data>
</root>
\ No newline at end of file
source/ACSingleStore/Properties/Resource.zh-CN.resx
......@@ -1257,4 +1257,67 @@
<data name="Y22" xml:space="preserve">
<value>夹爪气缸放松SOL</value>
</data>
<data name="FrmPositionTool_btnAbsMove_Text" xml:space="preserve">
<value>开始运动</value>
</data>
<data name="FrmPositionTool_btnClear_Text" xml:space="preserve">
<value>清理</value>
</data>
<data name="FrmPositionTool_btnExit_Text" xml:space="preserve">
<value>退出</value>
</data>
<data name="FrmPositionTool_btnGetActualPosition_Text" xml:space="preserve">
<value>读取位置</value>
</data>
<data name="FrmPositionTool_btnHomeMove_Text" xml:space="preserve">
<value>原点返回</value>
</data>
<data name="FrmPositionTool_btnOpenFolder_Text" xml:space="preserve">
<value>打开文件夹</value>
</data>
<data name="FrmPositionTool_btnSdStop_Text" xml:space="preserve">
<value>停止</value>
</data>
<data name="FrmPositionTool_btnServoOff_Text" xml:space="preserve">
<value>关闭伺服</value>
</data>
<data name="FrmPositionTool_btnServoOn_Text" xml:space="preserve">
<value>打开伺服</value>
</data>
<data name="FrmPositionTool_groupBox6_Text" xml:space="preserve">
<value>伺服运动测试</value>
</data>
<data name="FrmPositionTool_label12_Text" xml:space="preserve">
<value>端口号：</value>
</data>
<data name="FrmPositionTool_label13_Text" xml:space="preserve">
<value>位置：</value>
</data>
<data name="FrmPositionTool_label18_Text" xml:space="preserve">
<value>地址：</value>
</data>
<data name="FrmPositionTool_label1_Text" xml:space="preserve">
<value>io模块IP:</value>
</data>
<data name="FrmPositionTool_label2_Text" xml:space="preserve">
<value>检测信号地址：</value>
</data>
<data name="FrmPositionTool_label3_Text" xml:space="preserve">
<value>保存文件名称：</value>
</data>
<data name="FrmPositionTool_label6_Text" xml:space="preserve">
<value>目标位置：</value>
</data>
<data name="FrmPositionTool_label7_Text" xml:space="preserve">
<value>实际位置：</value>
</data>
<data name="FrmPositionTool_label8_Text" xml:space="preserve">
<value>速度：</value>
</data>
<data name="FrmPositionTool_Text" xml:space="preserve">
<value>升降轴位置测试</value>
</data>
<data name="FrmStoreBox_升降轴位置调试ToolStripMenuItem_Text" xml:space="preserve">
<value>升降轴位置调试</value>
</data>
</root>
\ No newline at end of file
source/ACSingleStore/ResourceCulture.cs
......@@ -52,9 +52,10 @@ namespace OnlineStore.AutoInOutStore
private static Assembly assembly = Assembly.GetExecutingAssembly();
public static string GetString(string id)
{ return GetString(id, id);
{
return GetString(id, id);
}
public static string GetString(string id, string defaultStr)
public static string GetString(string id, string defaultStr)
{
string strCurLanguage = "";
......
source/ACSingleStore/positionTool/FrmPositionTool.Designer.cs
......@@ -30,6 +30,9 @@
{
this.components = new System.ComponentModel.Container();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnExit = new System.Windows.Forms.Button();
this.btnOpenFolder = new System.Windows.Forms.Button();
this.ioStatusControl1 = new UserFromControl.IOStatusControl();
this.txtFileName = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtPortName = new System.Windows.Forms.TextBox();
......@@ -57,9 +60,6 @@
this.txtSpeed = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.ioStatusControl1 = new UserFromControl.IOStatusControl();
this.btnOpenFolder = new System.Windows.Forms.Button();
this.btnExit = new System.Windows.Forms.Button();
this.groupBox6.SuspendLayout();
this.SuspendLayout();
//
......@@ -97,7 +97,7 @@
this.groupBox6.Controls.Add(this.label8);
this.groupBox6.Controls.Add(this.txtSpeed);
this.groupBox6.Controls.Add(this.label12);
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(14, 10);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(994, 646);
......@@ -105,9 +105,42 @@
this.groupBox6.TabStop = false;
this.groupBox6.Text = "伺服运动测试";
//
// btnExit
//
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.Location = new System.Drawing.Point(824, 604);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(132, 36);
this.btnExit.TabIndex = 281;
this.btnExit.Text = "退出";
this.btnExit.UseVisualStyleBackColor = true;
this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
//
// btnOpenFolder
//
this.btnOpenFolder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenFolder.Location = new System.Drawing.Point(305, 180);
this.btnOpenFolder.Name = "btnOpenFolder";
this.btnOpenFolder.Size = new System.Drawing.Size(132, 36);
this.btnOpenFolder.TabIndex = 280;
this.btnOpenFolder.Text = "打开文件夹";
this.btnOpenFolder.UseVisualStyleBackColor = true;
this.btnOpenFolder.Click += new System.EventHandler(this.btnOpenFolder_Click);
//
// ioStatusControl1
//
this.ioStatusControl1.IOName = null;
this.ioStatusControl1.IOValue = 0;
this.ioStatusControl1.isCanClick = false;
this.ioStatusControl1.Location = new System.Drawing.Point(122, 483);
this.ioStatusControl1.Name = "ioStatusControl1";
this.ioStatusControl1.Size = new System.Drawing.Size(171, 39);
this.ioStatusControl1.TabIndex = 279;
//
// txtFileName
//
this.txtFileName.Location = new System.Drawing.Point(114, 185);
this.txtFileName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtFileName.Location = new System.Drawing.Point(134, 185);
this.txtFileName.MaxLength = 30;
this.txtFileName.Name = "txtFileName";
this.txtFileName.Size = new System.Drawing.Size(164, 26);
......@@ -116,17 +149,19 @@
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(5, 188);
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(6, 188);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(107, 20);
this.label3.Size = new System.Drawing.Size(122, 20);
this.label3.TabIndex = 277;
this.label3.Text = "保存文件名称：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtPortName
//
this.txtPortName.Enabled = false;
this.txtPortName.Location = new System.Drawing.Point(114, 41);
this.txtPortName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPortName.Location = new System.Drawing.Point(134, 41);
this.txtPortName.MaxLength = 30;
this.txtPortName.Name = "txtPortName";
this.txtPortName.Size = new System.Drawing.Size(164, 26);
......@@ -136,7 +171,8 @@
// txtIOIndex
//
this.txtIOIndex.Enabled = false;
this.txtIOIndex.Location = new System.Drawing.Point(114, 149);
this.txtIOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtIOIndex.Location = new System.Drawing.Point(134, 149);
this.txtIOIndex.MaxLength = 30;
this.txtIOIndex.Name = "txtIOIndex";
this.txtIOIndex.Size = new System.Drawing.Size(164, 26);
......@@ -145,17 +181,19 @@
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(5, 152);
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(6, 152);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(107, 20);
this.label2.Size = new System.Drawing.Size(122, 20);
this.label2.TabIndex = 274;
this.label2.Text = "检测信号地址：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtIoIp
//
this.txtIoIp.Enabled = false;
this.txtIoIp.Location = new System.Drawing.Point(114, 113);
this.txtIoIp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtIoIp.Location = new System.Drawing.Point(134, 113);
this.txtIoIp.MaxLength = 30;
this.txtIoIp.Name = "txtIoIp";
this.txtIoIp.Size = new System.Drawing.Size(164, 26);
......@@ -164,26 +202,29 @@
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(33, 116);
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(6, 116);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(79, 20);
this.label1.Size = new System.Drawing.Size(122, 20);
this.label1.TabIndex = 272;
this.label1.Text = "IO模块IP：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(33, 370);
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(6, 370);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(79, 20);
this.label7.Size = new System.Drawing.Size(122, 20);
this.label7.TabIndex = 271;
this.label7.Text = "实际位置：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtActualPosition
//
this.txtActualPosition.Enabled = false;
this.txtActualPosition.Location = new System.Drawing.Point(114, 367);
this.txtActualPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtActualPosition.Location = new System.Drawing.Point(134, 367);
this.txtActualPosition.MaxLength = 30;
this.txtActualPosition.Name = "txtActualPosition";
this.txtActualPosition.Size = new System.Drawing.Size(164, 26);
......@@ -191,7 +232,8 @@
//
// btnGetActualPosition
//
this.btnGetActualPosition.Location = new System.Drawing.Point(285, 362);
this.btnGetActualPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetActualPosition.Location = new System.Drawing.Point(305, 362);
this.btnGetActualPosition.Name = "btnGetActualPosition";
this.btnGetActualPosition.Size = new System.Drawing.Size(132, 36);
this.btnGetActualPosition.TabIndex = 269;
......@@ -201,17 +243,19 @@
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(33, 336);
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(6, 336);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(79, 20);
this.label6.Size = new System.Drawing.Size(122, 20);
this.label6.TabIndex = 268;
this.label6.Text = "目标位置：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtTargetPosition
//
this.txtTargetPosition.Enabled = false;
this.txtTargetPosition.Location = new System.Drawing.Point(114, 333);
this.txtTargetPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTargetPosition.Location = new System.Drawing.Point(134, 333);
this.txtTargetPosition.MaxLength = 30;
this.txtTargetPosition.Name = "txtTargetPosition";
this.txtTargetPosition.Size = new System.Drawing.Size(164, 26);
......@@ -219,7 +263,8 @@
//
// btnServoOff
//
this.btnServoOff.Location = new System.Drawing.Point(285, 80);
this.btnServoOff.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnServoOff.Location = new System.Drawing.Point(305, 80);
this.btnServoOff.Name = "btnServoOff";
this.btnServoOff.Size = new System.Drawing.Size(132, 36);
this.btnServoOff.TabIndex = 259;
......@@ -229,7 +274,8 @@
//
// btnServoOn
//
this.btnServoOn.Location = new System.Drawing.Point(285, 41);
this.btnServoOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnServoOn.Location = new System.Drawing.Point(305, 41);
this.btnServoOn.Name = "btnServoOn";
this.btnServoOn.Size = new System.Drawing.Size(132, 36);
this.btnServoOn.TabIndex = 258;
......@@ -239,7 +285,8 @@
//
// btnSdStop
//
this.btnSdStop.Location = new System.Drawing.Point(285, 275);
this.btnSdStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSdStop.Location = new System.Drawing.Point(305, 275);
this.btnSdStop.Name = "btnSdStop";
this.btnSdStop.Size = new System.Drawing.Size(132, 36);
this.btnSdStop.TabIndex = 257;
......@@ -249,7 +296,8 @@
//
// btnHomeMove
//
this.btnHomeMove.Location = new System.Drawing.Point(285, 129);
this.btnHomeMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHomeMove.Location = new System.Drawing.Point(305, 129);
this.btnHomeMove.Name = "btnHomeMove";
this.btnHomeMove.Size = new System.Drawing.Size(132, 36);
this.btnHomeMove.TabIndex = 110;
......@@ -274,16 +322,17 @@
| 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(432, 20);
this.richTextBox1.Location = new System.Drawing.Point(458, 20);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(553, 581);
this.richTextBox1.Size = new System.Drawing.Size(527, 581);
this.richTextBox1.TabIndex = 105;
this.richTextBox1.Text = "";
//
// txtAddr
//
this.txtAddr.Enabled = false;
this.txtAddr.Location = new System.Drawing.Point(114, 77);
this.txtAddr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAddr.Location = new System.Drawing.Point(134, 77);
this.txtAddr.MaxLength = 30;
this.txtAddr.Name = "txtAddr";
this.txtAddr.Size = new System.Drawing.Size(164, 26);
......@@ -292,25 +341,28 @@
//
// label18
//
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(61, 80);
this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.Location = new System.Drawing.Point(6, 80);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(51, 20);
this.label18.Size = new System.Drawing.Size(122, 20);
this.label18.TabIndex = 94;
this.label18.Text = "地址：";
this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(61, 283);
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.Location = new System.Drawing.Point(6, 283);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(51, 20);
this.label13.Size = new System.Drawing.Size(122, 20);
this.label13.TabIndex = 90;
this.label13.Text = "位置：";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtPosition
//
this.txtPosition.Location = new System.Drawing.Point(114, 280);
this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosition.Location = new System.Drawing.Point(134, 280);
this.txtPosition.MaxLength = 30;
this.txtPosition.Name = "txtPosition";
this.txtPosition.Size = new System.Drawing.Size(164, 26);
......@@ -319,7 +371,8 @@
//
// btnAbsMove
//
this.btnAbsMove.Location = new System.Drawing.Point(285, 237);
this.btnAbsMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAbsMove.Location = new System.Drawing.Point(305, 237);
this.btnAbsMove.Name = "btnAbsMove";
this.btnAbsMove.Size = new System.Drawing.Size(132, 36);
this.btnAbsMove.TabIndex = 88;
......@@ -329,16 +382,18 @@
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(61, 245);
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(6, 245);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(51, 20);
this.label8.Size = new System.Drawing.Size(122, 20);
this.label8.TabIndex = 84;
this.label8.Text = "速度：";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtSpeed
//
this.txtSpeed.Location = new System.Drawing.Point(114, 242);
this.txtSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpeed.Location = new System.Drawing.Point(134, 242);
this.txtSpeed.MaxLength = 30;
this.txtSpeed.Name = "txtSpeed";
this.txtSpeed.Size = new System.Drawing.Size(164, 26);
......@@ -347,49 +402,19 @@
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(47, 44);
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(6, 44);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(65, 20);
this.label12.Size = new System.Drawing.Size(122, 20);
this.label12.TabIndex = 1;
this.label12.Text = "端口号：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// ioStatusControl1
//
this.ioStatusControl1.IOName = null;
this.ioStatusControl1.IOValue = 0;
this.ioStatusControl1.isCanClick = false;
this.ioStatusControl1.Location = new System.Drawing.Point(122, 483);
this.ioStatusControl1.Name = "ioStatusControl1";
this.ioStatusControl1.Size = new System.Drawing.Size(171, 39);
this.ioStatusControl1.TabIndex = 279;
//
// btnOpenFolder
//
this.btnOpenFolder.Location = new System.Drawing.Point(285, 180);
this.btnOpenFolder.Name = "btnOpenFolder";
this.btnOpenFolder.Size = new System.Drawing.Size(132, 36);
this.btnOpenFolder.TabIndex = 280;
this.btnOpenFolder.Text = "打开文件夹";
this.btnOpenFolder.UseVisualStyleBackColor = true;
this.btnOpenFolder.Click += new System.EventHandler(this.btnOpenFolder_Click);
//
// btnExit
//
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.Location = new System.Drawing.Point(824, 604);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(132, 36);
this.btnExit.TabIndex = 281;
this.btnExit.Text = "退出";
this.btnExit.UseVisualStyleBackColor = true;
this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
//
// FrmPositionTool
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/ACSingleStore/positionTool/FrmPositionTool.cs
......@@ -57,8 +57,8 @@ namespace OnlineStore.AutoInOutStore
if (IOManager.instance == null)
{
IOManager.Init();
IOManager.instance.ConnectionIOList(new List<string> { IoIp });
}
IOManager.instance.ConnectionIOList(new List<string> { IoIp });
timer1.Start();
}
private void btnServoOn_Click(object sender, EventArgs e)
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -108,9 +108,7 @@
<Name>LoadCSVLibrary</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="DeviceLibrary\ShuoKe\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="StoreConfig\AC\linePositions.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
......@@ -178,3 +178,6 @@ PRO,()ѹԭٶ,CompAxis_HomeAddSpeed,200,,,,,,,
PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,100,,,,,,,
PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,100,,,,,,,
PRO,(轴四)压紧轴P3速度,CompAxis_P3_Speed,100,,,,,,,
,,,,,,,,, ,
PRO,特殊二维码尺寸配置,CodeSizeConfig,XA=13x48#XB=13x32#FA=7x32,,,,,,,
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
......@@ -396,9 +396,18 @@ namespace OnlineStore.DeviceLibrary
{
foreach (string code in LastCodeList)
{
if (!code.Equals(""))
{
msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + code + spiltStr;
string codeSize = StoreManager.Config.GetCodeSize(code.Trim());
if (String.IsNullOrEmpty(codeSize))
{
msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + code + spiltStr;
}
else
{
msg = msg + "=1+0x0-" + codeSize + "=" + code + spiltStr;
}
}
}
}
......
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
......@@ -692,7 +692,53 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[ConfigProAttribute("CompAxis_P3_Speed")]
public int CompAxis_P3_Speed { get; set; }
/// <summary>
/// PRO,特殊二维码尺寸配置,CodeSizeConfig,XA=13x48#XB=13x32#FA=7x32,,,,,,,
/// </summary>
[ConfigProAttribute("CodeSizeConfig", false)]
public string CodeSizeConfig { get; set; }
private Dictionary<string, string> CodeSizeMap = null;
private static char codeSpilt = '#';
public string GetCodeSize(string code)
{
try
{
if (CodeSizeMap == null)
{
CodeSizeMap = new Dictionary<string, string>();
string[] array = CodeSizeConfig.Split(codeSpilt);
if (array.Length > 0)
{
foreach (string str in array)
{
string[] codeStr = str.Split('=');
if (codeStr.Length == 2)
{
string key = codeStr[0].Trim();
string value = codeStr[1].Trim();
CodeSizeMap.Add(key, value);
}
}
}
}
foreach (string key in CodeSizeMap.Keys)
{
if (code.Trim().StartsWith(key))
{
return CodeSizeMap[key];
}
}
}
catch (Exception ex)
{
LOGGER.Error("获取二维码【" + code + "】的固定尺寸出错：" + ex.ToString());
}
return "";
}
private Dictionary<string, ushort> DILengthMap = null;
private Dictionary<string, ushort> DOLengthMap = null;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!