change - 小料监控图重画完毕

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
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        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;
+    }
+}

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)
+        {
+
+        }
+    }
+}

Controls/Mesnac.Controls.ChemicalWeighing/Chuiqizhi.resx

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+</root>

Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj

@@ -366,6 +366,12 @@
     <Compile Include="WayValve.Designer.cs">
       <DependentUpon>WayValve.cs</DependentUpon>
     </Compile>
+    <Compile Include="Chuiqizhi.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Chuiqizhi.Designer.cs">
+      <DependentUpon>Chuiqizhi.cs</DependentUpon>
+    </Compile>
     <Compile Include="Xie.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -509,6 +515,9 @@
     <EmbeddedResource Include="Wan.resx">
       <DependentUpon>Wan.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Chuiqizhi.resx">
+      <DependentUpon>Chuiqizhi.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Xie.resx">
       <DependentUpon>Xie.cs</DependentUpon>
     </EmbeddedResource>

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)
                 {

Main/MCEdit/Data/ComponentProperty.xml

@@ -1684,6 +1684,15 @@
         <DataBinding>
         </DataBinding>
     </Component>
+    <Component Name="Chuiqizhi" Namespace="Mesnac.Controls.ChemicalWeighing" Asm="Mesnac.Controls.ChemicalWeighing.dll">
+      <Propertys>
+        <Property Name="Location" Caption="位置" Group=""/>
+        <Property Name="Name" Caption="名称" Group=""/>
+        <Property Name="Size" Caption="大小" Group=""/>
+      </Propertys>
+      <DataBinding>
+      </DataBinding>
+    </Component>
     <Component Name="SwitchLight" Namespace="Mesnac.Controls.ChemicalWeighing" Asm="Mesnac.Controls.ChemicalWeighing.dll">
         <Propertys>
             <Property Name="Location" Caption="λÖÃ" Group=""/>

Main/MCEdit/Data/SharpDevelopControlLibrary.xml

@@ -126,7 +126,8 @@
             
             <ToolComponent chineseName="分叉线" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.FenChaXian" />
             <ToolComponent chineseName="榄菊开关" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.LjSwith" />
-            <ToolComponent chineseName="榄菊3斜线" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.Xie" />
+            <ToolComponent chineseName="榄菊3吹气单向阀平" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.Xie" />
+            <ToolComponent chineseName="榄菊3吹气单向阀竖" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.Chuiqizhi" />
             <ToolComponent chineseName="榄菊开关灯" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.SwitchLight" />
             <ToolComponent chineseName="榄菊磨粉机" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.MoFenJi" />
             <ToolComponent chineseName="榄菊Host设备电机开关" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.SwithHostLight" />