临时提交

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/ParticleList.cs

@@ -207,6 +207,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                     bp_particle = fielddata.GetBitmapByParticle(bp_field, rectangle);
                     bp_particle.Tag = new List<string>() { dt_ParticlesGridDevidePage.Rows[i_row]["FieldId"].ToString(), dt_ParticlesGridDevidePage.Rows[i_row]["ParticleId"].ToString(), dt_ParticlesGridDevidePage.Rows[i_row]["TypeId"].ToString() };
                     //获取该颗粒的xray能谱图像
+                    ExportXRay(str_fieldid, str_particleid, fielddata);
                     System.Drawing.Bitmap bp_xraybp = ExportXRayBitmap(str_fieldid,
                             str_particleid, Convert.ToInt32(str_typeid), str_typename, fielddata);
                     Bitmap ls_xraybpnew = OTSIncAReportGraph.Class.DrawFunction.KiResizeImage(bp_xraybp, 700, 115);//能谱图处理
@@ -476,6 +477,35 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             data = dt;
             return true;
         }
+
+        private DataTable ExportXRay(string in_fieldid, string in_particleid, ParticleData particleData)
+        {
+            DataTable data = new DataTable();
+            data.Columns.Add("data");
+            uint[] Analysis_xray = new uint[2000];
+            //获取Xray数据
+            Particle list = particleData.GetParticleByFidAndPid(in_fieldid, in_particleid);
+            if (list == null)
+            {
+                return null;
+            }
+            Particle particle = list;
+            if (particle.XrayId > -1)
+            {
+                for (int i = 0; i < 2000; i++)
+                {
+                    if (particle.XRayData != null)
+                    {
+                        DataRow dr  = data.NewRow();
+                        dr["data"] = BitConverter.ToUInt32(particle.XRayData, i * 4);
+                        Analysis_xray[i] = BitConverter.ToUInt32(particle.XRayData, i * 4);
+                        data.Rows.Add(dr);
+                    }
+                }
+            }
+
+            return data;
+        }
         /// <summary>
         /// 输入颗粒的所在帧图id,颗粒id,颗粒类型id,获取对应的XRay能谱数据图
         /// </summary>