Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/MDIBase.cs

@@ -1990,6 +1990,22 @@ namespace GcDevicePc
             }
         }
         /// <summary>
+        /// true 开始校准   false  强制结束
+        /// </summary>
+        /// <param name="boolrun"></param>
+        private void AutoAdjustRun(bool boolrun)
+        {
+            if(boolrun)
+            {
+                CurveDisPlay.curdisp.SetAutoAdjust();
+
+            }else
+            {
+                CurveDisPlay.curdisp.StopAutoAdjust();
+            }
+
+        }
+        /// <summary>
         /// 校准完成时间
         /// </summary>
 
@@ -2046,12 +2062,20 @@ namespace GcDevicePc
                     {
                         SharedSpace.MControl.SetOut = false;
                         SharedSpace.MControl.SetRun = false;
+                        if (SharedSpace.Data.typesint == 2)
+                        {
+                        CurveDisPlay.curdisp.ConfingAdjust();
+                        }
                         Trace.WriteLine("校准结束", "sys");
                     }
                     if(SharedSpace.MControl.MethodType==2)
                     {
                         SharedSpace.MControl.SetOut = false;
                         SharedSpace.MControl.SetRun = false;
+                        if (SharedSpace.Data.typesint == 2)
+                        {
+                            CurveDisPlay.curdisp.ConfingAdjust();
+                        }
                         Trace.WriteLine("校准结束", "sys");
                     }