Merge branch 'release2.1' into release2.2

OTSIncAMeasureApp/About.cs

@@ -20,7 +20,7 @@ namespace OTSMeasureApp
         private void About_Load(object sender, EventArgs e)
         {
 
-            richTextBox1.Text = "Version Current : 2.1";
+            richTextBox1.Text = "Version : 2.1";
             richTextBox1.Select(0, richTextBox1.Text.Length);
             //richTextBox1.SelectionColor = Color.DarkBlue;
             richTextBox1.SelectionAlignment = HorizontalAlignment.Center;

OTSIncAReportApp/Control_Grids/ParticlesGridDevidePage.cs

@@ -590,14 +590,14 @@ namespace OTSIncAReportGrids
                             string subt = particles.Rows[i]["SubParticles"].ToString();
                             if (subt != null && subt != "")
                             {
-                                double ScanFieldSize = 1142;
-                                //double ScanFieldSize = Convert.ToDouble(((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["ScanFieldSize"]);
+                                double ScanFieldSize = Convert.ToDouble(((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["ScanFieldSize"]);
                                 string filePatht = result.FilePath + "\\FIELD_FILES\\";
                                 string imagePatht = filePatht + "Field" + subt.Split(',')[0].Split(':')[0].ToString() + ".bmp";
                                 //然后将取出的数据，转换成Bitmap对象
                                 Bitmap tempbit = fielddata.ReadImageFile(imagePatht);
                                 int pixw = tempbit.Width;
                                 double xs = pixw / ScanFieldSize;
+
                                 particleM = particleM + "," + subt;
                                 Bitmap bmap = fielddata.GetBitmapForBig(subt, xs, result.FilePath);
                                 if (bmap != null)