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

1、优化IO界面只有管理员或者Vender用户登录，才可以操作。

Browse Source 
2、IO名称增加显示英文名称的功能。
develop
lhiven 1 month ago
parent 591d2c7d4e
commit 1a2fdec3e2
8 changed files with 148 additions and 168 deletions
Show Stats Download Patch File Download Diff File

14
Rs.SkyLine/Commom/GlobalVar.cs
Unescape Escape View File

@ -15,6 +15,7 @@ namespace Rs.Framework
{
public static class GlobalVar
{
/// <summary>
/// 是否是第一次排料任务
/// </summary>
@ -2125,5 +2126,18 @@ namespace Rs.Framework
return SysConfigParam.GetValue<int>(nameof(TurnoverNozzleAdhereOpenVacDelay));
}
}
/// <summary>
/// 检测是否加载相机
/// </summary>
[ParameterInit("bool", "True", "system", "检测是否加载相机")]
public static bool CheckLoadVision
{
get
{
return SysConfigParam.GetValue<bool>(nameof(CheckLoadVision));
}
}
}
}

75
Rs.SkyLine/Commom/Ops.cs
Unescape Escape View File

@ -70,48 +70,51 @@ namespace Rs.MotionPlat.Commom
#endregion
#region 链接相机
//链接相机
ECameraErrorCode ceCode = HikCamera.Instance.Init();
if (ceCode > ECameraErrorCode.Ok)
if(GlobalVar.CheckLoadVision)
{
errNum++;
//MessageQueue.Instance.Warn(ceCode.ToString());
Msg.ShowError("Camera open fail!!!Please try again in 30 seconds");
System.Environment.Exit(0);
}
else
{
MessageQueue.Instance.Insert("Camera load ok!");
int ret = HikCamera.Instance.SetReverseX("upCamera", EDir.Y, false);
ret += HikCamera.Instance.SetReverseX("upCamera", EDir.X, false);
if (ret != 0)
//链接相机
ECameraErrorCode ceCode = HikCamera.Instance.Init();
if (ceCode > ECameraErrorCode.Ok)
{
MessageQueue.Instance.Warn("Camera init error");
errNum++;
//MessageQueue.Instance.Warn(ceCode.ToString());
Msg.ShowError("Camera open fail!!!Please try again in 30 seconds");
System.Environment.Exit(0);
}
ret = 0;
ret = HikCamera.Instance.SetReverseX("downCamera", EDir.X, true);
ret += HikCamera.Instance.SetReverseX("downCamera", EDir.Y, false);
if (ret != 0)
else
{
MessageQueue.Instance.Warn("Camera init error");
}
MessageQueue.Instance.Insert("Camera load ok!");
ret = HikCamera.Instance.StartGrab("upCamera");
if (ret != 0)
{
MessageQueue.Instance.Warn("Camera init error");
}
ret = HikCamera.Instance.StartGrab("locationCamera");
if (ret != 0)
{
MessageQueue.Instance.Warn("Camera init error");
}
int ret = HikCamera.Instance.SetReverseX("upCamera", EDir.Y, false);
ret += HikCamera.Instance.SetReverseX("upCamera", EDir.X, false);
if (ret != 0)
{
MessageQueue.Instance.Warn("Camera init error");
}
ret = 0;
ret = HikCamera.Instance.SetReverseX("downCamera", EDir.X, true);
ret += HikCamera.Instance.SetReverseX("downCamera", EDir.Y, false);
if (ret != 0)
{
MessageQueue.Instance.Warn("Camera init error");
}
ret = HikCamera.Instance.StartGrab("scanCamera");
if (ret != 0)
{
MessageQueue.Instance.Warn("Camera init error");
ret = HikCamera.Instance.StartGrab("upCamera");
if (ret != 0)
{
MessageQueue.Instance.Warn("Camera init error");
}
ret = HikCamera.Instance.StartGrab("locationCamera");
if (ret != 0)
{
MessageQueue.Instance.Warn("Camera init error");
}
ret = HikCamera.Instance.StartGrab("scanCamera");
if (ret != 0)
{
MessageQueue.Instance.Warn("Camera init error");
}
}
}
#endregion

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

