Merge branch 'Release2.4' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.4

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -762,8 +762,8 @@
 	  <Control name="col5" text="已检测视场总数" />
 	  <Control name="col6" text="分析标准库" />
 	  <Control name="col7" text="已检测特征" />
-	  <Control name="col8" text="视场面积(sq.μm)" />
-	  <Control name="col9" text="已分析特征总面积 (sq.μm)" />
+	  <Control name="col8" text="视场面积(μm" />
+	  <Control name="col9" text="已分析特征总面积 (μm" />
 	  <Control name="col10" text="已检测的特征面积比" />
 	  <Control name="col11" text="纳入指数/比例因子" />
 	  <Control name="col12" text="放大倍数" />

OTSIncAMeasureApp/Program.cs

@@ -12,14 +12,18 @@ namespace OTSMeasureApp
         [STAThread]
         static void Main()
         {
-            //判断是否有授权
-            //var reg = new CRegistration();
-            //if (!reg.RegistrationVerification())
-            //{
-            //    MessageBox.Show("Error: missing authorization");
-            //    System.Environment.Exit(0);
-            //    return;
-            //}
+            if (!System.Diagnostics.Debugger.IsAttached)
+            {
+                //判断是否有授权
+                var reg = new CRegistration();
+                if (!reg.RegistrationVerification())
+                {
+                    MessageBox.Show("Error: missing authorization");
+                    System.Environment.Exit(0);
+                    return;
+                }
+            }
+            
             //--------------------------只运行一个测量程序--------------------------------
 
             bool flag = false;

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -37,7 +37,6 @@ namespace OTSIncAReportGrids
         private void ResultGrid_Load(object sender, EventArgs e)
         {
             BindGrid();
-
             SetDataGridViewStyleIncLib();
 
         }
@@ -144,7 +143,7 @@ namespace OTSIncAReportGrids
             double filedsArea = Math.Round(high * wide * pixelSize* pixelSize*  filedCount, 2);
             int particleArea = fielddata.GetparticleArea();
 
-            double ratio = particleArea / filedsArea;
+            double ratio = Math.Round(particleArea / filedsArea*1000,3);
             int ScanFieldSize100 = Convert.ToInt32(((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["ScanFieldSize100"].ToString());
             int ScanFieldSize = Convert.ToInt32(((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["ScanFieldSize"].ToString());
             double Magnification = ScanFieldSize100 * 100 / ScanFieldSize;
@@ -178,8 +177,8 @@ namespace OTSIncAReportGrids
             }
             keyValues.Add(table["col6"].ToString(), LibraryName);
             keyValues.Add(table["col7"].ToString(), fielddata.GetparticleCount().ToString());
-            keyValues.Add(table["col8"].ToString(), filedsArea.ToString());
-            keyValues.Add(table["col9"].ToString(), particleArea.ToString());
+            keyValues.Add(table["col8"].ToString() + "\x00B2)", filedsArea.ToString());
+            keyValues.Add(table["col9"].ToString()+ "\x00B2)", particleArea.ToString());
             keyValues.Add(table["col10"].ToString(), ratio.ToString());
 
             keyValues.Add(table["col11"].ToString(), sizestr);
@@ -252,7 +251,7 @@ namespace OTSIncAReportGrids
                     break;
                 }
             }
-
+            
             keyValues.Add(table["col2"].ToString(), star.ToString("yyyy-MM-dd HH:mm:ss"));
             keyValues.Add(table["col3"].ToString(), end.ToString("yyyy-MM-dd HH:mm:ss"));
             keyValues.Add(table["col4"].ToString(), Math.Round(timeSpan.TotalMinutes, 2).ToString() + "mins");