Skip to content

孙克 / RC30-AutoInOutStore

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

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

1 个父辈 95a351e2
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 197 行增加 和 12 行删除
source/ACSingleStore/FrmStoreBox.cs
...@@ -106,7 +106,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -106,7 +106,7 @@ namespace OnlineStore.AutoInOutStore
private string AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库："); private string AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
private string AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库："); private string AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
public static string cannotMove = ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴"); 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() public void processMenu()
{ {
...@@ -121,12 +121,12 @@ namespace OnlineStore.AutoInOutStore ...@@ -121,12 +121,12 @@ namespace OnlineStore.AutoInOutStore
StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,StartAuto); StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,StartAuto);
StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, StopAuto); StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, StopAuto);
AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库："); AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库："); AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
//摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China); //摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
//toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China); //toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
ToolStripItemCollection collection = menuStrip1.Items; ToolStripItemCollection collection = menuStrip1.Items;
for (int i = 0; i < collection.Count; i++) for (int i = 0; i < collection.Count; i++)
{ {
......
source/ACSingleStore/Properties/Resource.en-US.resx
...@@ -1258,4 +1258,69 @@ ...@@ -1258,4 +1258,69 @@
<data name="Y22" xml:space="preserve"> <data name="Y22" xml:space="preserve">
<value>Loosen the clamping cylinder SOL</value> <value>Loosen the clamping cylinder SOL</value>
</data> </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> </root>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/Properties/Resource.zh-CN.resx
...@@ -1257,4 +1257,67 @@ ...@@ -1257,4 +1257,67 @@
<data name="Y22" xml:space="preserve"> <data name="Y22" xml:space="preserve">
<value>夹爪气缸放松SOL</value> <value>夹爪气缸放松SOL</value>
</data> </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> </root>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/ResourceCulture.cs
...@@ -52,9 +52,10 @@ namespace OnlineStore.AutoInOutStore ...@@ -52,9 +52,10 @@ namespace OnlineStore.AutoInOutStore
private static Assembly assembly = Assembly.GetExecutingAssembly(); private static Assembly assembly = Assembly.GetExecutingAssembly();
public static string GetString(string id) 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 = ""; string strCurLanguage = "";
......
source/ACSingleStore/positionTool/FrmPositionTool.cs
...@@ -57,8 +57,8 @@ namespace OnlineStore.AutoInOutStore ...@@ -57,8 +57,8 @@ namespace OnlineStore.AutoInOutStore
if (IOManager.instance == null) if (IOManager.instance == null)
{ {
IOManager.Init(); IOManager.Init();
IOManager.instance.ConnectionIOList(new List<string> { IoIp });
} }
IOManager.instance.ConnectionIOList(new List<string> { IoIp });
timer1.Start(); timer1.Start();
} }
private void btnServoOn_Click(object sender, EventArgs e) private void btnServoOn_Click(object sender, EventArgs e)
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -108,9 +108,7 @@ ...@@ -108,9 +108,7 @@
<Name>LoadCSVLibrary</Name> <Name>LoadCSVLibrary</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup />
<Folder Include="DeviceLibrary\ShuoKe\" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="StoreConfig\AC\linePositions.csv"> <None Include="StoreConfig\AC\linePositions.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -178,3 +178,6 @@ PRO,()ѹԭٶ,CompAxis_HomeAddSpeed,200,,,,,,, ...@@ -178,3 +178,6 @@ PRO,()ѹԭٶ,CompAxis_HomeAddSpeed,200,,,,,,,
PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,100,,,,,,, PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,100,,,,,,,
PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,100,,,,,,, PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,100,,,,,,,
PRO,(轴四)压紧轴P3速度,CompAxis_P3_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 ...@@ -396,9 +396,18 @@ namespace OnlineStore.DeviceLibrary
{ {
foreach (string code in LastCodeList) foreach (string code in LastCodeList)
{ {
if (!code.Equals("")) 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 ...@@ -692,7 +692,53 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("CompAxis_P3_Speed")] [ConfigProAttribute("CompAxis_P3_Speed")]
public int CompAxis_P3_Speed { get; set; } 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> DILengthMap = null;
private Dictionary<string, ushort> DOLengthMap = null; private Dictionary<string, ushort> DOLengthMap = null;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!