diff --git a/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.Designer.cs b/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.Designer.cs index 3874b51..f7cbfe3 100644 --- a/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.Designer.cs +++ b/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.Designer.cs @@ -104,7 +104,7 @@ this.MinimumSize = new System.Drawing.Size(908, 39); this.Name = "FrmSysLogin"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "密炼智能装备信息化平台"; + this.Text = "榄菊蚊香自动配料系统"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmSysLogin_FormClosed); this.VisibleChanged += new System.EventHandler(this.FrmSysLogin_VisibleChanged); this.ResumeLayout(false); diff --git a/Main/MCBackView/Properties/MesnacResource.resx b/Main/MCBackView/Properties/MesnacResource.resx index 12c5941..fe3eeeb 100644 --- a/Main/MCBackView/Properties/MesnacResource.resx +++ b/Main/MCBackView/Properties/MesnacResource.resx @@ -188,7 +188,7 @@ ..\images\MenuAndTools\Icons_16X16_Wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 密炼智能装备信息化平台 V1.0 + 榄菊蚊香自动配料系统 V1.0 提示 diff --git a/Main/MCEdit/Data/SharpPlugIn/Mesnac.addin b/Main/MCEdit/Data/SharpPlugIn/Mesnac.addin index 3785c29..7f41a06 100644 --- a/Main/MCEdit/Data/SharpPlugIn/Mesnac.addin +++ b/Main/MCEdit/Data/SharpPlugIn/Mesnac.addin @@ -1,8 +1,8 @@ - diff --git a/Main/MCEdit/Properties/Mesnac.Action.Default.resx b/Main/MCEdit/Properties/Mesnac.Action.Default.resx index d6e7bec..816c61e 100644 --- a/Main/MCEdit/Properties/Mesnac.Action.Default.resx +++ b/Main/MCEdit/Properties/Mesnac.Action.Default.resx @@ -130,7 +130,7 @@ 对不起，您选择的帐号没有权限执行此操作！ - 密炼智能装备信息化平台 + 榄菊蚊香自动配料系统 尝试连接本地数据库失败！ diff --git a/Main/MCEdit/Properties/MesnacResource.resx b/Main/MCEdit/Properties/MesnacResource.resx index ec9611f..90870d7 100644 --- a/Main/MCEdit/Properties/MesnacResource.resx +++ b/Main/MCEdit/Properties/MesnacResource.resx @@ -422,7 +422,7 @@ 确定要退出系统吗？ - 密炼智能装备信息化平台 V1.0 + 榄菊蚊香自动配料系统 V1.0 刷新(&F) diff --git a/Main/MCEdit/Properties/MesnacResource.zh-CN.resx b/Main/MCEdit/Properties/MesnacResource.zh-CN.resx index f82d628..57f528f 100644 --- a/Main/MCEdit/Properties/MesnacResource.zh-CN.resx +++ b/Main/MCEdit/Properties/MesnacResource.zh-CN.resx @@ -422,7 +422,7 @@ 确定要退出系统吗？ - 密炼智能装备信息化平台 V1.0 + 榄菊蚊香自动配料系统 V1.0 刷新(&F) diff --git a/Main/MCRun/Data/MCProject/SCWSProject2.mprj b/Main/MCRun/Data/MCProject/SCWSProject2.mprj index 68e5c18..745c146 100644 --- a/Main/MCRun/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCRun/Data/MCProject/SCWSProject2.mprj @@ -4,25 +4,18 @@ - - - - - - - @@ -43,6 +36,7 @@ + diff --git a/Main/MCRun/Data/MCProject/nodeDevice.xml b/Main/MCRun/Data/MCProject/nodeDevice.xml index 698afaf..45c626d 100644 --- a/Main/MCRun/Data/MCProject/nodeDevice.xml +++ b/Main/MCRun/Data/MCProject/nodeDevice.xml @@ -1,7721 +1,10 @@  -<<<<<<< HEAD - -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -=======
- + @@ -7724,7 +13,7 @@
- + @@ -7782,187 +71,187 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7984,81 +273,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8470,7 +759,7 @@ - + @@ -10322,48 +2611,48 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10376,46 +2665,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10428,46 +2717,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10480,46 +2769,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10532,945 +2821,945 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -12699,7 +4988,7 @@ - + @@ -13579,7 +5868,7 @@ - + @@ -13859,7 +6148,7 @@ - + @@ -14141,7 +6430,7 @@ - + @@ -15377,39 +7666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> e8224d1f53badfe96dfc9a988b4aa0b388f884d7 \ No newline at end of file diff --git a/Main/MCRun/Data/MCProject/nodeForm/DeviceDetail_1.xml b/Main/MCRun/Data/MCProject/nodeForm/DeviceDetail_1.xml new file mode 100644 index 0000000..03226cd --- /dev/null +++ b/Main/MCRun/Data/MCProject/nodeForm/DeviceDetail_1.xml @@ -0,0 +1,3249 @@ + + + + + + 77, 54 + Line7 + 1, 240 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 273 + MCLabel73 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 273 + MCLabel74 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 243 + MCLabel75 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 243 + MCLabel76 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 213 + MCLabel77 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 213 + MCLabel78 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 183 + MCLabel79 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 183 + MCLabel80 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 153 + MCLabel81 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 153 + MCLabel82 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 123 + MCLabel83 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 123 + MCLabel84 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 93 + MCLabel85 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 93 + MCLabel86 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 速度 + Transparent + ButtonHighlight + 18, 273 + MCLabel87 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 温度 + Transparent + ButtonHighlight + 18, 243 + MCLabel88 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 时间 + Transparent + ButtonHighlight + 18, 213 + MCLabel89 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 配方代码 + Transparent + ButtonHighlight + 18, 183 + MCLabel90 + 53, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 公差 + Transparent + ButtonHighlight + 18, 153 + MCLabel91 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 设定重量 + Transparent + ButtonHighlight + 18, 123 + MCLabel92 + 53, 12 + + + 14, 78 + Line8 + 170, 1 + + + + + Red + DarkGray + + + False + + + + None + True + True + 冷水 + Transparent + ButtonHighlight + 99, 58 + MCLabel93 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 热水 + Transparent + ButtonHighlight + 155, 58 + MCLabel94 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 罐号 + Transparent + ButtonHighlight + 18, 93 + MCLabel95 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 水称 + Transparent + 黑体, 14.25pt, style=Bold + White + 77, 16 + MCLabel96 + 51, 19 + + + True + True + 763, 354 + InfoPanel3 + 203, 317 + + + + 77, 54 + Line5 + 1, 240 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 271 + MCLabel49 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 273 + MCLabel50 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 241 + MCLabel51 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 243 + MCLabel52 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 211 + MCLabel53 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 213 + MCLabel54 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 181 + MCLabel55 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 183 + MCLabel56 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 151 + MCLabel57 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 153 + MCLabel58 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 121 + MCLabel59 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 123 + MCLabel60 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 91 + MCLabel61 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 93 + MCLabel62 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 速度 + Transparent + ButtonHighlight + 18, 273 + MCLabel63 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 温度 + Transparent + ButtonHighlight + 18, 243 + MCLabel64 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 时间 + Transparent + ButtonHighlight + 18, 213 + MCLabel65 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 配方代码 + Transparent + ButtonHighlight + 18, 183 + MCLabel66 + 53, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 公差 + Transparent + ButtonHighlight + 18, 153 + MCLabel67 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 设定重量 + Transparent + ButtonHighlight + 18, 123 + MCLabel68 + 53, 12 + + + 14, 78 + Line6 + 170, 1 + + + + + Red + DarkGray + + + False + + + + None + True + True + A + Transparent + ButtonHighlight + 99, 58 + MCLabel69 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + B + Transparent + ButtonHighlight + 156, 58 + MCLabel70 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 罐号 + Transparent + ButtonHighlight + 18, 93 + MCLabel71 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 湿混机 + Transparent + 黑体, 14.25pt, style=Bold + White + 66, 16 + MCLabel72 + 72, 19 + + + True + True + 763, 28 + InfoPanel4 + 203, 317 + + + + 77, 54 + Line3 + 1, 240 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 273 + MCLabel25 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 273 + MCLabel26 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 243 + MCLabel27 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 243 + MCLabel28 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 213 + MCLabel29 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 213 + MCLabel30 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 183 + MCLabel31 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 183 + MCLabel32 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 153 + MCLabel33 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 153 + MCLabel34 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 123 + MCLabel35 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 123 + MCLabel36 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 93 + MCLabel37 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 93 + MCLabel38 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 速度 + Transparent + ButtonHighlight + 18, 273 + MCLabel39 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 温度 + Transparent + ButtonHighlight + 18, 243 + MCLabel40 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 时间 + Transparent + ButtonHighlight + 18, 213 + MCLabel41 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 配方代码 + Transparent + ButtonHighlight + 18, 183 + MCLabel42 + 53, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 公差 + Transparent + ButtonHighlight + 18, 153 + MCLabel43 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 设定重量 + Transparent + ButtonHighlight + 18, 123 + MCLabel44 + 53, 12 + + + 14, 78 + Line4 + 170, 1 + + + + + Red + DarkGray + + + False + + + + None + True + True + A + Transparent + ButtonHighlight + 98, 58 + MCLabel45 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + B + Transparent + ButtonHighlight + 151, 58 + MCLabel46 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 罐号 + Transparent + ButtonHighlight + 18, 93 + MCLabel47 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 糊化机 + Transparent + 黑体, 14.25pt, style=Bold + White + 66, 16 + MCLabel48 + 72, 19 + + + True + True + 554, 354 + InfoPanel5 + 203, 317 + + + + 77, 54 + Line2 + 1, 240 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 273 + MCLabel24 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Step0_MixSpeed + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 273 + MCLabel23 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 243 + MCLabel22 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Step0_MixTemp + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 243 + MCLabel21 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD2Step0_MixTime + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 213 + MCLabel1 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Step0_MixTime + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 213 + MCLabel2 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD2Step0_MixCode + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 183 + MCLabel3 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Step0_MixCode + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 183 + MCLabel4 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD2Recip0_Tolerance + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 153 + MCLabel5 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Recip0_Tolerance + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 153 + MCLabel6 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD2Recip0_Set + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 123 + MCLabel7 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Recip0_Set + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 123 + MCLabel8 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD2Recip0_Bin + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 93 + MCLabel9 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Recip0_Bin + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 93 + MCLabel10 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 速度 + Transparent + ButtonHighlight + 18, 273 + MCLabel11 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 温度 + Transparent + ButtonHighlight + 18, 243 + MCLabel12 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 时间 + Transparent + ButtonHighlight + 18, 213 + MCLabel13 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 配方代码 + Transparent + ButtonHighlight + 18, 183 + MCLabel14 + 53, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 公差 + Transparent + ButtonHighlight + 18, 153 + MCLabel15 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 设定重量 + Transparent + ButtonHighlight + 18, 123 + MCLabel16 + 53, 12 + + + 14, 78 + Line1 + 170, 1 + + + + + Red + DarkGray + + + False + + + + None + True + True + A + Transparent + ButtonHighlight + 98, 58 + MCLabel17 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + B + Transparent + ButtonHighlight + 151, 58 + McLabel + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 罐号 + Transparent + ButtonHighlight + 18, 93 + MCLabel19 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 干混机 + Transparent + 黑体, 14.25pt, style=Bold + White + 66, 16 + MCLabel20 + 72, 19 + + + True + True + 554, 28 + InfoPanel6 + 203, 317 + + + + TurnOff + 369, 225 + Jzf52 + 18, 15 + + + + TurnOff + 383, 225 + Jzf53 + 18, 15 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 381, 246 + SpecialLabelBlue408 + 15, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 381, 216 + SpecialLabelBlue406 + 15, 3 + + + + TurnOff + 331, 226 + Jzf48 + 18, 15 + + + + TurnOff + 345, 226 + Jzf46 + 18, 15 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 343, 247 + SpecialLabelBlue420 + 15, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 355, 217 + SpecialLabelBlue419 + 3, 30 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 343, 217 + SpecialLabelBlue418 + 15, 3 + + + ParametersWithPc.DB2102-valveInitDB.BU1DRB01_Alarm + ParametersWithPc.DB2102-valveInitDB.BU1DRB01_Set + 200, 354 + LjSwith288 + 14, 13 + + + + ParametersWithPc.DB2103-motorInitDB.DM1CDB01_Run + zsTurnOff + 294, 347 + Fan12 + 17, 15 + + + + ParametersWithPc.DB2103-motorInitDB.DM1BDB01_Run + zsTurnOff + 199, 330 + Fan11 + 17, 15 + + + + ParametersWithPc.DB2103-motorInitDB.DM1ADB01_Run + zsTurnOff + 104, 351 + Fan10 + 17, 15 + + + ParametersWithPc.B1.PM1BDF01 + TurnOff + 216, 224 + ControlCabinet3 + 11, 14 + + + + ParametersWithPc.DB2103-motorInitDB.DM1BDF01_Run + zsTurnOff + 211, 209 + Fan3 + 17, 15 + + + ParametersWithPc.B1.PM1CDF01 + TurnOff + 312, 261 + ControlCabinet2 + 11, 14 + + + + ParametersWithPc.DB2103-motorInitDB.DM1CDF01_Run + zsTurnOff + 307, 245 + Fan2 + 17, 15 + + + ParametersWithPc.B1.PM1ADF01 + TurnOff + 125, 261 + ControlCabinet1 + 11, 14 + + + + TurnOff + 289, 253 + PControl7 + 16, 22 + + + + TurnOff + 198, 214 + PControl6 + 16, 22 + + + + TurnOff + 98, 253 + PControl5 + 16, 22 + + + + ParametersWithPc.DB2103-motorInitDB.DM1ADF01_Run + zsTurnOff + 120, 245 + Fan1 + 17, 15 + + + ParametersWithPc.DB2102-valveInitDB.DV2PCP07_SetRight + ParametersWithPc.DB2102-valveInitDB.DV2PCP07_SetLeft + ParametersWithPc.DB2102-valveInitDB.DV2PCP07_AlarmRightPosition + ParametersWithPc.DB2102-valveInitDB.DV2PCP07_AlarmLeftPosition + 198, 123 + ThreeWayValve12 + 22, 12 + + + ParametersWithPc.DB2102-valveInitDB.DV2PCP05_SetRight + ParametersWithPc.DB2102-valveInitDB.DV2PCP05_SetLeft + ParametersWithPc.DB2102-valveInitDB.DV2PCP05_AlarmRightPosition + ParametersWithPc.DB2102-valveInitDB.DV2PCP05_AlarmLeftPosition + 211, 70 + ThreeWayValve11 + 22, 12 + + + ParametersWithPc.DB2102-valveInitDB.DV2PCP03_SetRight + ParametersWithPc.DB2102-valveInitDB.DV2PCP03_SetLeft + ParametersWithPc.DB2102-valveInitDB.DV2PCP03_AlarmRightPosition + ParametersWithPc.DB2102-valveInitDB.DV2PCP03_AlarmLeftPosition + 99, 178 + ThreeWayValve10 + 22, 12 + + + 246, 390 + FeedingPortRight1 + 16, 100 + + + 155, 390 + FeedingPortLeft1 + 16, 100 + + + 211, 487 + PrepareHopperRight1 + 72, 87 + + + 133, 487 + PrepareHopperLeft1 + 72, 87 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 225, 480 + SpecialLabelBlue432 + 3, 25 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 195, 480 + SpecialLabelBlue433 + 3, 8 + + + 365, 267 + DistributionBox2 + 30, 50 + + + 330, 267 + DistributionBox1 + 30, 50 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 379, 7 + SpecialLabelBlue492 + 3, 360 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 343, 7 + SpecialLabelBlue493 + 3, 360 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 211, 75 + SpecialLabelBlue509 + 305, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 198, 128 + SpecialLabelBlue510 + 312, 3 + + + + TurnOff + 222, 56 + Jzf29 + 18, 15 + + + + TurnOff + 221, 109 + Jzf28 + 18, 15 + + + + TurnOff + 221, 77 + Jzf27 + 18, 15 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 198, 89 + SpecialLabelBlue512 + 305, 3 + + + ParametersWithPc.FC4_Valve.BU1DBT06_Alarm + ParametersWithPc.FC4_Valve.BU1DBT06_Set + 195, 72 + LjSwith328 + 14, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 198, 64 + SpecialLabelBlue511 + 3, 25 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 211, 54 + SpecialLabelBlue513 + 3, 185 + + + ParametersWithPc.DB2102-valveInitDB.DV2PCP04_SetRight + ParametersWithPc.DB2102-valveInitDB.DV2PCP04_SetLeft + ParametersWithPc.DB2102-valveInitDB.DV2PCP04_AlarmRightPosition + ParametersWithPc.DB2102-valveInitDB.DV2PCP04_AlarmLeftPosition + 198, 46 + ThreeWayValve5 + 22, 12 + + + + TurnOff + 220, 128 + Jzf26 + 18, 15 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 167, 140 + SpecialLabelBlue515 + 336, 3 + + + ParametersWithPc.FC4_Valve.BU1DBT06_Alarm + ParametersWithPc.FC4_Valve.BU1DBT06_Set + 164, 123 + LjSwith329 + 14, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 167, 120 + SpecialLabelBlue514 + 3, 20 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 197, 106 + SpecialLabelBlue516 + 3, 130 + + + ParametersWithPc.DB2102-valveInitDB.DV2PCP06_SetRight + ParametersWithPc.DB2102-valveInitDB.DV2PCP06_SetLeft + ParametersWithPc.DB2102-valveInitDB.DV2PCP06_AlarmRightPosition + ParametersWithPc.DB2102-valveInitDB.DV2PCP06_AlarmLeftPosition + 183, 98 + ThreeWayValve4 + 22, 12 + + + + TurnOff + 110, 184 + Jzf25 + 18, 15 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 302, 188 + SpecialLabelBlue519 + 3, 90 + + + ParametersWithPc.DB2102-valveInitDB.DV2PCP08_SetRight + ParametersWithPc.DB2102-valveInitDB.DV2PCP08_SetLeft + ParametersWithPc.DB2102-valveInitDB.DV2PCP08_AlarmRightPosition + ParametersWithPc.DB2102-valveInitDB.DV2PCP08_AlarmLeftPosition + 289, 180 + ThreeWayValve2 + 22, 12 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 101, 182 + SpecialLabelBlue520 + 408, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 87, 196 + SpecialLabelBlue521 + 408, 3 + + + ParametersWithPc.FC4_Valve.BU1DBT06_Alarm + ParametersWithPc.FC4_Valve.BU1DBT06_Set + 84, 179 + LjSwith330 + 14, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 87, 171 + SpecialLabelBlue522 + 3, 25 + + + + TurnOff + 110, 158 + Jzf24 + 18, 15 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 111, 158 + SpecialLabelBlue523 + 3, 115 + + + ParametersWithPc.DB2102-valveInitDB.DV2PCP02_SetRight + ParametersWithPc.DB2102-valveInitDB.DV2PCP02_SetLeft + ParametersWithPc.DB2102-valveInitDB.DV2PCP02_AlarmRightPosition + ParametersWithPc.DB2102-valveInitDB.DV2PCP02_AlarmLeftPosition + 99, 148 + ThreeWayValve1 + 22, 12 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 143, 377 + SpecialLabelBlue531 + 370, 3 + + + 177, 455 + GanHunJi2 + 63, 10 + + + 0 + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + 192, 381 + StorageBinViewBig8 + 26, 76 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 268, 367 + SpecialLabelBlue532 + 3, 20 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 143, 377 + SpecialLabelBlue533 + 3, 10 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 276, 377 + SpecialLabelBlue534 + 3, 10 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 134, 366 + SpecialLabelBlue535 + 378, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 134, 366 + SpecialLabelBlue536 + 3, 20 + + + ParametersWithPc.DB2102-valveInitDB.BU1CDB01_Alarm + ParametersWithPc.DB2102-valveInitDB.BU1CDB01_Set + 297, 335 + LjSwith334 + 14, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 300, 327 + SpecialLabelBlue537 + 3, 60 + + + ParametersWithPc.DB2102-valveInitDB.BU2ASF02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU2ASF02_Set + 222, 468 + LjSwith283 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU2ASF01_Alarm + ParametersWithPc.DB2102-valveInitDB.BU2ASF01_Set + 192, 468 + LjSwith285 + 14, 13 + + + 0 + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + 278, 276 + StorageBinViewBig9 + 46, 51 + + + ParametersWithPc.DB2102-valveInitDB.BU1ADB01_Alarm + ParametersWithPc.DB2102-valveInitDB.BU1ADB01_Set + 108, 335 + LjSwith335 + 14, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 111, 327 + SpecialLabelBlue538 + 3, 60 + + + 106, 381 + LeftTong1 + 43, 54 + + + 264, 381 + RightTong1 + 43, 54 + + + 192, 345 + GanHunJi1 + 28, 10 + + + ParametersWithPc.DB2102-valveInitDB.BU1BDB01_Alarm + ParametersWithPc.DB2102-valveInitDB.BU1BDB01_Set + 202, 314 + LjSwith336 + 14, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 205, 317 + SpecialLabelBlue539 + 3, 80 + + + 0 + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + 182, 238 + StorageBinViewBig10 + 46, 76 + + + 0 + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + 90, 276 + StorageBinViewBig12 + 46, 51 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 46, 168 + SpecialLabelBlue542 + 430, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 35, 152 + SpecialLabelBlue541 + 440, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 68, 119 + SpecialLabelBlue544 + 410, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 57, 103 + SpecialLabelBlue543 + 420, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 24, 65 + SpecialLabelBlue547 + 470, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + MintCream + 13, 49 + SpecialLabelBlue569 + 490, 3 + + 32, 72, 98 + Fill + 0, 0 + Panel1 + 1443, 847 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + True + False + False + White + 1459, 886 + WindowsDefaultLocation + DeviceDetail_1 + Normal + + Tile + 宋体, 9pt + ControlText + DeviceDetail_1 + diff --git a/Main/MCRun/Data/MCProject/nodeForm/FormDeviceDetail2.xml b/Main/MCRun/Data/MCProject/nodeForm/FormDeviceDetail2.xml index d78a0a2..4700b40 100644 --- a/Main/MCRun/Data/MCProject/nodeForm/FormDeviceDetail2.xml +++ b/Main/MCRun/Data/MCProject/nodeForm/FormDeviceDetail2.xml @@ -1,80 +1,113 @@ - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - - False - - - - None - True - True - False - - - - Red - DarkGray - MCButton1 - 1448, 607 - MCButton3 - 85, 35 - 343 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - - False - - - - None - True - True - False - - - - Red - DarkGray - MCButton1 - 1177, 607 - MCButton2 - 85, 35 - 342 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - - False - - - - None - True - True - False - - - - Red - DarkGray - MCButton1 - 870, 607 - MCButton1 - 85, 35 - 341 + + + + + Red + DarkGray + + + False + + + + None + True + True + 冷热水秤 + Black + 宋体, 12pt + ButtonHighlight + 209, 4 + MCLabel3 + 72, 16 + + 1265, 827 + MCPanelBlack3 + 479, 198 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 糊化机 + Black + 宋体, 12pt + ButtonHighlight + 209, 4 + MCLabel2 + 56, 16 + + 770, 827 + MCPanelBlack2 + 479, 198 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 湿混机 + Black + 宋体, 12pt + ButtonHighlight + 209, 4 + MCLabel4 + 56, 16 + + 1265, 614 + MCPanelBlack4 + 479, 198 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 干混机 + Black + 宋体, 12pt + ButtonHighlight + 209, 4 + MCLabel1 + 56, 16 + + 770, 614 + MCPanelBlack1 + 479, 198 1664, 294 @@ -3989,7 +4022,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - False + True False False Control diff --git a/Main/MCRun/Data/MCProject/nodeForm/FormElectrical.xml b/Main/MCRun/Data/MCProject/nodeForm/FormElectrical.xml index e9cee3c..c1bbe46 100644 --- a/Main/MCRun/Data/MCProject/nodeForm/FormElectrical.xml +++ b/Main/MCRun/Data/MCProject/nodeForm/FormElectrical.xml @@ -25,6 +25,7 @@ None True True + False ControlLightLight 30 False @@ -38,7 +39,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIyMkVENjI0RUQxMTVCRDkxMENGMjE4MDk0RjUxMDc5BgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAXAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIzMzQwRENFMkFGMTRGQjg4OTRDMTc1Qjg2OENGMzQ5BgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== @@ -63,7 +64,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCMzkxNzBFMjA5RjU5MkNFQ0M0NDk4MjIwNEE0RkMwBgYAAAAM5pWw5o2u5LiK5LygBgcAAAAM5pWw5o2u5LiK5LygCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAXAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCMDU5ODYzMDc4NkJBOTk5RTM1RENCOTc2RkExQkM3BgYAAAAM5pWw5o2u5LiK5LygBgcAAAAM5pWw5o2u5LiK5LygCw== @@ -88,7 +89,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU0NUNDRkQ5QjZBMEI5MzMyRTcwMTcxNzFENkVFMUExBgYAAAAY5Yid5aeL5YyW5q+U5L6L6ZiA5Y+C5pWwBgcAAAAY5Yid5aeL5YyW5q+U5L6L6ZiA5Y+C5pWwCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAVAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEFFRjZCRTQwRkE3QzZBRjgxOTQ0OUQ1NjRCMzBCNkIzBgYAAAAY5L+u5pS55Y+Y6aKR55S15py65Y+C5pWwBgcAAAAY5L+u5pS55Y+Y6aKR55S15py65Y+C5pWwCw== @@ -113,7 +114,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAUAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEE2MjkyOEY4MDY5QTNGRkRGNzUyOUFFNzEwMjYyMDc2BgYAAAAV5L+u5pS55q+U5L6L6ZiA5Y+C5pWwBgcAAAAV5L+u5pS55q+U5L6L6ZiA5Y+C5pWwCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAWAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEFFRjZCRTQwRkE3QzZBRjgxOTQ0OUQ1NjRCMzBCNkIzBgYAAAAY5L+u5pS55Y+Y6aKR55S15py65Y+C5pWwBgcAAAAY5L+u5pS55Y+Y6aKR55S15py65Y+C5pWwCw== @@ -197,7 +198,7 @@ 786, 48 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU0QTQ0Mjc4RkE2OTBDM0YxRDA5QjczNjUyMkU1QkNBBgYAAAAk5Yid5aeL5qaE6I+K5Y+Y6aKR55S15py65omL5Yqo5Y+C5pWwBgcAAAAk5Yid5aeL5qaE6I+K5Y+Y6aKR55S15py65omL5Yqo5Y+C5pWwCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU0QTQ0Mjc4RkE2OTBDM0YxRDA5QjczNjUyMkU1QkNBBgYAAAAk5Yid5aeL5qaE6I+K5Y+Y6aKR55S15py65omL5Yqo5Y+C5pWwBgcAAAAk5Yid5aeL5qaE6I+K5Y+Y6aKR55S15py65omL5Yqo5Y+C5pWwCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCRun/Data/MCProject/nodeForm/FormMetage.xml b/Main/MCRun/Data/MCProject/nodeForm/FormMetage.xml index 8f0de18..69c93dc 100644 --- a/Main/MCRun/Data/MCProject/nodeForm/FormMetage.xml +++ b/Main/MCRun/Data/MCProject/nodeForm/FormMetage.xml @@ -39,7 +39,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIyMkVENjI0RUQxMTVCRDkxMENGMjE4MDk0RjUxMDc5BgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAVAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCRjBEM0RDRTU2M0I0RTY4OUI4MTVFMzNEMDlGOUFFBgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== @@ -64,7 +64,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCMzkxNzBFMjA5RjU5MkNFQ0M0NDk4MjIwNEE0RkMwBgYAAAAM5pWw5o2u5LiK5LygBgcAAAAM5pWw5o2u5LiK5LygCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAVAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEU0MzcxQjQwOEIxNjczNTczMjMyOTk4NTJENEYyMUREBgYAAAAM5pWw5o2u5LiK5LygBgcAAAAM5pWw5o2u5LiK5LygCw== @@ -89,7 +89,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAVAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDc0NkFGM0YzNTQ2REQyQ0ZCRkFCMTIyNDNBNkZFNjFFBgYAAAAV5Yid5aeL5YyW56ew6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW56ew6YeP5Y+C5pWwCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAXAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDc0NkFGM0YzNTQ2REQyQ0ZCRkFCMTIyNDNBNkZFNjFFBgYAAAAV5Yid5aeL5YyW56ew6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW56ew6YeP5Y+C5pWwCw== @@ -114,7 +114,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAWAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIyMEFFRTM0OUYyRjdGNUE2QURDMEI4RDQ3RDdCOEFBBgYAAAAS5L+u5pS556ew6YeP5Y+C5pWwBgcAAAAS5L+u5pS556ew6YeP5Y+C5pWwCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAYAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIyMEFFRTM0OUYyRjdGNUE2QURDMEI4RDQ3RDdCOEFBBgYAAAAS5L+u5pS556ew6YeP5Y+C5pWwBgcAAAAS5L+u5pS556ew6YeP5Y+C5pWwCw== diff --git a/Main/MCRun/Data/MCProject/nodeForm/FormProductLine.xml b/Main/MCRun/Data/MCProject/nodeForm/FormProductLine.xml index cbbaaea..a60742f 100644 --- a/Main/MCRun/Data/MCProject/nodeForm/FormProductLine.xml +++ b/Main/MCRun/Data/MCProject/nodeForm/FormProductLine.xml @@ -38,7 +38,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAMAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDg3RjE3OTlDMUNENUM1QjIwRDY0Q0RCRjFFRjVFQzFEBgYAAAAY5Yid5aeL5qaE6I+K5Lqn57q/566h55CGBgcAAAAS5qaE6I+K5Lqn57q/566h55CGCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDg3RjE3OTlDMUNENUM1QjIwRDY0Q0RCRjFFRjVFQzFEBgYAAAAY5Yid5aeL5qaE6I+K5Lqn57q/566h55CGBgcAAAAS5qaE6I+K5Lqn57q/566h55CGCw== @@ -63,7 +63,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU2QTg2OTgxQ0NBRDM5RUVEQzQyRjYzMEU5NDY2RTBCBgYAAAAV5Yig6Zmk5bmy5rm/5re36YWN5pa5BgcAAAAV5Yig6Zmk5bmy5rm/5re36YWN5pa5Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU2QTg2OTgxQ0NBRDM5RUVEQzQyRjYzMEU5NDY2RTBCBgYAAAAS5Yig6Zmk5qaE6I+K5Lqn57q/BgcAAAAS5Yig6Zmk5qaE6I+K5Lqn57q/Cw== @@ -88,7 +88,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEJGN0FCNjY4QzkxMUY0ODY1N0QzODRCODkxNkU3MjAzBgYAAAAY5L+u5pS55qaE6I+K5Lqn57q/566h55CGBgcAAAAY5L+u5pS55qaE6I+K5Lqn57q/566h55CGCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEJGN0FCNjY4QzkxMUY0ODY1N0QzODRCODkxNkU3MjAzBgYAAAAY5L+u5pS55qaE6I+K5Lqn57q/566h55CGBgcAAAAY5L+u5pS55qaE6I+K5Lqn57q/566h55CGCw== @@ -113,7 +113,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDlBQkMyODQ3NEZDMTQ1NUQ5MEZEMjA3RkU0NEQ5MUQwBgYAAAAG5paw5aKeBgcAAAAG5paw5aKeCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEJFMDFDQzM2Q0QyNTMwQ0U5QjJDNUYyNTdEREM2QTMxBgYAAAAY5re75Yqg5qaE6I+K5Lqn57q/566h55CGBgcAAAAY5re75Yqg5qaE6I+K5Lqn57q/566h55CGCw== diff --git a/Main/MCRun/Data/SharpPlugIn/Mesnac.addin b/Main/MCRun/Data/SharpPlugIn/Mesnac.addin index 60b4ef5..b9ae01a 100644 --- a/Main/MCRun/Data/SharpPlugIn/Mesnac.addin +++ b/Main/MCRun/Data/SharpPlugIn/Mesnac.addin @@ -1,8 +1,8 @@ - diff --git a/Main/MCRun/Properties/Mesnac.Action.Default.resx b/Main/MCRun/Properties/Mesnac.Action.Default.resx index d6e7bec..816c61e 100644 --- a/Main/MCRun/Properties/Mesnac.Action.Default.resx +++ b/Main/MCRun/Properties/Mesnac.Action.Default.resx @@ -130,7 +130,7 @@ 对不起，您选择的帐号没有权限执行此操作！ - 密炼智能装备信息化平台 + 榄菊蚊香自动配料系统 尝试连接本地数据库失败！ diff --git a/Main/MCRun/Properties/MesnacResource.resx b/Main/MCRun/Properties/MesnacResource.resx index 12c5941..fe3eeeb 100644 --- a/Main/MCRun/Properties/MesnacResource.resx +++ b/Main/MCRun/Properties/MesnacResource.resx @@ -188,7 +188,7 @@ ..\images\MenuAndTools\Icons_16X16_Wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 密炼智能装备信息化平台 V1.0 + 榄菊蚊香自动配料系统 V1.0 提示 diff --git a/Main/MCRun/Properties/MesnacResource.zh-CN.resx b/Main/MCRun/Properties/MesnacResource.zh-CN.resx index fd0f5ff..67e9238 100644 --- a/Main/MCRun/Properties/MesnacResource.zh-CN.resx +++ b/Main/MCRun/Properties/MesnacResource.zh-CN.resx @@ -188,7 +188,7 @@ ..\images\MenuAndTools\Icons_16X16_Wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 密炼智能装备信息化平台 V1.0 + 榄菊蚊香自动配料系统 V1.0 提示