Procházet zdrojové kódy

更新报告导出程序,按照清洁度和夹杂物程序分别选择报告模板,分布图导出拼图功能改为后台线程并在log里显示进度

zhangjiaxin před 3 roky
rodič
revize
ec2a55863e

+ 10 - 1
OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -1114,8 +1114,17 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     DataRow dr = FrameGraphSubTable.NewRow();
                     dr["p1"] = newarr_p1;
                     newms_p1.Dispose();
+                    ResultFile resfile = m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.GetWorkingResult()];
+                    if (((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"].ToString() == "0:IncA")
+                    {
+                        dr["pid"] = str_fieldid + dt_ParticlesGridDevidePage.Rows[i_row]["particleid"].ToString();
+                    }
+                    else
+                    {
+                        dr["pid"] = /*str_fieldid + */dt_ParticlesGridDevidePage.Rows[i_row]["Hardness_detailed"].ToString();
+                    }
 
-                    dr["pid"] = /*str_fieldid + */dt_ParticlesGridDevidePage.Rows[i_row]["Hardness_detailed"].ToString();
+                    
                     dr["Size"] = Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["area"]).ToString("#0.00");  //可以需要选择切换,计算方式
                     dr["Width"] = dt_ParticlesGridDevidePage.Rows[i_row]["rectwidth"].ToString();
                     dr["DMAX"] = Math.Round(Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["dmax"]),2).ToString();