@ -3,6 +3,7 @@ using Rs.DataAccess;
using Rs.Motion;
using Rs.Motion.Base;
using Rs.MotionPlat.Commom;
using Rs.MotionPlat.Properties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -175,8 +176,32 @@ namespace Rs.MotionPlat
ClearSelect();
((ButtonEx)sender).Selected = true;
IIOCard card = (IIOCard)(((ButtonEx)sender).Tag);
bool needSave = false;
foreach(IIO io in card.DIn)
{
if(string.IsNullOrEmpty(io.ShowEnName))
{
io.ShowEnName = io.Name;
needSave = true;
}
}
foreach (IIO io in card.DOut)
{
if (string.IsNullOrEmpty(io.ShowEnName))
{
io.ShowEnName = io.Name;
needSave = true;
}
}
if(needSave)
{
card.Save();
}
if (card == null) return;
inout.LoadIO(card, btnWidth - 10, GlobalUser.UserName);
string lang=Properties.Settings.Default.DefaultLanguage=="en-US"?"EN":"CN";
inout.LoadIO(card, btnWidth - 10, GlobalUser.UserName,lang);
}
}
}

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

@ -157,15 +157,15 @@ namespace Rs.MotionPlat
}
}
else if (button == btnQuit)
{
selectedButton = null;
button.Selected = false;
if(WindowsClose())
{
System.Environment.Exit(-1);
}
}
//else if (button == btnQuit)
//{
// selectedButton = null;
// button.Selected = false;
// if(WindowsClose())
// {
// System.Environment.Exit(-1);
// }
//}
else if (button == btnRecipe)
{
selectedButton = btnRecipe;
@ -267,7 +267,7 @@ namespace Rs.MotionPlat
btnAbout.Selected = false;
btnPermission.Selected = false;
btnLanguage.Selected = false;
btnQuit.Selected = false;
//btnQuit.Selected = false;
}
private void Home2_Load(object sender, EventArgs e)
@ -284,7 +284,7 @@ namespace Rs.MotionPlat
btnData.ShowText = "English";
btnLanguage.ShowText = "标定";
btnPermission.ShowText = "用户";
btnQuit.ShowText = "退出";
//btnQuit.ShowText = "退出";
}
else
{
@ -294,7 +294,7 @@ namespace Rs.MotionPlat
btnAbout.ShowText = "Debuger";
btnLanguage.ShowText = "Vision calibration";
btnPermission.ShowText = "User";
btnQuit.ShowText = "Quit";
//btnQuit.ShowText = "Quit";
btnData.ShowText = "中文";
}
timer1.Enabled = false;
@ -387,9 +387,13 @@ namespace Rs.MotionPlat
btnLanguage.ShowText = "标定";
btnLanguage.Invalidate();
btnPermission.ShowText = "用户";
if(!string.IsNullOrEmpty(GlobalUser.UserName))
{
btnPermission.ShowText += $"-({GlobalUser.UserName})";
}
btnPermission.Invalidate();
btnQuit.ShowText = "退出";
btnQuit.Invalidate();
//btnQuit.ShowText = "退出";
//btnQuit.Invalidate();
}
else
{
@ -404,9 +408,13 @@ namespace Rs.MotionPlat
btnLanguage.ShowText = "Vision calibration";
btnLanguage.Invalidate();
btnPermission.ShowText = "User";
if (!string.IsNullOrEmpty(GlobalUser.UserName))
{
btnPermission.ShowText += $"-({GlobalUser.UserName})";
}
btnPermission.Invalidate();
btnQuit.ShowText = "Quit";
btnQuit.Invalidate();
//btnQuit.ShowText = "Quit";
// btnQuit.Invalidate();
btnData.ShowText = "中文";
btnData.Invalidate();
}

31
Rs.SkyLine/Home.designer.cs generated
Unescape Escape View File

