Merge branch 'Release2.3' into lizhongdev

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -154,7 +154,6 @@ namespace OTSMeasureApp
         {
             try
             {
-
                 //try
                 //{
                 //    SenseShield.DogDecrypting.decrypting(101);//参数为许可号

OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -1,4 +1,5 @@
-using OTSIncAReportApp.OTSSampleReportInfo;
+using OTSIncAReportApp.DataOperation.DataAccess;
+using OTSIncAReportApp.OTSSampleReportInfo;
 using OTSIncAReportApp.SysMgrTools;
 using OTSIncAReportGraph.Class;
 using System;
@@ -187,14 +188,17 @@ namespace OTSIncAReportGrids
             }
             else
             {
+                FieldData fielddata = new FieldData(path);
                 Dictionary<string, object> sampleMembers = ((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"]);
                 Dictionary<string, object> semDataMsr = (Dictionary<string, object>)sampleMembers["SEMDataMsr"];
                 double scanFieldSize = Convert.ToDouble(semDataMsr["ScanFieldSize"]);
                 Dictionary<string, object> imageScanParam = (Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)sampleMembers["MsrParams"])["Members"])["ImageScanParam"];
                 string ImageResolution = imageScanParam["ImageResolution"].ToString();
-                double wide = Convert.ToDouble(ImageResolution.Split('_')[2]);
-                int filedCount = Convert.ToInt32(semDataMsr["TotalFields"]);
-                totalArea = scanFieldSize * wide * filedCount;
+                double wide = Convert.ToDouble(ImageResolution.Split('_')[1]);
+                double high = Convert.ToDouble(ImageResolution.Split('_')[2]);
+                double pixelSize = scanFieldSize / wide;
+                int filedCount = fielddata.GetFiledCount();
+                totalArea = high * pixelSize*wide* pixelSize * filedCount;
                 dt = particledata.GetParticleListByIncA(po);
             }
 

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -1469,70 +1469,6 @@ namespace OTSIncAReportGrids
             DirectoryInfo theFolder = new DirectoryInfo(str_path_FIELD_FILES);
             if (theFolder.Exists)
             {
-                //int numberOfPictures = 1;
-                //for (int i = 0; i < theFolder.GetFiles().Count() - 1; i++)
-                //{
-                //    //if (dt_AllParticle.Select("  fieldid = " + i.ToString()).Count() == 0)
-                //    //    continue;
-                //    if (numberOfPictures > 10)
-                //        continue;
-
-                //    if (dataTable.Select(" fieldid = " + i.ToString()).Count() > 0)
-                //    {
-                //        numberOfPictures++;
-                //        Image img = Image.FromFile(str_path_FIELD_FILES + theFolder.GetFiles()[i].Name);
-                //        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);
-                //        }
-
-                //        img.Dispose();
-                //        img = null;
-
-                //        //循环将颗粒，进行标记到bitmap图上
-                //        DataRow[] drlist = dt_AllParticle.Select("  fieldid = " + i.ToString());
-                //        for (int i_row = 0; i_row < drlist.Count(); i_row++)
-                //        {
-                //            //string str_fieldid = drlist[i_row]["fieldid"].ToString();
-                //            string str_particleid = drlist[i_row]["particleid"].ToString();
-                //            string str_stdtypeid = drlist[i_row]["typeid"].ToString();
-                //            string str_offset_rect_X = drlist[i_row]["RectLeft"].ToString();
-                //            string str_offset_rect_Y = drlist[i_row]["RectTop"].ToString();
-                //            string str_offset_rect_Width = drlist[i_row]["RectWidth"].ToString();
-                //            string str_offset_rect_Height = drlist[i_row]["RectHeight"].ToString();
-
-                //            //确定需要标记颗粒的定位
-                //            Rectangle offset_rect = new Rectangle(Convert.ToInt32(str_offset_rect_X), Convert.ToInt32(str_offset_rect_Y),
-                //    Convert.ToInt32(str_offset_rect_Width), Convert.ToInt32(str_offset_rect_Height));
-
-                //            //向帧图进行标记颗粒位置
-                //            Graphics g = Graphics.FromImage(ls_fieldbp);
-                //            g.DrawRectangle(new Pen(Color.Aquamarine), offset_rect);
-
-                //            //判断是否超出了图像外面，是的话，让文字在左侧显示，默认在右侧显示
-                //            int ls_offsetx = offset_rect.X + offset_rect.Width;
-                //            if (ls_offsetx > ls_fieldbp.Width - 10)
-                //            {
-                //                ls_offsetx = offset_rect.X - 10;
-                //            }
-                //            g.DrawString(i.ToString() + "" + str_particleid.ToString(),
-                //                new Font("黑体", 8), new SolidBrush(Color.Aqua), new PointF(ls_offsetx, offset_rect.Y));
-
-                //            //保存带有标记的帧图
-                //            ls_fieldbp.Save(str_path_FIELD_FILES_MARK + i.ToString() + ".bmp");
-
-                //            //ls_fieldbp.Dispose();
-                //        }
-                //    }
-
-
-                //}
-
-
 
                 //循环帧图，再循环各帧图中的颗粒，进行标记，保存
                 foreach (FileInfo nextifile in theFolder.GetFiles())

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -119,12 +119,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             int serialNumber = 1;
 
             //------------------加载模块,获取数据-------------------------------------------------
-            //if (m_otsreport_export.m_ReportApp.im_ParticlesGridDevidePage!=null)
             m_otsreport_export.m_ReportApp.im_ParticlesGridDevidePage = new ParticlesGridDevidePage(m_otsreport_export.m_ReportApp);
 
             //根据sql条件，查询获取颗粒信息数据
             ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath);
-            //DataTable dt_ParticlesGridDevidePage = fielddata.GetInfoForPartucleDevidePage(0, 200, "fieldid,particleid", "");
             DataTable dt = fielddata.GetIncaSurfaceData();
             //将颗粒大小排序（从大到小）
             DataView dv = dt.DefaultView;
@@ -340,36 +338,33 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             DirectoryInfo theFolder = new DirectoryInfo(str_path_FIELD_FILES_MARK);
             if (theFolder.Exists)
             {
-
-                foreach (FileInfo nextifile in theFolder.GetFiles())
+                for (int i = 0; i <= theFolder.GetFiles().Count(); i++)
                 {
-                    if (nextifile.Name.Contains(".bmp") == true || nextifile.Name.Contains(".BMP") == true)
+                    //判断i.bmp图片是否存在，如果不存在跳出当前循环
+                    if (!DetermineWhetherTheFileExists(theFolder, i))
+                        continue;
+                    //在数据表中有颗粒在该帧图中的话，则对该帧图标记图像进行读取存入数据库
+                    DataRow[] datarowlist = dt_ParticlesGridDevidePage.Select(" fieldid = " + i);
+                    if (datarowlist.Count() > 0)
                     {
-                        //确认对应的帧图名
-                        string str_fieldid = Path.GetFileNameWithoutExtension(nextifile.Name);
-
-                        //在数据表中有颗粒在该帧图中的话，则对该帧图标记图像进行读取存入数据库
-                        DataRow[] datarowlist = dt_ParticlesGridDevidePage.Select(" fieldid = " + str_fieldid);
-                        if (datarowlist.Count() > 0)
-                        {
-                            Bitmap ls_bp_fieldmark = new Bitmap(nextifile.FullName);
+                        Bitmap ls_bp_fieldmark = new Bitmap(theFolder.GetFiles()[i].FullName);
 
-                            DataRow dr = DT_field_dt.NewRow();
-                            MemoryStream newms_bp_fieldmark = new MemoryStream();
-                            ls_bp_fieldmark.Save(newms_bp_fieldmark, System.Drawing.Imaging.ImageFormat.Bmp);
-                            newms_bp_fieldmark.Seek(0, SeekOrigin.Begin);
-                            byte[] newarr_fieldmark = new byte[newms_bp_fieldmark.Length];
-                            newms_bp_fieldmark.Read(newarr_fieldmark, 0, newarr_fieldmark.Length);
-                            dr["FieldImg"] = newarr_fieldmark;
-                            dr["FieldId"] = str_fieldid;
+                        DataRow dr = DT_field_dt.NewRow();
+                        MemoryStream newms_bp_fieldmark = new MemoryStream();
+                        ls_bp_fieldmark.Save(newms_bp_fieldmark, System.Drawing.Imaging.ImageFormat.Bmp);
+                        newms_bp_fieldmark.Seek(0, SeekOrigin.Begin);
+                        byte[] newarr_fieldmark = new byte[newms_bp_fieldmark.Length];
+                        newms_bp_fieldmark.Read(newarr_fieldmark, 0, newarr_fieldmark.Length);
+                        dr["FieldImg"] = newarr_fieldmark;
+                        dr["FieldId"] = i;
 
-                            ls_bp_fieldmark.Dispose();
-                            DT_field_dt.Rows.Add(dr);
-
-                        }
+                        ls_bp_fieldmark.Dispose();
+                        DT_field_dt.Rows.Add(dr);
 
                     }
                 }
+
+               
             }
 
 
@@ -378,6 +373,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             #region 插入-前20颗粒外的颗粒
             for (int i_row = 0; i_row < dt_ParticlesGridDevidePage.Rows.Count; i_row++)
             {
+                if (dt_ParticlesGridDevidePage.Rows[i_row]["element"].ToString() == "")
+                    continue;
                 //获取颗粒的fieldid,和particleid
                 string str_fieldid = dt_ParticlesGridDevidePage.Rows[i_row]["fieldid"].ToString();
                 if (Convert.ToInt32(str_fieldid) < 20)
@@ -475,6 +472,19 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             return true;
         }
+
+        private bool DetermineWhetherTheFileExists(DirectoryInfo theFolder ,int id)
+        {
+            foreach (FileInfo nextifile in theFolder.GetFiles())
+            {
+                if (nextifile.Name.Contains(id.ToString()+".bmp") == true || nextifile.Name.Contains(id.ToString()+".BMP") == true)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         #endregion
 
         #region 插入颗粒尺寸表