Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3

FAQ/FAQ.docx

@@ -0,0 +1,13 @@
+1.git拉取成功但推送失败，报错304
+windows 凭据管理器 credential 删除git 用户名
+2.样品孔拍摄失败怎么办？
+将电镜放大倍数调成与样品孔拍照放大倍数一致
+3.带Bool返回值的函数在编程中应该添加接收判断
+4.牛津能谱采集不到图像，显示灰图怎么办？
+   在路径Release_oxford50\Config\ProData中找到配置文件HardwareConfig.xml,将文件中的"BSE"修改为"SE"后点击保存
+
+5.样品台移动失败
+增加延时时间ControlDelay数值，单位为毫秒
+
+6.如果能谱识别出的元素特别少
+重启能谱控制器单元（小盒子）

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -1540,18 +1540,20 @@ namespace OTSIncAReportGrids
                         vs.Add(dt_FIeld.Rows[i]["id"].ToString());
 
                         Image img = Image.FromFile(dt_FIeld.Rows[i]["fieldFullName"].ToString());
+                        //img.Save(@"D:\1.bmp");
                         Bitmap ls_fieldbp = new Bitmap(img.Width, img.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
                         using (Graphics g = Graphics.FromImage(ls_fieldbp))
                         {
                             g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
                             g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
                             g.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
-                            g.DrawImage(img, 0, 0);
+                            g.DrawImage(img, new Rectangle(0, 0, img.Width, img.Height));
                         }
-
+                        //ls_fieldbp.Save(@"D:\1.bmp");
                         img.Dispose();
                         img = null;
 
+                       
                         //循环将颗粒，进行标记到bitmap图上
                         DataRow[] drlist = dt_AllParticle.Select(dt_FIeld.Rows[i]["fieldid"].ToString());
                         if (drlist.Count() > 0)

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -1202,8 +1202,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr["e1"] = ClassName[i].ToString();
                     dr["e3"] = Math.Round(Area, 2);
                     //Convert.ToDouble(decimal.Parse(dt.Compute("sum(e3)", "").ToString()));
-                    dr["e4"] = Math.Round((Convert.ToDouble(dt.Rows[0]["e3"]) / totalInclusionArea) * 100, 2);
-                    dr["e5"] = Math.Round((Convert.ToDouble(dt.Rows[0]["e3"]) / Convert.ToDouble(m_list_dt.Where(aa => aa.TableName.Contains("ResultGrid")).ToList()[0].Rows[0][5])) * 100, 4);
+                    dr["e4"] = Math.Round((Convert.ToDouble(Area) / totalInclusionArea) * 100, 2);
+                    dr["e5"] = Math.Round((Convert.ToDouble(Area) / Convert.ToDouble(m_list_dt.Where(aa => aa.TableName.Contains("ResultGrid")).ToList()[0].Rows[0][5])) * 100, 4);
                     AllAnalysisDetails.Rows.Add(dr);
 
                     DataView dv = dt.DefaultView;