增加对UPH的显示功能

Rs.DeweyTester/BaseForm.cs

@@ -48,12 +48,12 @@ namespace Rs.MotionPlat
                 if (double.TryParse(value, out double dValue))
                 {
                     SysConfigParam.Update(txtSysParam.Name.Replace("txt", ""), dValue.ToString());
-                    SysConfigParam.Init();
+                    //SysConfigParam.Init();
                 }
                 else
                 {
                     SysConfigParam.Update(txtSysParam.Name.Replace("txt", ""), value.ToString());
-                    SysConfigParam.Init();
+                    //SysConfigParam.Init();
                 }
             }
             catch (Exception)

Rs.DeweyTester/Commom/GlobalVar.cs

@@ -21,6 +21,18 @@ namespace Rs.Framework
     public static class GlobalVar
     {
         #region newpro
+        
+        /// <summary>
+        /// 启用料仓
+        /// </summary>
+        [ParameterInit("int", "5", "system", "启用料仓")]
+        public static int UphRefreshCycle
+        {
+            get
+            {
+                return SysConfigParam.GetValue<int>(nameof(UphRefreshCycle));
+            }
+        }
 
         /// <summary>
         /// 启用料仓

Rs.DeweyTester/FormMain.cs

@@ -256,6 +256,7 @@ namespace Rs.MotionPlat
             timertc4.Enabled = true;
             timertc5.Enabled = true;
             timertc6.Enabled = true;
+            timeruph.Enabled = true;
             BindParameter();
             //if (!string.IsNullOrEmpty(GlobalUser.UserName))
             //{
@@ -776,5 +777,20 @@ namespace Rs.MotionPlat
             textBox.Text = msg.ToString();
             //textBox.Select(msg.Length, 0);
         }
+
+        private void timer3_Tick_1(object sender, EventArgs e)
+        {
+            DateTime start = DateTime.Now.AddMinutes(GlobalVar.UphRefreshCycle*-1);
+            string querySql = $"select count(0) from records where placetime >= '{start}'";
+            DataSet ds = MySqlHelper.GetDataSet(querySql);
+            if(ds!=null && ds.Tables.Count>0)
+            {
+                if(int.TryParse(ds.Tables[0].Rows[0][0].ToString(),out int totalNum))
+                {
+                    int uph = (int)(((double)totalNum / GlobalVar.UphRefreshCycle) * 60);
+                    lblAvgUpg.Text = uph.ToString();
+                }
+            }
+        }
     }
 }

Rs.DeweyTester/FormMain.designer.cs

@@ -106,10 +106,12 @@ namespace Rs.MotionPlat
             this.btnBuzzer = new System.Windows.Forms.Button();
             this.trayNozzle = new Rs.Controls.RsTray();
             this.groupBox38 = new System.Windows.Forms.GroupBox();
+            this.lblAvgUpg = new System.Windows.Forms.Label();
             this.lblTotalYield = new System.Windows.Forms.Label();
             this.lblNgNum = new System.Windows.Forms.Label();
             this.lblPassNum = new System.Windows.Forms.Label();
             this.lblTotalNum = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
             this.label13 = new System.Windows.Forms.Label();
             this.label11 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
@@ -159,6 +161,7 @@ namespace Rs.MotionPlat
             this.timertc4 = new System.Windows.Forms.Timer(this.components);
             this.timertc5 = new System.Windows.Forms.Timer(this.components);
             this.timertc6 = new System.Windows.Forms.Timer(this.components);
+            this.timeruph = new System.Windows.Forms.Timer(this.components);
             this.panel1.SuspendLayout();
             this.tableLayoutPanel3.SuspendLayout();
             this.panel3.SuspendLayout();
@@ -1234,10 +1237,12 @@ namespace Rs.MotionPlat
             // 
             // groupBox38
             // 
+            this.groupBox38.Controls.Add(this.lblAvgUpg);
             this.groupBox38.Controls.Add(this.lblTotalYield);
             this.groupBox38.Controls.Add(this.lblNgNum);
             this.groupBox38.Controls.Add(this.lblPassNum);
             this.groupBox38.Controls.Add(this.lblTotalNum);
+            this.groupBox38.Controls.Add(this.label10);
             this.groupBox38.Controls.Add(this.label13);
             this.groupBox38.Controls.Add(this.label11);
             this.groupBox38.Controls.Add(this.label7);
@@ -1252,6 +1257,16 @@ namespace Rs.MotionPlat
             this.groupBox38.TabStop = false;
             this.groupBox38.Text = "Statistics info";
             // 
