diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.Designer.cs b/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.Designer.cs
new file mode 100644
index 0000000..47a1280
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.Designer.cs
@@ -0,0 +1,70 @@
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace Mesnac.Controls.ChemicalWeighing
+{
+ partial class Chuiqizhi
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Chuiqizhi));
+ 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.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(67, 33);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ //
+ // Chuiqizhi
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.pictureBox1);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.Name = "Chuiqizhi";
+ this.Size = new System.Drawing.Size(67, 33);
+ this.Load += new System.EventHandler(this.Chuiqizhi_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private PictureBox pictureBox1;
+ }
+}
\ No newline at end of file
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.cs b/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.cs
new file mode 100644
index 0000000..6d6d6db
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.cs
@@ -0,0 +1,17 @@
+using System.Windows.Forms;
+
+namespace Mesnac.Controls.ChemicalWeighing
+{
+ public partial class Chuiqizhi : UserControl
+ {
+ public Chuiqizhi()
+ {
+ InitializeComponent();
+ }
+
+ private void Chuiqizhi_Load(object sender, System.EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.resx b/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.resx
new file mode 100644
index 0000000..10a39ee
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.resx
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAFkAAADLCAYAAAAFpT/nAAAABGdBTUEAALGPC/xhBQAAB5NJREFUeF7t
+ nD2oI2UUhldEsVAU1Eb8L9RGLQS1UnAtLFzBRfAPW8FKFgsXxNIfsNhGiyssV3bzJbMpLli5FjaCjeU2
+ ouAirhZ6byFsobuI1/ckZ8J3c5ObLzdzTuab733Yw2ZmkpnJk8mZmZuZ90iv13tya2vr1iPEjs3NzVv6
+ /cFPIVRv7u7uXqOjSdMMBoOXIHoX9e3Zs8MHdTRpGgg+p6L/7ver9zY2Nq7TSaQphsPh7RD8h4pGVRew
+ hT+hk0lTRG2jrn8h+xQ+gBv1KaQJILZuG3H90u/3n9OnkFXZ3zbi6vdQt+lTySrMaBtxbWP6G/pUsgqQ
+ OattRFWdh+x79enkMBzcNiZ1GaJP4LnX6svIsixoG5MKYfA9evUj+jKyLJC4oG1M6io+lA9wmn6DvpSk
+ ktg24voxhHNP6ctJKqltI6r/UJ/LH590FiQFSEttG3H9HkJ1XGdBFnGItiGFLbo6qbMgKSzZNq5gK35d
+ X0qWAfJS2sZfOKR7Rl9CliWhbVxCfcUjjBWZ3zaqC71e705MP4rhbYpeEUicbhvfYCu/WSfLB0HRq7K3
+ bfR7GL5eJ02g6AaQthHC4JODfuWmaCco2gmKdoKinaBoJyjaCYp2gqKdoGgnIPhZinaAop2gaCco2gmK
+ dmIdorG8XX1YDt6ii5QseIouVrLgJbpoyYKH6OIlC9aiKVmZJzqEcE8Ig3flDgBM/w11RQuPq/MybbDg
+ zgA8l5JrYtHD4fDuPgbwbwcyP8PjY5B5l/x6LiWPZdx4mjynP5DX6Kz2gEmUHKOiv0PJjUIfQ9zkmo95
+ yHMg+SN5TQjVKzp6AiVPAbEnIOVX/L/0XbNoLY/LayH8HR01gpIjIOdVyL0ol4TpqKXRy8kuol7TUZRc
+ I/0UMrYh6WEddWhkHjKvukdTsgIRfRwpvK+DK4P5fSg7Q31MyWfODO+DiB1seY3dUK+hKjvo0/dTMsBh
+ 2ElsxZ/qYGPIPGXelAzkpAJf7WM62Bi9XvU8RH9NyQASfoDkh3SwMXRnKmeJlAwJl0+f/vImHWwMiQLC
+ vK9SMoCEf7DV7bvYfFUoOQISLtXHtE3CdhEx3jlxx2dKtodwOLU8ivP3O3Sw1ejXWk6DGz8Z0XnbSM4t
+ RhLr2vBptfzp0+G0GltyffNj62MkdYv7E2JWToqReci8ZJ7jYeOejAXUNz+2PkYSG8ULWM+fV/1Tp8xD
+ 5qWj7CXj05y6Z7rdMZJob29jPVf6o73MQ0eNkPetD+2I2kZdrY6RxPq+jHXclr6Kdczn5ycsaFbUQmtj
+ JKWfYkcYsI47qC8g/kXU6IdUOQWvquoBCD2OcZuYLh/IgT+kYvrTOmgHVuCAqAWfGMnZy3Yr+SDsRc9o
+ G3F1OkYS7210D4uLaCxoQUJLd2Mk3UQf3DYm1dkYSTfRWFBSsBN2PJ2MkXQTjYWkBDtJdTJG0kV0YtuI
+ q3Mxki6iU9tGVJ2LkXQRjQWkto24OhUjaS76EG1DqnMxkuail2wbnY2RrK+PNhONmae0jc7HSJqKTmgb
+ xcRImoqe3zbKi5E0FY0ZT7eNYmMkzUTvbRuMkTQTLW0jMEZygpnoFCjaCYp2okTRVVU9qqP8KE003m9j
+ VzstRUmi1wpFO0HRTlC0E7KDoGgHKNoJinaCop2gaCfWIRrL87k+uU14iy5SsuApuljJgpfooiULHqKL
+ lyxYi6ZkZZ5oxkg2TCx6OLpDlTGSJqhoxkhaArGMkbQEchgjaYn0U8hgjKQlEMEYSUsYI+kADsMYI2mN
+ nFTgq800LUsggTGS1kACYyStgQTGSFoDCXnGSOKAPJvwvfHOKcMdX07he1kfwmFLrm8Za3X4nn6t84uR
+ rMEC6lvGWh2+h/XLM0ZSwCc5dadpO8P3dIvLM0ZSiNpGXa0M38N65hkjWYMFzbpBvXXhe9hR5xkjKexv
+ G3H5hO+lAsF5xkgKM9pGXK0K35N+ih1hXjGSNVjgglwLu/C92ctzK7+bHPFpp8ThdC58D+9ndA+Lm2gs
+ MCkOB1/XToXvuYvGwlLicKQ6Fb7nKjqxbcTVmfA9V9GpbSOqzoTvuYrGglLbRlydCN9zE32ItiHVmfA9
+ N9FLto3Ohe+5icZCUtpGZ8P3XEQntI3Oh+/V10ebip7fNsoJ33MRjQVMt43iwvfMRe9tG+WG75mLlrYR
+ GL7n0zoWQdFOULQTFO0ERTtRkui1xEjWlCIa73M9MZI1JYhuBRTtRN2/KNoYinaCop2gaCco2ol1iMby
+ /K7qbAveoouULHiKLlay4CW6aMmCh+jiJQvWoilZmSea4XsNE4seju7rY/ieCSqa4XuWQCzD9yyBHIbv
+ WSL9FDIYvmcJRDB8zxKG7zmAwzCG71kjJxX4ajN8zxJIYPieNZDA8D1rIIHhe9ZAQp7hezkx3jlxx2cK
+ D+Ec0K91vuF7uQAR+Ybv5YJucfmG7+XCIPfwvVwIOYfv5QQE5xu+lxPST7EjzDN8b52M3+zaar23hpUA
+ tvjRPSwUbQxFO0HRTlC0ExTtBEU7QdFOULQTFO1EfX00RRtD0U5QtBMU7QRFO0HRTlC0ExTtBEU7UYte
+ a/heCYQwfCyE8Nb/So/944MyQeUAAAAASUVORK5CYII=
+
+
+
\ 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 077de69..921034a 100644
--- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
@@ -366,6 +366,12 @@
WayValve.cs
+
+ UserControl
+
+
+ Chuiqizhi.cs
+
UserControl
@@ -509,6 +515,9 @@
Wan.cs
+
+ Chuiqizhi.cs
+
Xie.cs
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/Chuiqizhi.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/Chuiqizhi.png
new file mode 100644
index 0000000..49f4d5c
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/Chuiqizhi.png differ
diff --git a/Controls/Mesnac.Controls.Feeding/Jzf.cs b/Controls/Mesnac.Controls.Feeding/Jzf.cs
index 6d13160..c864e82 100644
--- a/Controls/Mesnac.Controls.Feeding/Jzf.cs
+++ b/Controls/Mesnac.Controls.Feeding/Jzf.cs
@@ -131,8 +131,8 @@ namespace Mesnac.Controls.Feeding
{
Image img = Image.FromStream(_imageStream);
Size size = new Size();
- size.Width = 18;
- size.Height = 15;
+ size.Width = 13;
+ size.Height = 11;
this.Size = size;
if (bNewPic == true)
{
diff --git a/Main/MCEdit/Data/ComponentProperty.xml b/Main/MCEdit/Data/ComponentProperty.xml
index 4c3b606..624ce90 100644
--- a/Main/MCEdit/Data/ComponentProperty.xml
+++ b/Main/MCEdit/Data/ComponentProperty.xml
@@ -1684,6 +1684,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
index 4e459b4..e9f803d 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
@@ -1,6 +1,1524 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -325,21 +1758,21 @@
@@ -353,7 +1786,7 @@
@@ -369,49 +1802,49 @@
TurnOff
1627, 352
Jzf64
- 18, 15
+ 13, 11
@@ -1808,7 +3241,7 @@
True
MiddleCenter
MintCream
- 441, 245
+ 393, 245
SpecialLabelBlue465
3, 124
@@ -1825,10 +3258,10 @@
True
True
MiddleCenter
- MintCream
- 362, 273
+ Aqua
+ 352, 288
SpecialLabelBlue467
- 21, 3
+ 20, 1
-
-
@@ -1979,7 +3376,7 @@
TurnOff
75, 419
Jzf9
- 18, 15
+ 13, 11
-
-
-
-
-
-
@@ -2244,28 +3533,28 @@
ptUpToDown
ptTurnOff
- 460, 101
+ 412, 101
StraightTubeV28
5, 71
@@ -2274,7 +3563,7 @@
ptUpToDown
ptTurnOff
- 448, 102
+ 400, 102
StraightTubeV27
5, 65
@@ -2283,7 +3572,7 @@
ptUpToDown
ptTurnOff
- 408, 101
+ 360, 101
StraightTubeV23
5, 79
@@ -2292,14 +3581,14 @@
ptUpToDown
ptTurnOff
- 423, 101
+ 375, 101
StraightTubeV22
5, 68
@@ -2308,14 +3597,14 @@
ptUpToDown
ptTurnOff
- 322, 101
+ 298, 101
StraightTubeV35
5, 70
@@ -2324,7 +3613,7 @@
ptUpToDown
ptTurnOff
- 270, 101
+ 246, 101
StraightTubeV30
5, 84
@@ -2357,7 +3646,7 @@
True
True
MiddleCenter
- MintCream
+ Lime
1082, 233
SpecialLabelBlue492
3, 161
@@ -2375,10 +3664,10 @@
True
True
MiddleCenter
- MintCream
+ Yellow
1046, 235
SpecialLabelBlue493
- 3, 159
+ 3, 172
@@ -2797,23 +4086,23 @@
@@ -3844,9 +5133,9 @@
hxfLeft
fmTurnOff
- 472, 163
+ 424, 163
Diverter8
- 19, 24
+ 17, 22
@@ -3869,9 +5158,9 @@
hxfLeft
fmTurnOff
- 330, 161
+ 306, 161
Diverter9
- 22, 24
+ 20, 23
@@ -3919,7 +5208,7 @@
fmTurnOff
189, 167
Diverter10
- 22, 21
+ 20, 19