Skip to content

李娜 / Line-Smart-Workstation

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

中英文完善

1 个父辈 aac3d48b
全部展开
内嵌 并排
正在显示 12 个修改的文件 包含 61 行增加 和 22 行删除
DeviceLibrary/manager/work/TSAVStatus.cs
...@@ -87,24 +87,24 @@ namespace TSA_V.DeviceLibrary ...@@ -87,24 +87,24 @@ namespace TSA_V.DeviceLibrary
{ {
if (WaitType.Equals(WaitTypeEnum.NodeMove_1)) if (WaitType.Equals(WaitTypeEnum.NodeMove_1))
{ {
return "[" + Node.NodeName + "]目标位置[" + TargetPosition + "]"; return "[" + Node.NodeName + "]"+ResourceControl.GetString("arrive","到达目标位置")+"[" + TargetPosition + "]";
} }
else if (WaitType.Equals(WaitTypeEnum.NodeHome_2)) else if (WaitType.Equals(WaitTypeEnum.NodeHome_2))
{ {
return "[" + Node.NodeName + "]原点返回"; return "[" + Node.NodeName + "]"+ ResourceControl.GetString("homeMove", "原点返回");
} }
else if (WaitType.Equals(WaitTypeEnum.IOSingle_6)) else if (WaitType.Equals(WaitTypeEnum.IOSingle_6))
{ {
ConfigIO io = IOManager.getWaitIO(IoType); ConfigIO io = IOManager.getWaitIO(IoType);
return "IO等待[" + io.DisplayStr + "]=[" + IoValue + "]"; return "IO[" + io.DisplayStr + "]=[" + IoValue + "]";
} }
else if (WaitType.Equals(WaitTypeEnum.Time_3)) else if (WaitType.Equals(WaitTypeEnum.Time_3))
{ {
return "时间[" + TimeMSeconds + "]毫秒"; return "[" + TimeMSeconds + "]ms";
} }
else if (WaitType.Equals(WaitTypeEnum.XYMoveEnd_5)) else if (WaitType.Equals(WaitTypeEnum.XYMoveEnd_5))
{ {
return "XY轴目标 [" + AxisValue + "] "; return ResourceControl.GetString("xyAxisArrive", "XY轴目标") +" [" + AxisValue + "] ";
//return "XY轴目标[" + MoveAxis.PortName + "][" + AxisValue + "] "; //return "XY轴目标[" + MoveAxis.PortName + "][" + AxisValue + "] ";
} }
else if (WaitType.Equals(WaitTypeEnum.Temp_4)) else if (WaitType.Equals(WaitTypeEnum.Temp_4))
...@@ -113,11 +113,11 @@ namespace TSA_V.DeviceLibrary ...@@ -113,11 +113,11 @@ namespace TSA_V.DeviceLibrary
} }
else if (WaitType.Equals(WaitTypeEnum.WaitCode_7)) else if (WaitType.Equals(WaitTypeEnum.WaitCode_7))
{ {
return "输入条码 "; return ResourceControl.GetString("getBarcode", "输入条码")+" ";
} }
else else
{ {
return "Wait位置类型：WaitType=【" + WaitType + "】"; return "WaitType=【" + WaitType + "】";
} }
} }
public bool IsEnd { get; set; } public bool IsEnd { get; set; }
......
TSA-V/Properties/Resource.en-US.resx
...@@ -2725,4 +2725,16 @@ ...@@ -2725,4 +2725,16 @@
<data name="没有找到记录" xml:space="preserve"> <data name="没有找到记录" xml:space="preserve">
<value>No records found</value> <value>No records found</value>
</data> </data>
<data name="arrive" xml:space="preserve">
<value>Reach target position</value>
</data>
<data name="getBarcode" xml:space="preserve">
<value>Enter barcode</value>
</data>
<data name="homeMove" xml:space="preserve">
<value>Return to origin</value>
</data>
<data name="xyAxisArrive" xml:space="preserve">
<value>XYaxial target</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
...@@ -2702,4 +2702,17 @@ ...@@ -2702,4 +2702,17 @@
<data name = "handCount" xml:space = "preserve"> <value> 次数 </value> </data> <data name = "handCount" xml:space = "preserve"> <value> 次数 </value> </data>
<data name = "handTime" xml:space = "preserve"> <value> 总时长 </value> </data> <data name = "handTime" xml:space = "preserve"> <value> 总时长 </value> </data>
<data name = "FrmWork_linkLabel1_Text" xml:space = "preserve"> <value> reduction </value> </data> <data name = "FrmWork_linkLabel1_Text" xml:space = "preserve"> <value> reduction </value> </data>
<data name="arrive" xml:space="preserve">
<value>到达目标位置</value>
</data>
<data name="getBarcode" xml:space="preserve">
<value>输入条码</value>
</data>
<data name="homeMove" xml:space="preserve">
<value>原点返回</value>
</data>
<data name="xyAxisArrive" xml:space="preserve">
<value>XY轴目标</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2874,5 +2874,19 @@ ...@@ -2874,5 +2874,19 @@
<data name="没有找到记录" xml:space="preserve"> <data name="没有找到记录" xml:space="preserve">
<value>没有找到记录</value> <value>没有找到记录</value>
</data> </data>
<data name = "FrmWork_linkLabel1_Text" xml:space = "preserve"> <value> 显示原图 </value> </data> <data name="FrmWork_linkLabel1_Text" xml:space="preserve">
<value> 显示原图 </value>
</data>
<data name="arrive" xml:space="preserve">
<value>到达目标位置</value>
</data>
<data name="getBarcode" xml:space="preserve">
<value>输入条码</value>
</data>
<data name="homeMove" xml:space="preserve">
<value>原点返回</value>
</data>
<data name="xyAxisArrive" xml:space="preserve">
<value>XY轴目标</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Smart-Workstation.csproj
...@@ -309,18 +309,18 @@ ...@@ -309,18 +309,18 @@
<Compile Include="projector\FrmScreenTest.Designer.cs"> <Compile Include="projector\FrmScreenTest.Designer.cs">
<DependentUpon>FrmScreenTest.cs</DependentUpon> <DependentUpon>FrmScreenTest.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="workForm\FrmAOICheckN.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="workForm\FrmAOICheckN.Designer.cs">
<DependentUpon>FrmAOICheckN.cs</DependentUpon>
</Compile>
<Compile Include="workForm\FrmAOICheck.cs"> <Compile Include="workForm\FrmAOICheck.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="workForm\FrmAOICheck.Designer.cs"> <Compile Include="workForm\FrmAOICheck.Designer.cs">
<DependentUpon>FrmAOICheck.cs</DependentUpon> <DependentUpon>FrmAOICheck.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="workForm\FrmAOICheckO.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="workForm\FrmAOICheckO.Designer.cs">
<DependentUpon>FrmAOICheckO.cs</DependentUpon>
</Compile>
<Compile Include="cameraPlay\CameraPlay.cs"> <Compile Include="cameraPlay\CameraPlay.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
...@@ -499,12 +499,12 @@ ...@@ -499,12 +499,12 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="workForm\FrmAOICheckN.resx">
<DependentUpon>FrmAOICheckN.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="workForm\FrmAOICheck.resx"> <EmbeddedResource Include="workForm\FrmAOICheck.resx">
<DependentUpon>FrmAOICheck.cs</DependentUpon> <DependentUpon>FrmAOICheck.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="workForm\FrmAOICheckO.resx">
<DependentUpon>FrmAOICheckO.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="cameraPlay\CameraPlay.resx"> <EmbeddedResource Include="cameraPlay\CameraPlay.resx">
<DependentUpon>CameraPlay.cs</DependentUpon> <DependentUpon>CameraPlay.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
TSA-V/workForm/FrmAOICheck.resx
...@@ -123,6 +123,9 @@ ...@@ -123,6 +123,9 @@
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>109, 17</value> <value>109, 17</value>
</metadata> </metadata>
<metadata name="timerChangeImg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>273, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>103</value> <value>103</value>
</metadata> </metadata>
......
TSA-V/workForm/FrmAOICheckN.resx → TSA-V/workForm/FrmAOICheckO.resx
...@@ -123,9 +123,6 @@ ...@@ -123,9 +123,6 @@
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>109, 17</value> <value>109, 17</value>
</metadata> </metadata>
<metadata name="timerChangeImg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>273, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>103</value> <value>103</value>
</metadata> </metadata>
......
TSA-V/workForm/FrmTSAV.cs
...@@ -369,7 +369,7 @@ namespace TSA_V ...@@ -369,7 +369,7 @@ namespace TSA_V
FrmProjectorScreen.instance.ClearPoint(); FrmProjectorScreen.instance.ClearPoint();
//IOManager.IOMove(IOManager.Camera_Led, IO_VALUE.HIGH); //IOManager.IOMove(IOManager.Camera_Led, IO_VALUE.HIGH);
//FrmAOICheck frm = new FrmAOICheck(CurrProject); //FrmAOICheck frm = new FrmAOICheck(CurrProject);
FrmAOICheckN frm = new FrmAOICheckN(CurrProject); FrmAOICheck frm = new FrmAOICheck(CurrProject);
frm.ShowDialog(); frm.ShowDialog();
IOManager.IOMove(IOManager.Device_Led, IO_VALUE.HIGH ); IOManager.IOMove(IOManager.Device_Led, IO_VALUE.HIGH );
...@@ -961,7 +961,7 @@ namespace TSA_V ...@@ -961,7 +961,7 @@ namespace TSA_V
FrmProjectorScreen.instance.ClearPoint(); FrmProjectorScreen.instance.ClearPoint();
// IOManager.IOMove(IOManager.Camera_Led, IO_VALUE.HIGH); // IOManager.IOMove(IOManager.Camera_Led, IO_VALUE.HIGH);
//FrmAOICheck frm = new FrmAOICheck(CurrProject); //FrmAOICheck frm = new FrmAOICheck(CurrProject);
FrmAOICheckN frm = new FrmAOICheckN(CurrProject); FrmAOICheck frm = new FrmAOICheck(CurrProject);
frm.defFile = "G:\\组装工作站 AOI\\img\\img\\8.bmp"; frm.defFile = "G:\\组装工作站 AOI\\img\\img\\8.bmp";
frm.ShowDialog(); frm.ShowDialog();
PTipSoundProcess.AOIopen = false; PTipSoundProcess.AOIopen = false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!