更改测试参数的变量类型为float。

HOZProject/FormUnitControl.cs

@@ -1403,18 +1403,18 @@ namespace HOZProject
             cfm.PT = chkWPT.Checked;
             cfm.PTTemp = txtWPTF.Text;
             cfm.FIBTemp = txtWFIBF.Text;
-            cfm.Stretch_Magnification = Convert.ToDouble(cbbWLZ.Text);
-            cfm.Location_Magnification = Convert.ToDouble(cbbWQGF.Text);
-            cfm.Location_Voltage = Convert.ToDouble(cbbWQGD.Text);
-            cfm.Photograph_Magnification = Convert.ToDouble(cbbWPZF.Text);
-            cfm.Photograph_Voltage = Convert.ToDouble(cbbWPZD.Text);
+            cfm.Stretch_Magnification = Convert.ToSingle(cbbWLZ.Text);
+            cfm.Location_Magnification = Convert.ToSingle(cbbWQGF.Text);
+            cfm.Location_Voltage = Convert.ToSingle(cbbWQGD.Text);
+            cfm.Photograph_Magnification = Convert.ToSingle(cbbWPZF.Text);
+            cfm.Photograph_Voltage = Convert.ToSingle(cbbWPZD.Text);
             if(cbbWXZ.SelectedIndex==0)
             {
-                cfm.Correction_Angle = 36.0;
+                cfm.Correction_Angle = 36;
             }
             else
             {
-                cfm.Correction_Angle = 54.0;
+                cfm.Correction_Angle = 54;
             }
             
             cfm.SampleName = cbbWYP.Text;

MeasureData/MeasureParam.cs

@@ -68,48 +68,48 @@ namespace MeasureData
         }
 
         //拉直操作需要的放大位数
-        private double stretch_Magnification;
-        public double Stretch_Magnification
+        private float stretch_Magnification;
+        public float Stretch_Magnification
         {
             get { return this.stretch_Magnification; }
             set { this.stretch_Magnification = value; }
         }
 
         //定位切割位置的放大倍数
-        private double location_Magnification;
-        public double Location_Magnification
+        private float location_Magnification;
+        public float Location_Magnification
         {
             get { return this.location_Magnification; }
             set { this.location_Magnification = value; }
         }
 
         //定位切割位置的工作电压
-        private double location_Voltage;
-        public double Location_Voltage
+        private float location_Voltage;
+        public float Location_Voltage
         {
             get { return this.location_Voltage; }
             set { this.location_Voltage = value; }
         }
 
         //拍照的放大倍数
-        private double photograph_Magnification;
-        public double Photograph_Magnification
+        private float photograph_Magnification;
+        public float Photograph_Magnification
         {
             get { return this.photograph_Magnification; }
             set { this.photograph_Magnification = value; }
         }
 
         //拍照的工作电压
-        private double photograph_Voltage;
-        public double Photograph_Voltage
+        private float photograph_Voltage;
+        public float Photograph_Voltage
         {
             get { return this.photograph_Voltage; }
             set { this.photograph_Voltage = value; }
         }
 
         //校正角度选择
-        private double correction_Angle;
-        public double Correction_Angle
+        private float correction_Angle;
+        public float Correction_Angle
         {
             get { return this.correction_Angle; }
             set { this.correction_Angle = value; }
@@ -225,13 +225,13 @@ namespace MeasureData
 
                 this.m_fMode = focusmode.value();
 
-                this.stretch_Magnification = stretchMagnification.value();
-                this.location_Magnification = locationMagnification.value();
-                this.location_Voltage = locationVoltage.value();
-                this.photograph_Magnification = photographMagnification.value();
-                this.photograph_Voltage = photographVoltage.value();
+                this.stretch_Magnification = Convert.ToSingle(stretchMagnification.value());
+                this.location_Magnification = Convert.ToSingle(locationMagnification.value());
+                this.location_Voltage = Convert.ToSingle(locationVoltage.value());
+                this.photograph_Magnification = Convert.ToSingle(photographMagnification.value());
+                this.photograph_Voltage = Convert.ToSingle(photographVoltage.value());
 
-                this.correction_Angle = correctionAngle.value();
+                this.correction_Angle = Convert.ToSingle(correctionAngle.value());
 
                 this.m_SampleName = sampleType.value();
                 this.firm = _firm.value();

MeasureThread/Measure.cs

@@ -726,7 +726,7 @@ namespace MeasureThread
             //13.自动定位切割
             {
                 //1.控制SEM放大600X
-                if (!iSEM.SetMagnification(600))
+                if (!iSEM.SetMagnification(m_measureFile.MParam.Photograph_Magnification))
                 {
                     return false;
                 }
@@ -777,10 +777,11 @@ namespace MeasureThread
                     arg.Picture_Information.Picture_FullPath = fileName1;
                     if (!GetImage(ImageMode.SEM, fileName1))
                     {
-                        SendMsg("SEM拍照失败");
+                        arg.Message = "SEM拍照失败";
+                        SendMsg("1-3");
                         return false;
                     }
-                    arg.Message = "SEM拍照";
+                    arg.Message = "SEM拍照成功";
                     SendMsg("1-3");
                     Thread.Sleep(3000);
                 }