@ -46,8 +46,6 @@
this.btnLanguage = new Rs.Controls.ButtonEx();
this.panel14 = new System.Windows.Forms.Panel();
this.btnPermission = new Rs.Controls.ButtonEx();
this.panel15 = new System.Windows.Forms.Panel();
this.btnQuit = new Rs.Controls.ButtonEx();
this.panel1 = new System.Windows.Forms.Panel();
this.panel7 = new System.Windows.Forms.Panel();
this.lblMonitorFlow = new System.Windows.Forms.Label();
@ -78,7 +76,6 @@
this.panel12.SuspendLayout();
this.panel13.SuspendLayout();
this.panel14.SuspendLayout();
this.panel15.SuspendLayout();
this.panel1.SuspendLayout();
this.panel7.SuspendLayout();
this.panel6.SuspendLayout();
@ -106,7 +103,6 @@
this.tableLayoutPanel2.Controls.Add(this.panel12, 4, 0);
this.tableLayoutPanel2.Controls.Add(this.panel13, 5, 0);
this.tableLayoutPanel2.Controls.Add(this.panel14, 6, 0);
this.tableLayoutPanel2.Controls.Add(this.panel15, 7, 0);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
//
// panel8
@ -233,7 +229,6 @@
// btnLanguage
//
this.btnLanguage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(52)))), ((int)(((byte)(104)))));
this.btnLanguage.ButtonType = Rs.Controls.EButtonType.Calib;
this.btnLanguage.Cursor = System.Windows.Forms.Cursors.Hand;
resources.ApplyResources(this.btnLanguage, "btnLanguage");
this.btnLanguage.FlatAppearance.BorderColor = System.Drawing.Color.White;
@ -270,29 +265,6 @@
this.btnPermission.UseVisualStyleBackColor = false;
this.btnPermission.Click += new System.EventHandler(this.Menu_Clicked);
//
// panel15
//
this.panel15.Controls.Add(this.btnQuit);
resources.ApplyResources(this.panel15, "panel15");
this.panel15.Name = "panel15";
//
// btnQuit
//
this.btnQuit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(52)))), ((int)(((byte)(104)))));
this.btnQuit.ButtonType = Rs.Controls.EButtonType.Quit;
this.btnQuit.Cursor = System.Windows.Forms.Cursors.Hand;
resources.ApplyResources(this.btnQuit, "btnQuit");
this.btnQuit.FlatAppearance.BorderColor = System.Drawing.Color.White;
this.btnQuit.ForeColor = System.Drawing.Color.White;
this.btnQuit.Name = "btnQuit";
this.btnQuit.Selected = false;
this.btnQuit.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(57)))), ((int)(((byte)(136)))), ((int)(((byte)(203)))));
this.btnQuit.ShowIcon = null;
this.btnQuit.ShowText = "退出";
this.btnQuit.UnSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(52)))), ((int)(((byte)(104)))));
this.btnQuit.UseVisualStyleBackColor = false;
this.btnQuit.Click += new System.EventHandler(this.Menu_Clicked);
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(46)))), ((int)(((byte)(46)))));
@ -452,7 +424,6 @@
this.panel12.ResumeLayout(false);
this.panel13.ResumeLayout(false);
this.panel14.ResumeLayout(false);
this.panel15.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel7.ResumeLayout(false);
this.panel6.ResumeLayout(false);
@ -473,7 +444,6 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private Controls.ButtonEx btnPermission;
private Controls.ButtonEx btnAbout;
private Controls.ButtonEx btnQuit;
private Controls.ButtonEx btnLanguage;
private Controls.ButtonEx btnData;
private Controls.ButtonEx btnMain;
@ -508,6 +478,5 @@
private System.Windows.Forms.Panel panel12;
private System.Windows.Forms.Panel panel13;
private System.Windows.Forms.Panel panel14;
private System.Windows.Forms.Panel panel15;
}
}

106
Rs.SkyLine/Home.resx
Unescape Escape View File