+            // lblAvgUpg
+            // 
+            this.lblAvgUpg.AutoSize = true;
+            this.lblAvgUpg.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.lblAvgUpg.Location = new System.Drawing.Point(630, 26);
+            this.lblAvgUpg.Name = "lblAvgUpg";
+            this.lblAvgUpg.Size = new System.Drawing.Size(11, 12);
+            this.lblAvgUpg.TabIndex = 14;
+            this.lblAvgUpg.Text = "0";
+            // 
             // lblTotalYield
             // 
             this.lblTotalYield.AutoSize = true;
@@ -1292,6 +1307,16 @@ namespace Rs.MotionPlat
             this.lblTotalNum.TabIndex = 14;
             this.lblTotalNum.Text = "0";
             // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.label10.Location = new System.Drawing.Point(574, 26);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(29, 12);
+            this.label10.TabIndex = 14;
+            this.label10.Text = "Uph:";
+            // 
             // label13
             // 
             this.label13.AutoSize = true;
@@ -1839,6 +1864,11 @@ namespace Rs.MotionPlat
             this.timertc6.Interval = 500;
             this.timertc6.Tick += new System.EventHandler(this.timertc6_Tick);
             // 
+            // timeruph
+            // 
+            this.timeruph.Interval = 3000;
+            this.timeruph.Tick += new System.EventHandler(this.timer3_Tick_1);
+            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -2016,5 +2046,8 @@ namespace Rs.MotionPlat
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.Label label11;
         private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label lblAvgUpg;
+        private System.Windows.Forms.Timer timeruph;
     }
 }

Rs.DeweyTester/FormMain.resx

@@ -153,4 +153,7 @@
   <metadata name="timertc6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>691, 17</value>
   </metadata>
+  <metadata name="timeruph.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>792, 17</value>
+  </metadata>
 </root>

Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs

@@ -60,12 +60,14 @@
             this.txtMachineID = new System.Windows.Forms.TextBox();
             this.label5 = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtUphRefreshCycle = new System.Windows.Forms.TextBox();
             this.cboxMsgShowEn = new System.Windows.Forms.CheckBox();
             this.cboxMsgShowCn = new System.Windows.Forms.CheckBox();
             this.txtSimulateTestYield = new System.Windows.Forms.TextBox();
             this.txtSimulateTestTime = new System.Windows.Forms.TextBox();
             this.label13 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.panelEx1 = new Rs.Controls.PanelEx();
@@ -371,12 +373,14 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.txtUphRefreshCycle);
             this.groupBox1.Controls.Add(this.cboxMsgShowEn);
             this.groupBox1.Controls.Add(this.cboxMsgShowCn);
             this.groupBox1.Controls.Add(this.txtSimulateTestYield);
             this.groupBox1.Controls.Add(this.txtSimulateTestTime);
             this.groupBox1.Controls.Add(this.label13);
             this.groupBox1.Controls.Add(this.label10);
+            this.groupBox1.Controls.Add(this.label9);
             this.groupBox1.Controls.Add(this.label12);
             this.groupBox1.Controls.Add(this.label7);
             this.groupBox1.Controls.Add(this.panelEx1);
@@ -414,6 +418,12 @@
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
+            // txtUphRefreshCycle
+            // 
+            resources.ApplyResources(this.txtUphRefreshCycle, "txtUphRefreshCycle");
+            this.txtUphRefreshCycle.Name = "txtUphRefreshCycle";
+            this.txtUphRefreshCycle.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
+            // 
             // cboxMsgShowEn
             // 
             resources.ApplyResources(this.cboxMsgShowEn, "cboxMsgShowEn");
@@ -448,6 +458,11 @@
             resources.ApplyResources(this.label10, "label10");
             this.label10.Name = "label10";
             // 
+            // label9
+            // 
+            resources.ApplyResources(this.label9, "label9");
+            this.label9.Name = "label9";
+            // 
             // label12
             // 
             resources.ApplyResources(this.label12, "label12");
@@ -944,5 +959,7 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Button btnSaveRelCategory;
         private System.Windows.Forms.CheckBox cboxEnableStock;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.TextBox txtUphRefreshCycle;
     }
 }

Rs.DeweyTester/SysConfig/CommonConfig.resx

@@ -993,6 +993,27 @@
   <data name="&gt;&gt;groupBox3.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="txtUphRefreshCycle.Location" type="System.Drawing.Point, System.Drawing">
+    <value>155, 109</value>
+  </data>
+  <data name="txtUphRefreshCycle.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 21</value>
+  </data>
+  <data name="txtUphRefreshCycle.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
+  <data name="&gt;&gt;txtUphRefreshCycle.Name" xml:space="preserve">
+    <value>txtUphRefreshCycle</value>
+  </data>
+  <data name="&gt;&gt;txtUphRefreshCycle.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtUphRefreshCycle.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtUphRefreshCycle.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="cboxMsgShowEn.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -1024,7 +1045,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxMsgShowEn.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="cboxMsgShowCn.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1057,7 +1078,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxMsgShowCn.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="txtSimulateTestYield.Location" type="System.Drawing.Point, System.Drawing">
     <value>386, 142</value>
