开启自动标定

App/NewCode/FrmAdjustQuotiety2.cs

@@ -74,7 +74,7 @@ namespace App
             panelCalibration.theMachine = theMachine;
             panelCalibration.theMachine = theMachine;
 
 
 
 
-            btnCalibration.Visible = false;
+            //btnCalibration.Visible = false;
         }
         }
 
 
         private void InputValueTimer_Tick(object sender, EventArgs e)
         private void InputValueTimer_Tick(object sender, EventArgs e)

App/NewCode/FrmAdjustQuotiety2.designer.cs

@@ -113,7 +113,7 @@
             this.panelTesting.Controls.Add(this.Y1);
             this.panelTesting.Controls.Add(this.Y1);
             this.panelTesting.Controls.Add(this.Y0);
             this.panelTesting.Controls.Add(this.Y0);
             this.panelTesting.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.panelTesting.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.panelTesting.Location = new System.Drawing.Point(380, 49);
+            this.panelTesting.Location = new System.Drawing.Point(472, 31);
             this.panelTesting.Name = "panelTesting";
             this.panelTesting.Name = "panelTesting";
             this.panelTesting.Size = new System.Drawing.Size(644, 378);
             this.panelTesting.Size = new System.Drawing.Size(644, 378);
             this.panelTesting.TabIndex = 166;
             this.panelTesting.TabIndex = 166;
@@ -712,7 +712,7 @@
             // 
             // 
             // panelCalibration
             // panelCalibration
             // 
             // 
-            this.panelCalibration.Location = new System.Drawing.Point(450, 93);
+            this.panelCalibration.Location = new System.Drawing.Point(380, 31);
             this.panelCalibration.Name = "panelCalibration";
             this.panelCalibration.Name = "panelCalibration";
             this.panelCalibration.Size = new System.Drawing.Size(1039, 578);
             this.panelCalibration.Size = new System.Drawing.Size(1039, 578);
             this.panelCalibration.TabIndex = 168;
             this.panelCalibration.TabIndex = 168;

App/NewCode/ucCalibration.cs

@@ -451,7 +451,7 @@ namespace App
                 if (UserCancel)
                 if (UserCancel)
                     return;
                     return;
 
 
-                
+                var washTime = Convert.ToInt32(fuction.GetParameterByParaName(Const.PARA_WASHTIME, "currency"));
                 CaliTask = Task.Factory.StartNew(() =>
                 CaliTask = Task.Factory.StartNew(() =>
                 {
                 {
                     ZedGraphInit(zgcShowCurve, false);
                     ZedGraphInit(zgcShowCurve, false);
@@ -494,7 +494,7 @@ namespace App
                             PrepareDataWash(result, s);
                             PrepareDataWash(result, s);
                             ZedGraphControlRefresh(zgcShowCurve);
                             ZedGraphControlRefresh(zgcShowCurve);
                             return false;
                             return false;
-                        }), 100);
+                        }), washTime);
                         theMachine.Close();
                         theMachine.Close();
                         this.Invoke((EventHandler)delegate
                         this.Invoke((EventHandler)delegate
                         {
                         {

App/Properties/AssemblyInfo.cs

@@ -30,6 +30,6 @@ using log4net.Config;
 //      内部版本号
 //      内部版本号
 //      修订号
 //      修订号
 //
 //
-[assembly: AssemblyVersion("3.3.5.0")]
-[assembly: AssemblyFileVersion("3.3.5.0")]
+[assembly: AssemblyVersion("3.3.6.0")]
+[assembly: AssemblyFileVersion("3.3.6.0")]
 [assembly: log4net.Config.DOMConfigurator(ConfigFileExtension = "config", Watch = true)]
 [assembly: log4net.Config.DOMConfigurator(ConfigFileExtension = "config", Watch = true)]