朝上瓶子bug修复

HZH_Controls/HZH_Controls/Controls/FactoryControls/Blower/UCBlower.cs

@@ -117,9 +117,7 @@ namespace HZH_Controls.Controls
             get { return turnAround; }
             set
             {
-                turnAround = value;
-                if (ControlHelper.IsDesignMode())
-                    return;
+                turnAround = value;               
                 if (value == HZH_Controls.Controls.TurnAround.None)
                 {
                     timer1.Enabled = false;
@@ -144,9 +142,7 @@ namespace HZH_Controls.Controls
             {
                 if (value < 100 || value > 1000)
                     return;
-                turnSpeed = value;
-                if (ControlHelper.IsDesignMode())
-                    return;
+                turnSpeed = value;               
                 timer1.Interval = value;
             }
         }

HZH_Controls/HZH_Controls/Controls/FactoryControls/Bottle/UCBottle.cs

@@ -414,11 +414,13 @@ namespace HZH_Controls.Controls
                         new PointF((float)(m_workingRect.Left+(decYTHeight-(m_workingRect.Height-15)))+3,(float)(m_workingRect.Bottom-decYTHeight)),                   
                         new PointF((float)(m_workingRect.Right-(decYTHeight-(m_workingRect.Height-15)))-3,(float)(m_workingRect.Bottom-decYTHeight)),  
                         new PointF(m_workingRect.Right-1, m_workingRect.Top+15),
+                        new PointF(m_workingRect.Right-1, m_workingRect.Bottom),
+                        new PointF(m_workingRect.Left, m_workingRect.Bottom),
                         new PointF(m_workingRect.Left, m_workingRect.Top+15),
                     };
                     pathYT.AddLines(psYT);
                     pathYT.CloseAllFigures();
-                    rectYT = new Rectangle(m_workingRect.Left + (int)(decYTHeight - (m_workingRect.Height - 15)) + 3, (int)(m_workingRect.Bottom - decYTHeight), m_workingRect.Width - (int)(decYTHeight - (m_workingRect.Height - 15)) * 2 - 8, 10);
+                    rectYT = new Rectangle(m_workingRect.Left + (int)(decYTHeight - (m_workingRect.Height - 15)) +1, (int)(m_workingRect.Bottom - decYTHeight - 4), m_workingRect.Width - (int)(decYTHeight - (m_workingRect.Height - 15)) * 2-2 , 10);
                 }
                 else
                 {

HZH_Controls/Test/UC/UCTestConduit.Designer.cs

@@ -445,9 +445,9 @@
             this.ucBottle2.NO = "1#";
             this.ucBottle2.Size = new System.Drawing.Size(73, 150);
             this.ucBottle2.TabIndex = 53;
-            this.ucBottle2.Title = "12345";
+            this.ucBottle2.Title = "";
             this.ucBottle2.Value = new decimal(new int[] {
-            50,
+            90,
             0,
             0,
             0});
@@ -470,7 +470,7 @@
             this.ucBottle1.TabIndex = 53;
             this.ucBottle1.Title = "";
             this.ucBottle1.Value = new decimal(new int[] {
-            50,
+            10,
             0,
             0,
             0});
@@ -505,7 +505,7 @@
             this.ucBlower4.Name = "ucBlower4";
             this.ucBlower4.Size = new System.Drawing.Size(116, 154);
             this.ucBlower4.TabIndex = 62;
-            this.ucBlower4.TurnAround = HZH_Controls.Controls.TurnAround.None;
+            this.ucBlower4.TurnAround = HZH_Controls.Controls.TurnAround.Clockwise;
             this.ucBlower4.TurnSpeed = 100;
             // 
             // UCTestConduit