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

增加Devlog里面增加EventTrackerDesc

Browse Source
Eight
lhiven 3 months ago
parent fc6c05db59
commit 43117112b9
5 changed files with 2439 additions and 2458 deletions
Show Stats Download Patch File Download Diff File

6
Rs.DeweyTester/Entitys/AlarmEntity.cs
Unescape Escape View File

@ -64,7 +64,8 @@ namespace Rs.MotionPlat.Entitys
entity.EN = cell.StringCellValue;
cell = row.GetCell(4);
if (cell != null)
entity.KO = cell.StringCellValue;
entity.EventTrackerDesc = cell.StringCellValue;
if (!alarmDic.ContainsKey(entity.AlarmID))
{
alarmDic.Add(entity.AlarmID, entity);
@ -149,12 +150,15 @@ namespace Rs.MotionPlat.Entitys
/// </summary>
public string KO { get; set; }
public string EventTrackerDesc { get; set; }
public AlarmEntity Transform(params object[] args)
{
AlarmEntity entity = new AlarmEntity();
entity.AlarmID = AlarmID;
entity.CN = string.Format(CN, args);
entity.EN = string.Format(EN, args);
entity.EventTrackerDesc=string.Format(EventTrackerDesc,args);
//entity.KO = string.Format(KO, args);
return entity;
}

14
Rs.DeweyTester/Program.cs
Unescape Escape View File

@ -29,20 +29,6 @@ namespace Rs.MotionPlat
[STAThread]
static void Main()
{
int usage = 0;
for (int i = 1; i <= 6; i++)
{
if (i==2 || i==3 ||i==5 || i==6)
{
usage |= 1 << (i - 1);
}
}
string ss = string.Join ("", Convert.ToString(usage, 2).Reverse());
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
//Application.Run(new FormIO2());

194
Rs.DeweyTester/SysConfig/FixtureConfig.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

4668
Rs.DeweyTester/SysConfig/FixtureConfig.resx
View File

File diff suppressed because it is too large Load Diff

15
Rs.DeweyTester/SysConfig/NozzleConfig.resx
Unescape Escape View File

@ -2563,16 +2563,16 @@
<value>NoControl</value>
</data>
<data name="label10.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 201</value>
<value>3, 201</value>
</data>
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 12</value>
<value>95, 12</value>
</data>
<data name="label10.TabIndex" type="System.Int32, mscorlib">
<value>43</value>
</data>
<data name="label10.Text" xml:space="preserve">
<value>治具侧安全位X:</value>
<value>到治具6避让位X:</value>
</data>
<data name="&gt;&gt;label10.Name" xml:space="preserve">
<value>label10</value>
@ -2959,7 +2959,7 @@
<value>panelEx2</value>
</data>
<data name="&gt;&gt;panelEx2.Type" xml:space="preserve">
<value>Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null</value>
<value>Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;panelEx2.Parent" xml:space="preserve">
<value>$this</value>
@ -5164,7 +5164,7 @@
<value>panelEx1</value>
</data>
<data name="&gt;&gt;panelEx1.Type" xml:space="preserve">
<value>Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null</value>
<value>Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;panelEx1.Parent" xml:space="preserve">
<value>$this</value>
@ -5181,9 +5181,6 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1620, 849</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>NozzleConfig</value>
</data>
@ -5419,6 +5416,6 @@
<value>NozzleConfig</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.24, Culture=neutral, PublicKeyToken=null</value>
<value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.25.9, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
Write Preview
Loading…
Cancel
Save