lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化英文界面显示错误的问题

Browse Source
develop
lhiven 6 months ago
parent 8738dc318e
commit 954bc863d4
6 changed files with 812 additions and 758 deletions
Show Stats Download Patch File Download Diff File

27
Rs.SkyLine/Home.cs
Unescape Escape View File

@ -863,6 +863,7 @@ namespace Rs.MotionPlat
}
foreach (var dir in dirs)
{
RemoveReadOnlyAttribute(dir);
DirectoryInfo di = new DirectoryInfo(dir);
DateTime dtCreate = di.CreationTime;
if ((DateTime.Now - dtCreate).Days > GlobalVar.ImageSaveDays)
@ -878,6 +879,7 @@ namespace Rs.MotionPlat
dirs = Directory.GetDirectories(dirpath);
foreach (var dir in dirs)
{
RemoveReadOnlyAttribute(dir);
DirectoryInfo di = new DirectoryInfo(dir);
DateTime dtCreate = di.CreationTime;
if ((DateTime.Now - dtCreate).Days > GlobalVar.ImageSaveDays)
@ -896,6 +898,7 @@ namespace Rs.MotionPlat
CopyDirectory(workDir, bakDir);
string toDir = Path.Combine(Directory.GetParent(bakDir).FullName, zipFileName + ".zip");
ZipHelper.ZipDirectory(bakDir, toDir);
RemoveReadOnlyAttribute(bakDir);
Directory.Delete(bakDir, true);
}
}
@ -906,6 +909,30 @@ namespace Rs.MotionPlat
}
}
void RemoveReadOnlyAttribute(string dirPath)
{
DirectoryInfo di = new DirectoryInfo(dirPath);
di.Attributes = FileAttributes.Normal & FileAttributes.Directory;
//查找所有的文件
string[] files = Directory.GetFiles(dirPath);
if (files != null && files.Length > 0)
{
foreach (string f in files)
{
File.SetAttributes(f, System.IO.FileAttributes.Normal);
}
}
//查找所有的文件夹
string[] dirs = Directory.GetDirectories(dirPath);
if (dirs != null && dirs.Length > 0)
{
foreach (string d in dirs)
{
RemoveReadOnlyAttribute(d);
}
}
}
public static void CopyDirectory(string sourceDir, string targetDir)
{
DirectoryInfo dir = new DirectoryInfo(sourceDir);

2
Rs.SkyLine/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
[assembly: AssemblyVersion("3.20.24.56")]
[assembly: AssemblyVersion("3.20.24.57")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]

90
Rs.SkyLine/SysConfig/NozzleConfig.en-US.resx
Unescape Escape View File

@ -121,6 +121,27 @@
<data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
<value>1047, 0</value>
</data>
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
<value>440, 0</value>
</data>
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
<value>607, 849</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>440, 849</value>
</data>
<data name="panelEx2.Location" type="System.Drawing.Point, System.Drawing">
<value>545, 0</value>
</data>
<data name="panelEx2.Size" type="System.Drawing.Size, System.Drawing">
<value>1250, 849</value>
</data>
<data name="groupBox13.Size" type="System.Drawing.Size, System.Drawing">
<value>602, 849</value>
</data>
<data name="groupBox13.Text" xml:space="preserve">
<value>Picker IO</value>
</data>
<data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 598</value>
</data>
@ -130,6 +151,15 @@
<data name="groupBox3.Text" xml:space="preserve">
<value>Picker using option</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>596, 229</value>
</data>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>590, 109</value>
</data>
<data name="groupBox8.Text" xml:space="preserve">
<value>Shuttle</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>315, 59</value>
</data>
@ -190,11 +220,11 @@
<data name="label48.Location" type="System.Drawing.Point, System.Drawing">
<value>529, 32</value>
</data>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>590, 109</value>
<data name="groupBox7.Size" type="System.Drawing.Size, System.Drawing">
<value>590, 100</value>
</data>
<data name="groupBox8.Text" xml:space="preserve">
<value>T-Tray</value>
<data name="groupBox7.Text" xml:space="preserve">
<value>Tray</value>
</data>
<data name="label23.Location" type="System.Drawing.Point, System.Drawing">
<value>305, 54</value>
@ -256,15 +286,6 @@
<data name="label24.Location" type="System.Drawing.Point, System.Drawing">
<value>522, 25</value>
</data>
<data name="groupBox7.Size" type="System.Drawing.Size, System.Drawing">
<value>590, 100</value>
</data>
<data name="groupBox7.Text" xml:space="preserve">
<value>Stock</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>596, 229</value>
</data>
<data name="groupBox14.Size" type="System.Drawing.Size, System.Drawing">
<value>596, 128</value>
</data>
@ -280,17 +301,11 @@
<data name="groupBox16.Size" type="System.Drawing.Size, System.Drawing">
<value>596, 87</value>
</data>
<data name="groupBox13.Size" type="System.Drawing.Size, System.Drawing">
<value>602, 849</value>
</data>
<data name="groupBox13.Text" xml:space="preserve">
<value>Picker IO</value>
</data>
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
<value>440, 0</value>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>435, 480</value>
</data>
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
<value>607, 849</value>
<data name="groupBox6.Text" xml:space="preserve">
<value>Picker R position</value>
</data>
<data name="btnLookR8.Location" type="System.Drawing.Point, System.Drawing">
<value>373, 274</value>
@ -436,11 +451,11 @@
<data name="btnTeachNozzleR1StartPos.Text" xml:space="preserve">
<value>Teach</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>435, 480</value>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>435, 369</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Picker R position</value>
<data name="groupBox4.Text" xml:space="preserve">
<value>Picker X,Y position</value>
</data>
<data name="btnMoveDischargeSafePostionY.Location" type="System.Drawing.Point, System.Drawing">
<value>279, 139</value>
@ -532,21 +547,6 @@
<data name="btnTeachLoadXStartPos.Text" xml:space="preserve">
<value>Teach</value>
</data>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>435, 369</value>
</data>
<data name="groupBox4.Text" xml:space="preserve">
<value>Picker X,Y position</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>440, 849</value>
</data>
<data name="panelEx2.Location" type="System.Drawing.Point, System.Drawing">
<value>545, 0</value>
</data>
<data name="panelEx2.Size" type="System.Drawing.Size, System.Drawing">
<value>1250, 849</value>
</data>
<data name="btnTeachTurnoverNozzle7TakeHeight.Location" type="System.Drawing.Point, System.Drawing">
<value>132, 204</value>
</data>
@ -767,6 +767,9 @@
<data name="groupBox2.Text" xml:space="preserve">
<value>Shuttle Place Z position</value>
</data>
<data name="panelEx1.Size" type="System.Drawing.Size, System.Drawing">
<value>545, 849</value>
</data>
<data name="btnTeachTrayNozzle7TakeHeight.Location" type="System.Drawing.Point, System.Drawing">
<value>132, 205</value>
</data>
@ -980,7 +983,4 @@
<data name="groupBox5.Text" xml:space="preserve">
<value>Tray pick up Z position</value>
</data>
<data name="panelEx1.Size" type="System.Drawing.Size, System.Drawing">
<value>545, 849</value>
</data>
</root>

1276
Rs.SkyLine/SysConfig/NozzleConfig.resx
View File

File diff suppressed because it is too large Load Diff

173
Rs.SkyLine/SysConfig/TurnoverConfig.en-US.resx
Unescape Escape View File

@ -295,12 +295,6 @@
<data name="label30.Text" xml:space="preserve">
<value>X Safety position:</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>525, 851</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>Socket area setting</value>
</data>
<data name="groupBox9.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 572</value>
</data>
@ -310,15 +304,6 @@
<data name="groupBox9.Text" xml:space="preserve">
<value>Socket exception</value>
</data>
<data name="groupBox12.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 419</value>
</data>
<data name="groupBox12.Size" type="System.Drawing.Size, System.Drawing">
<value>519, 153</value>
</data>
<data name="groupBox12.Text" xml:space="preserve">
<value>Alarm option</value>
</data>
<data name="cboxFiberWarningToPressInSocket.Location" type="System.Drawing.Point, System.Drawing">
<value>36, 103</value>
</data>
@ -352,20 +337,14 @@
<data name="label42.Text" xml:space="preserve">
<value>Retry times:</value>
</data>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>519, 285</value>
</data>
<data name="groupBox8.Text" xml:space="preserve">
<value>Pick and place</value>
</data>
<data name="groupBox23.Location" type="System.Drawing.Point, System.Drawing">
<value>277, 152</value>
<data name="groupBox12.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 419</value>
</data>
<data name="groupBox23.Size" type="System.Drawing.Size, System.Drawing">
<value>236, 122</value>
<data name="groupBox12.Size" type="System.Drawing.Size, System.Drawing">
<value>519, 153</value>
</data>
<data name="groupBox23.Text" xml:space="preserve">
<value>Place</value>
<data name="groupBox12.Text" xml:space="preserve">
<value>Alarm option</value>
</data>
<data name="lblSocketTrayDumpOneSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>200, 75</value>
@ -400,14 +379,14 @@
<data name="label46.Text" xml:space="preserve">
<value> offset height:</value>
</data>
<data name="groupBox22.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 152</value>
<data name="groupBox23.Location" type="System.Drawing.Point, System.Drawing">
<value>277, 152</value>
</data>
<data name="groupBox22.Size" type="System.Drawing.Size, System.Drawing">
<data name="groupBox23.Size" type="System.Drawing.Size, System.Drawing">
<value>236, 122</value>
</data>
<data name="groupBox22.Text" xml:space="preserve">
<value>Pick up</value>
<data name="groupBox23.Text" xml:space="preserve">
<value>Place</value>
</data>
<data name="cboxSocketTrayTakeEnableTwoSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 20</value>
@ -445,6 +424,15 @@
<data name="label53.Text" xml:space="preserve">
<value>First-order vel:</value>
</data>
<data name="groupBox22.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 152</value>
</data>
<data name="groupBox22.Size" type="System.Drawing.Size, System.Drawing">
<value>236, 122</value>
</data>
<data name="groupBox22.Text" xml:space="preserve">
<value>Pick up</value>
</data>
<data name="btnMovePressDumpZ.Text" xml:space="preserve">
<value>Move here</value>
</data>
@ -493,14 +481,17 @@
<data name="label8.Text" xml:space="preserve">
<value>Pick up Z:</value>
</data>
<data name="groupBox5.Text" xml:space="preserve">
<value>Shuttle area setting</value>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>519, 285</value>
</data>
<data name="groupBox21.Size" type="System.Drawing.Size, System.Drawing">
<value>415, 145</value>
<data name="groupBox8.Text" xml:space="preserve">
<value>Pick and place</value>
</data>
<data name="groupBox21.Text" xml:space="preserve">
<value>Parameter set</value>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>525, 851</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>Socket area position</value>
</data>
<data name="txtTurnoverTrayKnockFrequency.Location" type="System.Drawing.Point, System.Drawing">
<value>163, 68</value>
@ -538,8 +529,11 @@
<data name="label55.Location" type="System.Drawing.Point, System.Drawing">
<value>260, 70</value>
</data>
<data name="groupBox11.Text" xml:space="preserve">
<value>Alarm processing</value>
<data name="groupBox21.Size" type="System.Drawing.Size, System.Drawing">
<value>412, 145</value>
</data>
<data name="groupBox21.Text" xml:space="preserve">
<value>Parameter set</value>
</data>
<data name="cboxPreTakeTurnoverTrayProductCheckVac.Size" type="System.Drawing.Size, System.Drawing">
<value>126, 16</value>
@ -556,8 +550,11 @@
<data name="label43.Text" xml:space="preserve">
<value>Retry times:</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Place position</value>
<data name="groupBox11.Size" type="System.Drawing.Size, System.Drawing">
<value>412, 191</value>
</data>
<data name="groupBox11.Text" xml:space="preserve">
<value>Alarm processing</value>
</data>
<data name="cboxTurnoverTrayDumpEnableTwoSpeed.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 16</value>
@ -568,6 +565,9 @@
<data name="tbarTurnoverTrayDumpOneSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>134, 158</value>
</data>
<data name="tbarTurnoverTrayDumpOneSpeed.Size" type="System.Drawing.Size, System.Drawing">
<value>237, 20</value>
</data>
<data name="txtTurnoverTrayDumpOneSpeedOffsetHeight.Location" type="System.Drawing.Point, System.Drawing">
<value>309, 134</value>
</data>
@ -604,8 +604,11 @@
<data name="btnMoveTurnoverDumpY.Text" xml:space="preserve">
<value>Move here</value>
</data>
<data name="groupBox1.Text" xml:space="preserve">
<value>Shuttle area setting</value>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>412, 198</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Place position</value>
</data>
<data name="cboxTurnoverTrayTakeEnableTwoSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>83, 112</value>
@ -619,6 +622,9 @@
<data name="tbarTurnoverTrayTakeOneSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>123, 148</value>
</data>
<data name="tbarTurnoverTrayTakeOneSpeed.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 20</value>
</data>
<data name="label48.Size" type="System.Drawing.Size, System.Drawing">
<value>101, 12</value>
</data>
@ -655,14 +661,17 @@
<data name="btnTeachTurnoverTakeZ.Text" xml:space="preserve">
<value>Teach</value>
</data>
<data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
<value>969, 0</value>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>412, 189</value>
</data>
<data name="groupBox17.Text" xml:space="preserve">
<value>Shuttle IO</value>
<data name="groupBox1.Text" xml:space="preserve">
<value>Pick up position</value>
</data>
<data name="groupBox7.Size" type="System.Drawing.Size, System.Drawing">
<value>406, 124</value>
<data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>418, 851</value>
</data>
<data name="groupBox5.Text" xml:space="preserve">
<value>Shuttle area position</value>
</data>
<data name="txtTurnoverTrayCloseVacBreakDelaytime.Location" type="System.Drawing.Point, System.Drawing">
<value>303, 92</value>
@ -724,26 +733,20 @@
<data name="txtTurnoverTrayOpenVacSuctionDelaytime.Location" type="System.Drawing.Point, System.Drawing">
<value>111, 50</value>
</data>
<data name="groupBox7.Size" type="System.Drawing.Size, System.Drawing">
<value>406, 124</value>
</data>
<data name="groupBox18.Text" xml:space="preserve">
<value>Blow</value>
</data>
<data name="groupBox19.Text" xml:space="preserve">
<value>Vacuum</value>
</data>
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
<value>540, 0</value>
</data>
<data name="groupBox13.Text" xml:space="preserve">
<value>Turnover IO</value>
</data>
<data name="groupBox24.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 760</value>
</data>
<data name="groupBox24.Size" type="System.Drawing.Size, System.Drawing">
<value>408, 79</value>
<data name="groupBox17.Text" xml:space="preserve">
<value>Shuttle IO</value>
</data>
<data name="groupBox24.Text" xml:space="preserve">
<value>Adhere open vacuum delay</value>
<data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
<value>969, 0</value>
</data>
<data name="txtTurnoverNozzleAdhereOpenVacDelay.Location" type="System.Drawing.Point, System.Drawing">
<value>65, 47</value>
@ -757,14 +760,14 @@
<data name="label7.Text" xml:space="preserve">
<value>Vacuum time:</value>
</data>
<data name="groupBox10.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 612</value>
<data name="groupBox24.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 760</value>
</data>
<data name="groupBox10.Size" type="System.Drawing.Size, System.Drawing">
<value>408, 148</value>
<data name="groupBox24.Size" type="System.Drawing.Size, System.Drawing">
<value>408, 79</value>
</data>
<data name="groupBox10.Text" xml:space="preserve">
<value>Socket pnp time</value>
<data name="groupBox24.Text" xml:space="preserve">
<value>Adhere open vacuum delay</value>
</data>
<data name="txtTurnoverNozzleCloseVacBreakDelaytimeInSocket.Location" type="System.Drawing.Point, System.Drawing">
<value>303, 112</value>
@ -837,11 +840,14 @@
<data name="label41.Text" xml:space="preserve">
<value>Vacuum time:</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>408, 142</value>
<data name="groupBox10.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 612</value>
</data>
<data name="groupBox3.Text" xml:space="preserve">
<value>Shuttle pnp time</value>
<data name="groupBox10.Size" type="System.Drawing.Size, System.Drawing">
<value>408, 148</value>
</data>
<data name="groupBox10.Text" xml:space="preserve">
<value>Socket pnp time</value>
</data>
<data name="txtTurnoverNozzleCloseVacBreakDelaytimeInTurnoverTray.Location" type="System.Drawing.Point, System.Drawing">
<value>303, 113</value>
@ -903,13 +909,34 @@
<data name="label24.Text" xml:space="preserve">
<value>Vacuum time:</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>408, 142</value>
</data>
<data name="groupBox3.Text" xml:space="preserve">
<value>Shuttle pnp time</value>
</data>
<data name="groupBox14.Text" xml:space="preserve">
<value>Blow</value>
</data>
<data name="groupBox15.Text" xml:space="preserve">
<value>Vacuum</value>
</data>
<data name="groupBox13.Text" xml:space="preserve">
<value>Turnover IO</value>
</data>
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
<value>540, 0</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>540, 851</value>
</data>
<data name="panelEx2.Location" type="System.Drawing.Point, System.Drawing">
<value>418, 0</value>
</data>
<data name="panelEx2.Size" type="System.Drawing.Size, System.Drawing">
<value>1443, 851</value>
</data>
<data name="panelEx1.Size" type="System.Drawing.Size, System.Drawing">
<value>418, 851</value>
</data>
</root>

2
Rs.SkyLine/SysConfig/TurnoverConfig.resx
Unescape Escape View File

@ -6448,7 +6448,7 @@
<value>button112</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=3.20.24.51, Culture=neutral, PublicKeyToken=null</value>
<value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=3.20.24.56, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;button46.ZOrder" xml:space="preserve">
<value>11</value>

Write Preview
Loading…
Cancel
Save