@@ -1078,7 +1099,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtSimulateTestYield.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="txtSimulateTestTime.Location" type="System.Drawing.Point, System.Drawing">
     <value>386, 107</value>
@@ -1099,7 +1120,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtSimulateTestTime.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1129,7 +1150,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="label10.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1162,7 +1183,37 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
+  </data>
+  <data name="label9.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label9.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
+    <value>50, 113</value>
+  </data>
+  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="label9.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="label9.Text" xml:space="preserve">
+    <value>UPH刷新周期:</value>
+  </data>
+  <data name="&gt;&gt;label9.Name" xml:space="preserve">
+    <value>label9</value>
+  </data>
+  <data name="&gt;&gt;label9.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label9.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
+    <value>7</value>
   </data>
   <data name="label12.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1192,7 +1243,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1222,7 +1273,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="btnSaveSpeedParam.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
@@ -1339,7 +1390,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;panelEx1.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
   </data>
   <data name="tbarFlyCameraSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -1366,7 +1417,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;tbarFlyCameraSpeed.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
   </data>
   <data name="tbarTakeTrayFromNg2InputSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -1393,7 +1444,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;tbarTakeTrayFromNg2InputSpeed.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="cboxEnableTC6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1423,7 +1474,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC6.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>13</value>
   </data>
   <data name="cboxEnableTC4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1453,7 +1504,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC4.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>14</value>
   </data>
   <data name="cboxEnableTC5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1483,7 +1534,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC5.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>15</value>
   </data>
   <data name="cboxEnableTC3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1513,7 +1564,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC3.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>16</value>
   </data>
   <data name="cboxEnableTC2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1543,7 +1594,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC2.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>17</value>
   </data>
   <data name="cboxEnableTC1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1573,7 +1624,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC1.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>18</value>
   </data>
   <data name="cboxEnableVirtualBarCode.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1603,7 +1654,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableVirtualBarCode.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>19</value>
   </data>
   <data name="cboxEnableBeforePlaceTrayToOkGrab.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1633,7 +1684,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableBeforePlaceTrayToOkGrab.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>20</value>
   </data>
   <data name="cboxEnableOkTrayCheckFull.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1663,7 +1714,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableOkTrayCheckFull.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>21</value>
   </data>
   <data name="cboxEnableBeforePlaceProductGrab.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1693,7 +1744,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableBeforePlaceProductGrab.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>22</value>
   </data>
   <data name="cboxDisableBuzzer.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1723,7 +1774,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxDisableBuzzer.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>23</value>
   </data>
   <data name="cboxCheckVisionSwOpened.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1753,7 +1804,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxCheckVisionSwOpened.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>24</value>
   </data>
   <data name="cboxIsSimTest.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1783,7 +1834,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxIsSimTest.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>25</value>
   </data>
   <data name="cboxPrintTC6Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1816,7 +1867,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC6Communicate.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>26</value>
   </data>
   <data name="cboxPrintTC3Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1849,7 +1900,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC3Communicate.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>27</value>
   </data>
   <data name="cboxPrintTC5Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1882,7 +1933,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC5Communicate.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>28</value>
   </data>
   <data name="cboxPrintTC2Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1915,7 +1966,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC2Communicate.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>29</value>
   </data>
   <data name="cboxPrintTC4Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1948,7 +1999,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC4Communicate.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>30</value>
   </data>
   <data name="cboxPrintTC1Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1981,7 +2032,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC1Communicate.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>31</value>
   </data>
   <data name="cboxDisableDoor.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2011,7 +2062,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxDisableDoor.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>32</value>
   </data>
   <data name="tbarWholeSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2038,7 +2089,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;tbarWholeSpeed.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>33</value>
   </data>
   <data name="label16.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2068,7 +2119,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>34</value>
   </data>
   <data name="lblFlyCameraSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2098,7 +2149,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;lblFlyCameraSpeed.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>35</value>
   </data>
   <data name="label15.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2128,7 +2179,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>36</value>
   </data>
   <data name="lblTakeTrayFromNg2InputSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2158,7 +2209,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;lblTakeTrayFromNg2InputSpeed.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>37</value>
   </data>
   <data name="lblWholeSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2188,7 +2239,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;lblWholeSpeed.ZOrder" xml:space="preserve">
-    <value>36</value>
+    <value>38</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2218,7 +2269,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>37</value>
+    <value>39</value>
   </data>
   <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>