diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
index 62ade74..3c5e168 100644
--- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
@@ -713,6 +713,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL0.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL0.png
new file mode 100644
index 0000000..b412ed4
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL0.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL1.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL1.png
new file mode 100644
index 0000000..7c21b55
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL1.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL2.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL2.png
new file mode 100644
index 0000000..92bc4cf
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCL2.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLAll.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLAll.png
new file mode 100644
index 0000000..3d905e3
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLAll.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLHError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLHError.png
new file mode 100644
index 0000000..a0cc50f
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLHError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLHVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLHVError.png
new file mode 100644
index 0000000..99a7227
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLHVError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLVError.png
new file mode 100644
index 0000000..db200b7
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCLVError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR0.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR0.png
new file mode 100644
index 0000000..280b6c6
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR0.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR1.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR1.png
new file mode 100644
index 0000000..babd01a
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR1.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR2.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR2.png
new file mode 100644
index 0000000..a362c5b
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCR2.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRAll.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRAll.png
new file mode 100644
index 0000000..d794f14
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRAll.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRHError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRHError.png
new file mode 100644
index 0000000..12973d3
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRHError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRHVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRHVError.png
new file mode 100644
index 0000000..f90131b
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRHVError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRVError.png
new file mode 100644
index 0000000..193f879
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValueCRVError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR0.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR0.png
new file mode 100644
index 0000000..976237b
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR0.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR1.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR1.png
new file mode 100644
index 0000000..ca0f9dc
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR1.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR2.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR2.png
new file mode 100644
index 0000000..7aeeaa0
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFR2.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRAll.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRAll.png
new file mode 100644
index 0000000..7639e7f
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRAll.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRHError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRHError.png
new file mode 100644
index 0000000..0985c5f
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRHError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRHVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRHVError.png
new file mode 100644
index 0000000..7fb8971
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRHVError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRVError.png
new file mode 100644
index 0000000..4264849
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFRVError.png differ
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs b/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs
index 07a37a1..e06437c 100644
--- a/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs
@@ -20,6 +20,9 @@ namespace Mesnac.Controls.ChemicalWeighing
private string[] sImages = new String[7];
private string[] sImagesL = new String[7];
private string[] sImagesR = new String[7];
+ private string[] sImagesCL = new String[7];
+ private string[] sImagesCR = new String[7];
+ private string[] sImagesFR = new String[7];
private bool _zltValue;
private bool _zldValue;
private bool _almtValue;
@@ -50,6 +53,7 @@ namespace Mesnac.Controls.ChemicalWeighing
//三个都通
sImages[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveAll.png";
+
sImagesL[0] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveL0.png";
//直通
sImagesL[1] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveL1.png";
@@ -64,6 +68,7 @@ namespace Mesnac.Controls.ChemicalWeighing
//三个都通
sImagesL[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveLAll.png";
+
sImagesR[0] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveR0.png";
//直通
sImagesR[1] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveR1.png";
@@ -79,6 +84,51 @@ namespace Mesnac.Controls.ChemicalWeighing
sImagesR[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveRAll.png";
+ sImagesCL[0] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCL0.png";
+ //直通
+ sImagesCL[1] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCL1.png";
+ //斜通
+ sImagesCL[2] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCL2.png";
+ //直通报警通知
+ sImagesCL[3] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCLHError.png";
+ //斜通报警通知
+ sImagesCL[4] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCLVError.png";
+ //都报警
+ sImagesCL[5] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCLHVError.png";
+ //三个都通
+ sImagesCL[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCLAll.png";
+
+
+ sImagesCR[0] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCR0.png";
+ //直通
+ sImagesCR[1] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCR1.png";
+ //斜通
+ sImagesCR[2] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCR2.png";
+ //直通报警通知
+ sImagesCR[3] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCRHError.png";
+ //斜通报警通知
+ sImagesCR[4] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCRVError.png";
+ //都报警
+ sImagesCR[5] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCRHVError.png";
+ //三个都通
+ sImagesCR[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveCRAll.png";
+
+
+ sImagesFR[0] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFR0.png";
+ //直通
+ sImagesFR[1] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFR1.png";
+ //斜通
+ sImagesFR[2] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFR2.png";
+ //直通报警通知
+ sImagesFR[3] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFRHError.png";
+ //斜通报警通知
+ sImagesFR[4] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFRVError.png";
+ //都报警
+ sImagesFR[5] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFRHVError.png";
+ //三个都通
+ sImagesFR[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFRAll.png";
+
+
}
@@ -143,6 +193,15 @@ namespace Mesnac.Controls.ChemicalWeighing
case 2:
_imageStream = _assembly.GetManifestResourceStream(sImagesR[defaultIndex]);
break;
+ case 3:
+ _imageStream = _assembly.GetManifestResourceStream(sImagesCL[defaultIndex]);
+ break;
+ case 4:
+ _imageStream = _assembly.GetManifestResourceStream(sImagesCR[defaultIndex]);
+ break;
+ case 5:
+ _imageStream = _assembly.GetManifestResourceStream(sImagesFR[defaultIndex]);
+ break;
default:
_imageStream = _assembly.GetManifestResourceStream(sImages[defaultIndex]);
break;
@@ -257,7 +316,7 @@ namespace Mesnac.Controls.ChemicalWeighing
}
///
- /// 控件种类 0斜通在下 1斜通在左 2斜通在右
+ /// 控件种类 0向右斜通在下 1向上斜通在左 2向上斜通在右 3向左斜通在上 4向右斜通在上 5向下斜通在右
///
public int ControlKind
{