|
@@ -197,6 +197,120 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
+ //for (int i= 0;i < dt_ParticlesGridDevidePage.Rows.Count;i++)
|
|
|
+ //{
|
|
|
+ // //获取颗粒的fieldid,和particleid
|
|
|
+ // string str_fieldid = dt_ParticlesGridDevidePage.Rows[i]["fieldid"].ToString();
|
|
|
+ // string str_particleid = dt_ParticlesGridDevidePage.Rows[i]["particleid"].ToString();
|
|
|
+ // string str_subparticles = dt_ParticlesGridDevidePage.Rows[i]["SubParticles"].ToString();
|
|
|
+ // string str_typeid = dt_ParticlesGridDevidePage.Rows[i]["TypeId"].ToString();
|
|
|
+ // string str_typename = dt_ParticlesGridDevidePage.Rows[i]["TypeName"].ToString();
|
|
|
+ // string str_element = dt_ParticlesGridDevidePage.Rows[i]["Element"].ToString();
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // //获取原始颗粒图像
|
|
|
+ // Bitmap bp_particle = new Bitmap(1, 1);
|
|
|
+ // string str_path = str_resultPath + "\\FIELD_FILES\\";
|
|
|
+ // string str_imagePath = str_path + "Field" + str_fieldid.ToString() + ".bmp";
|
|
|
+
|
|
|
+ // if (str_subparticles != null && str_subparticles != "")
|
|
|
+ // {
|
|
|
+
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // //正常颗粒
|
|
|
+ // Rectangle rectangle = new Rectangle() { X = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i]["RectLeft"]), Y = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i]["RectTop"]), Width = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i]["RectWidth"]), Height = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i]["RectHeight"]) };
|
|
|
+ // Bitmap bp_field = fielddata.ReadImageFile(str_imagePath);
|
|
|
+ // bp_particle = fielddata.GetBitmapByParticle(bp_field, rectangle);
|
|
|
+ // bp_particle.Tag = new List<string>() { dt_ParticlesGridDevidePage.Rows[i]["FieldId"].ToString(), dt_ParticlesGridDevidePage.Rows[i]["ParticleId"].ToString(), dt_ParticlesGridDevidePage.Rows[i]["TypeId"].ToString() };
|
|
|
+
|
|
|
+
|
|
|
+ // if (fielddata.GetParticleByFidAndPid(str_fieldid, str_particleid).XRayData != null)
|
|
|
+ // {
|
|
|
+
|
|
|
+ // //获取该颗粒的xray能谱图像
|
|
|
+ // System.Drawing.Bitmap bp_xraybp = ExportXRayBitmap(str_fieldid,
|
|
|
+ // str_particleid, Convert.ToInt32(str_typeid), str_typename, fielddata);
|
|
|
+ // Bitmap ls_xraybpnew = new Bitmap(1, 1);
|
|
|
+ // ls_xraybpnew = OTSIncAReportGraph.Class.DrawFunction.KiResizeImage(bp_xraybp, 700, 115);//能谱图处理
|
|
|
+
|
|
|
+ // //获取该颗粒的二次放大处理图像
|
|
|
+ // Bitmap ls_processbitmap = new Bitmap(1, 1);
|
|
|
+ // ls_processbitmap = OTSIncAReportGraph.Class.DrawFunction.GetReZoomBitmap(bp_particle);// (Bitmap)bp_particle.Clone();//待完善
|
|
|
+
|
|
|
+ // //再将图像转成二进制流-------------------------------------------------------------------
|
|
|
+ // //原图
|
|
|
+ // MemoryStream newms_p1 = new MemoryStream();
|
|
|
+ // bp_particle.Save(newms_p1, System.Drawing.Imaging.ImageFormat.Bmp);
|
|
|
+ // newms_p1.Seek(0, SeekOrigin.Begin);
|
|
|
+ // byte[] newarr_p1 = new byte[newms_p1.Length];
|
|
|
+ // newms_p1.Read(newarr_p1, 0, newarr_p1.Length);
|
|
|
+
|
|
|
+ // //二次放大图
|
|
|
+ // MemoryStream newms_p2 = new MemoryStream();
|
|
|
+ // ls_processbitmap.Save(newms_p2, System.Drawing.Imaging.ImageFormat.Bmp);
|
|
|
+ // newms_p2.Seek(0, SeekOrigin.Begin);
|
|
|
+ // byte[] newarr_p2 = new byte[newms_p2.Length];
|
|
|
+ // newms_p2.Read(newarr_p2, 0, newarr_p2.Length);
|
|
|
+
|
|
|
+ // //能谱图
|
|
|
+ // MemoryStream newms_p3 = new MemoryStream();
|
|
|
+ // ls_xraybpnew.Save(newms_p3, System.Drawing.Imaging.ImageFormat.Bmp);
|
|
|
+ // newms_p3.Seek(0, SeekOrigin.Begin);
|
|
|
+ // byte[] newarr_p3 = new byte[newms_p3.Length];
|
|
|
+ // newms_p3.Read(newarr_p3, 0, newarr_p3.Length);
|
|
|
+ // //---------------------------------------------------------------------------------------
|
|
|
+ // DataRow dr = DT_Largest20.NewRow();
|
|
|
+
|
|
|
+ // dr["p1"] = newarr_p1;
|
|
|
+ // dr["p2"] = newarr_p2;
|
|
|
+ // dr["p3"] = newarr_p3;
|
|
|
+ // newms_p1.Dispose();
|
|
|
+ // newms_p2.Dispose();
|
|
|
+ // newms_p3.Dispose();
|
|
|
+
|
|
|
+ // dr["pid"] = str_fieldid + dt_ParticlesGridDevidePage.Rows[i]["particleid"].ToString();
|
|
|
+ // dr["Size"] = Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i]["area"]).ToString("#0.00"); //可以需要选择切换,计算方式
|
|
|
+ // dr["Width"] = dt_ParticlesGridDevidePage.Rows[i]["rectwidth"].ToString();
|
|
|
+ // dr["Class"] = dt_ParticlesGridDevidePage.Rows[i]["typename"].ToString();
|
|
|
+
|
|
|
+
|
|
|
+ // List<string> list_max_elementname = new List<string>();
|
|
|
+ // List<double> list_max_elementvale = new List<double>();
|
|
|
+ // GetMaxElementFromDataTable(dt_ParticlesGridDevidePage, i, out list_max_elementname, out list_max_elementvale);
|
|
|
+ // //元素1
|
|
|
+ // dr["ColName1"] = list_max_elementname[0];
|
|
|
+ // dr["ColVal1"] = list_max_elementvale[0].ToString();
|
|
|
+ // //元素2
|
|
|
+ // dr["ColName2"] = list_max_elementname[1];
|
|
|
+ // dr["ColVal2"] = list_max_elementvale[1].ToString();
|
|
|
+ // //元素3
|
|
|
+ // dr["ColName3"] = list_max_elementname[2];
|
|
|
+ // dr["ColVal3"] = list_max_elementvale[2].ToString();
|
|
|
+ // //元素4
|
|
|
+ // dr["ColName4"] = list_max_elementname[3];
|
|
|
+ // dr["ColVal4"] = list_max_elementvale[3].ToString();
|
|
|
+ // //元素5
|
|
|
+ // dr["ColName5"] = list_max_elementname[4];
|
|
|
+ // dr["ColVal5"] = list_max_elementvale[4].ToString();
|
|
|
+ // //元素6
|
|
|
+ // dr["ColName6"] = list_max_elementname[5];
|
|
|
+ // dr["ColVal6"] = list_max_elementvale[5].ToString();
|
|
|
+
|
|
|
+
|
|
|
+ // DT_Largest20.Rows.Add(dr);
|
|
|
+
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ //}
|
|
|
+
|
|
|
+
|
|
|
#region 插入-前20颗粒部份
|
|
|
for (int i_row = 0; i_row < 20; i_row++)
|
|
|
{
|
|
@@ -231,13 +345,16 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
|
|
|
{
|
|
|
//正常颗粒
|
|
|
Rectangle rectangle = new Rectangle() { X = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i_row]["RectLeft"]), Y = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i_row]["RectTop"]), Width = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i_row]["RectWidth"]), Height = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i_row]["RectHeight"]) };
|
|
|
- Bitmap bp_field = fielddata.ReadImageFile(str_imagePath);
|
|
|
- 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() };
|
|
|
- }
|
|
|
+ Bitmap bp_field = fielddata.ReadImageFile(str_imagePath);
|
|
|
+ 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能谱图像
|
|
|
- System.Drawing.Bitmap bp_xraybp = ExportXRayBitmap(str_fieldid,
|
|
|
+ //fielddata.GetParticleByFidAndPid(str_fieldid, str_particleid);
|
|
|
+
|
|
|
+
|
|
|
+ //获取该颗粒的xray能谱图像
|
|
|
+ System.Drawing.Bitmap bp_xraybp = ExportXRayBitmap(str_fieldid,
|
|
|
str_particleid, Convert.ToInt32(str_typeid), str_typename, fielddata);
|
|
|
Bitmap ls_xraybpnew = new Bitmap(1, 1);
|
|
|
ls_xraybpnew = OTSIncAReportGraph.Class.DrawFunction.KiResizeImage(bp_xraybp, 700, 115);//能谱图处理
|
|
@@ -305,7 +422,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
|
|
|
dr["ColName6"] = list_max_elementname[5];
|
|
|
dr["ColVal6"] = list_max_elementvale[5].ToString();
|
|
|
|
|
|
-
|
|
|
+
|
|
|
DT_Largest20.Rows.Add(dr);
|
|
|
}
|
|
|
}
|
|
@@ -1047,7 +1164,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
|
|
|
{
|
|
|
for (int i = 0; i < 2000; i++)
|
|
|
{
|
|
|
- Analysis_xray[i] = BitConverter.ToUInt32(particle.XRayData, i * 4);
|
|
|
+ if (particle.XRayData!=null)
|
|
|
+ {
|
|
|
+ Analysis_xray[i] = BitConverter.ToUInt32(particle.XRayData, i * 4);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
Search_xray = Analysis_xray;
|