@ -145,7 +145,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
<value>8</value>
<value>7</value>
</data>
<data name="btnMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -166,7 +166,7 @@
<value>0, 0, 30, 0</value>
</data>
<data name="btnMain.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="btnMain.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -193,7 +193,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="panel8.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="panel8.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -226,7 +226,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="btnRecipe.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="btnRecipe.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -247,13 +247,13 @@
<value>Fill</value>
</data>
<data name="panel9.Location" type="System.Drawing.Point, System.Drawing">
<value>199, 0</value>
<value>227, 0</value>
</data>
<data name="panel9.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="panel9.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="panel9.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -286,7 +286,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="btnSystem.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="btnSystem.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -307,13 +307,13 @@
<value>Fill</value>
</data>
<data name="panel10.Location" type="System.Drawing.Point, System.Drawing">
<value>398, 0</value>
<value>454, 0</value>
</data>
<data name="panel10.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="panel10.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="panel10.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -346,7 +346,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="btnAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="btnAbout.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -367,13 +367,13 @@
<value>Fill</value>
</data>
<data name="panel11.Location" type="System.Drawing.Point, System.Drawing">
<value>597, 0</value>
<value>681, 0</value>
</data>
<data name="panel11.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="panel11.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="panel11.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -406,7 +406,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="btnData.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="btnData.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -427,13 +427,13 @@
<value>Fill</value>
</data>
<data name="panel12.Location" type="System.Drawing.Point, System.Drawing">
<value>796, 0</value>
<value>908, 0</value>
</data>
<data name="panel12.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="panel12.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="panel12.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -469,7 +469,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="btnLanguage.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="btnLanguage.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -490,13 +490,13 @@
<value>Fill</value>
</data>
<data name="panel13.Location" type="System.Drawing.Point, System.Drawing">
<value>995, 0</value>
<value>1135, 0</value>
</data>
<data name="panel13.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="panel13.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>227, 53</value>
</data>
<data name="panel13.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -529,7 +529,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="btnPermission.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>232, 53</value>
</data>
<data name="btnPermission.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -550,13 +550,13 @@
<value>Fill</value>
</data>
<data name="panel14.Location" type="System.Drawing.Point, System.Drawing">
<value>1194, 0</value>
<value>1362, 0</value>
</data>
<data name="panel14.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="panel14.Size" type="System.Drawing.Size, System.Drawing">
<value>199, 53</value>
<value>232, 53</value>
</data>
<data name="panel14.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -573,66 +573,6 @@
<data name="&gt;&gt;panel14.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="btnQuit.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="btnQuit.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="btnQuit.Font" type="System.Drawing.Font, System.Drawing">
<value>宋体, 14pt</value>
</data>
<data name="btnQuit.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="btnQuit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="btnQuit.Size" type="System.Drawing.Size, System.Drawing">
<value>201, 53</value>
</data>
<data name="btnQuit.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;btnQuit.Name" xml:space="preserve">
<value>btnQuit</value>
</data>
<data name="&gt;&gt;btnQuit.Type" xml:space="preserve">
<value>Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnQuit.Parent" xml:space="preserve">
<value>panel15</value>
</data>
<data name="&gt;&gt;btnQuit.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="panel15.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="panel15.Location" type="System.Drawing.Point, System.Drawing">
<value>1393, 0</value>
</data>
<data name="panel15.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="panel15.Size" type="System.Drawing.Size, System.Drawing">
<value>201, 53</value>
</data>
<data name="panel15.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="&gt;&gt;panel15.Name" xml:space="preserve">
<value>panel15</value>
</data>
<data name="&gt;&gt;panel15.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel15.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value>
</data>
<data name="&gt;&gt;panel15.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
@ -664,7 +604,7 @@
<value>1</value>
</data>
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="panel8" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panel9" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="panel10" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="panel11" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="panel12" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="panel13" Row="0" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="panel14" Row="0" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="panel15" Row="0" RowSpan="1" Column="7" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="panel8" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panel9" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="panel10" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="panel11" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="panel12" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="panel13" Row="0" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="panel14" Row="0" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,14.28571,Percent,14.28571,Percent,14.28571,Percent,14.28571,Percent,14.28571,Percent,14.28571,Percent,14.28571,Absolute,20" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="lblMonitorFlow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -1225,6 +1165,6 @@
<value>Home</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Rs.MotionPlat.BaseFormHeader, Rs.MotionPlat, Version=3.20.24.14, Culture=neutral, PublicKeyToken=null</value>
<value>Rs.MotionPlat.BaseFormHeader, Rs.MotionPlat, Version=20.25.11.1, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

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

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

21
Rs.SkyLine/TestFrm.Designer.cs generated
Unescape Escape View File

@ -66,6 +66,7 @@
this.button30 = new System.Windows.Forms.Button();
this.button31 = new System.Windows.Forms.Button();
this.button32 = new System.Windows.Forms.Button();
this.ioStatus1 = new Rs.Controls.IOStatus();
this.SuspendLayout();
//
// btnTurnoverSlotException
@ -449,11 +450,30 @@
this.button32.UseVisualStyleBackColor = true;
this.button32.Click += new System.EventHandler(this.button32_Click);
//
// ioStatus1
//
this.ioStatus1.Disabled = false;
this.ioStatus1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ioStatus1.IoID = ((ushort)(0));
this.ioStatus1.IoNO = ((ushort)(0));
this.ioStatus1.Location = new System.Drawing.Point(447, 169);
this.ioStatus1.Name = "ioStatus1";
this.ioStatus1.Passed = false;
this.ioStatus1.Radius = 5;
this.ioStatus1.Reverse = false;
this.ioStatus1.ShowNo = true;
this.ioStatus1.Size = new System.Drawing.Size(168, 36);
this.ioStatus1.Status = 1;
this.ioStatus1.TabIndex = 11;
this.ioStatus1.Text = "fsdfad";
this.ioStatus1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// TestFrm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1336, 854);
this.Controls.Add(this.ioStatus1);
this.Controls.Add(this.button32);
this.Controls.Add(this.button31);
this.Controls.Add(this.button30);
@ -538,5 +558,6 @@
private System.Windows.Forms.Button button30;
private System.Windows.Forms.Button button31;
private System.Windows.Forms.Button button32;
private Controls.IOStatus ioStatus1;
}
}
Write Preview
Loading…
Cancel
Save