diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.Designer.cs b/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.Designer.cs
new file mode 100644
index 0000000..38ffab8
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.Designer.cs
@@ -0,0 +1,61 @@
+namespace Mesnac.Controls.ChemicalWeighing
+{
+ partial class ControlCabinet
+ {
+ ///
+ /// 必需的设计器变量。
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// 清理所有正在使用的资源。
+ ///
+ /// 如果应释放托管资源，为 true；否则为 false。
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region 组件设计器生成的代码
+
+ ///
+ /// 设计器支持所需的方法 - 不要修改
+ /// 使用代码编辑器修改此方法的内容。
+ ///
+ private void InitializeComponent()
+ {
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(150, 150);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ //
+ // ControlCabinet
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.pictureBox1);
+ this.Name = "ControlCabinet";
+ this.Load += new System.EventHandler(this.ControlCabinet_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.PictureBox pictureBox1;
+ }
+}
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.cs b/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.cs
new file mode 100644
index 0000000..ecc99b3
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Controls.ChemicalWeighing
+{
+
+ [ToolboxBitmap(typeof(ControlCabinet), "Resources.controlCabinet.png")]
+ public partial class ControlCabinet : ChemicalWeighingControl
+ {
+ public enum Statuses
+ {
+ TurnOff = 0,
+ TurnOn = 1
+ }
+ private bool bNewPic = false;
+ private string _statusName;
+ //private object _textName = string.Empty;
+ private Statuses _status;
+ private string[] sImages;
+
+ public ControlCabinet() : base()
+ {
+ InitializeComponent();
+
+ Init();
+
+ ReloadStream();
+ this.Reload();
+ }
+
+ protected override void Init()
+ {
+ base.Init();
+ _imageStream = null;
+ sImages = new string[2];
+ sImages[0] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet.png";//zsTurnOff
+ sImages[1] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet1.png";//zsTurnOn
+ _status = Statuses.TurnOff;
+ }
+
+ private void ReloadStream()
+ {
+ int nIndex = (int)_status;
+ _imageStream = _assembly.GetManifestResourceStream(sImages[nIndex]);
+ }
+
+ public string StatusName
+ {
+ get
+ {
+ return _statusName;
+ }
+ set
+ {
+ _statusName = value;
+ }
+ }
+
+ public Statuses Status
+ {
+ get
+ {
+ return _status;
+ }
+ set
+ {
+ if (bFirstCreated == true)
+ {
+ bFirstCreated = false;
+ }
+ bool flag = false;
+ //if (_status != value &&(this.Size.Width != 150 || this.Size.Height != 150) )
+ if (_status != value)
+ {
+ flag = true;
+ if (this.DesignMode == true)
+ {
+ bNewPic = true;
+ }
+ }
+
+ if ((int)value < 0)
+ {
+ _status = (Statuses)0;
+ }
+ else if ((int)value > 1)
+ {
+ _status = (Statuses)1;
+ }
+ else
+ {
+ _status = value;
+ }
+ if (flag)
+ {
+ ReloadStream();
+ Reload();
+ this.Refresh();
+ }
+ }
+ }
+
+ private void Reload()
+ {
+ if (_imageStream != null)
+ {
+ Image img = Image.FromStream(_imageStream);
+ Size size = new Size();
+ size.Width = 29;
+ size.Height = 24;
+ this.Size = size;
+ if (bNewPic == true)
+ {
+ this.Size = size;
+ bNewPic = false;
+ }
+ pictureBox1.Image = img;
+ pictureBox1.Refresh();
+ }
+ }
+
+ private void ControlCabinet_Load(object sender, EventArgs e)
+ {
+ if (bFirstCreated == true && this.DesignMode == true)
+ {
+ bNewPic = true;
+ bFirstCreated = false;
+ Reload();
+ }
+ }
+ }
+}
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.resx b/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
index e581090..d31f5dc 100644
--- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
@@ -71,6 +71,12 @@
BeiLiaoTong.cs
+
+ UserControl
+
+
+ ControlCabinet.cs
+
UserControl
@@ -375,6 +381,9 @@
BeiLiaoTong.cs
Designer
+
+ ControlCabinet.cs
+
DistributionBox.cs
@@ -607,6 +616,9 @@
+
+
+
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet.png
new file mode 100644
index 0000000..bc1209f
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet0.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet0.png
new file mode 100644
index 0000000..e68f2fb
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet0.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet1.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet1.png
new file mode 100644
index 0000000..cd16830
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/controlCabinet1.png differ
diff --git a/Main/MCEdit/Data/ComponentAction.en-US.xml b/Main/MCEdit/Data/ComponentAction.en-US.xml
index f1d5809..f12129d 100644
--- a/Main/MCEdit/Data/ComponentAction.en-US.xml
+++ b/Main/MCEdit/Data/ComponentAction.en-US.xml
@@ -408,5 +408,11 @@
+
+
+
+
+
+
diff --git a/Main/MCEdit/Data/ComponentAction.xml b/Main/MCEdit/Data/ComponentAction.xml
index f43b3d2..dc49421 100644
--- a/Main/MCEdit/Data/ComponentAction.xml
+++ b/Main/MCEdit/Data/ComponentAction.xml
@@ -408,8 +408,14 @@
+
+
+
+
+
+
-
+
diff --git a/Main/MCEdit/Data/ComponentProperty.xml b/Main/MCEdit/Data/ComponentProperty.xml
index 2e45968..4c3b606 100644
--- a/Main/MCEdit/Data/ComponentProperty.xml
+++ b/Main/MCEdit/Data/ComponentProperty.xml
@@ -1402,6 +1402,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
index 01ff7e6..6647fa0 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
@@ -1,6 +1,615 @@
@@ -232,7 +841,7 @@
True
MiddleCenter
MintCream
- 1204, 495
+ 1204, 507
SpecialLabelBlue426
3, 30
@@ -275,9 +884,9 @@
True
MiddleCenter
MintCream
- 928, 495
+ 928, 507
SpecialLabelBlue432
- 3, 30
+ 3, 25
-
-
-
-
-
-
-
-
@@ -1668,19 +2205,6 @@
StraightTubeV36
5, 89
-
-
-
-
@@ -1749,10 +2260,10 @@
3, 182
@@ -2059,18 +2570,18 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL
- 1479, 266
+ 1469, 266
StorageBinViewBig1
- 26, 76
+ 46, 76
@@ -2387,7 +2898,7 @@
ParametersWithPc.DB2102-valveInitDB.DV2PCP08_SetLeft
ParametersWithPc.DB2102-valveInitDB.DV2PCP08_AlarmRightPosition
ParametersWithPc.DB2102-valveInitDB.DV2PCP08_AlarmLeftPosition
- 987, 207
+ 992, 207
ThreeWayValve2
22, 12
@@ -2473,7 +2984,7 @@
True
MiddleCenter
MintCream
- 804, 186
+ 814, 185
SpecialLabelBlue523
3, 115
@@ -2482,7 +2993,7 @@
ParametersWithPc.DB2102-valveInitDB.DV2PCP02_SetLeft
ParametersWithPc.DB2102-valveInitDB.DV2PCP02_AlarmRightPosition
ParametersWithPc.DB2102-valveInitDB.DV2PCP02_AlarmLeftPosition
- 790, 177
+ 802, 175
ThreeWayValve1
22, 12
@@ -2568,8 +3079,8 @@
3, 20
@@ -2671,18 +3182,18 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL
- 1205, 267
+ 1195, 267
StorageBinViewBig5
- 26, 76
+ 46, 76
+
+
+
+
+
+
@@ -2910,18 +3463,18 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL
- 895, 265
+ 885, 265
StorageBinViewBig10
- 26, 76
+ 46, 76