Explorar el Código

清洁度报告设置图表BUG修正优化

zhangjiaxin hace 7 meses
padre
commit
fb7ab6ac1d

+ 6 - 5
Bin/x64/Debug/Config/ReportTemplate/CleannessA_Template/ReportTemplateConfig.xml

@@ -11,7 +11,7 @@
     </str_bz>
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
-    <LOGName>null.png</LOGName>
+    <LOGName>white.png</LOGName>
     <StandardLibraryName>OTS_TC_Axia_per.db</StandardLibraryName>
   </M_SY>
   <M_YMYJ>
@@ -37,7 +37,7 @@
     <str_cb_klcc_ljb>j4.psf</str_cb_klcc_ljb>
   </M_KLFXJG>
   <M_YSFXJG>
-    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
+    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
     <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
@@ -114,11 +114,12 @@
     <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
     <index_cb_kllb_chartSort_p3>2</index_cb_kllb_chartSort_p3>
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
-    <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
+    <b_ck_kllb_fjzt>False</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
+      <YS0>C</YS0>
+      <YS1>O</YS1>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>
-    </str_kllb_qcys>
+    <str_kllb_qcys>C,O</str_kllb_qcys>
     <str_kllb_DeleteClass>misc,Other Non-Magnetic</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>

BIN
Bin/x64/Debug/Config/ReportTemplate/white.png


+ 17 - 3
OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -480,9 +480,23 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             {
                 fileName = route.Substring(lastIndexs + 1);
             }
-            Bitmap decoupledImage = DecoupleImageFromFile(route);
-            pictureBox7.Image = (Image)decoupledImage.Clone();
-            decoupledImage.Dispose();
+            try
+            {
+                Bitmap decoupledImage = DecoupleImageFromFile(route);
+                pictureBox7.Image = (Image)decoupledImage.Clone();
+                decoupledImage.Dispose();
+            }
+            catch
+            {
+                fileName = "white.png";
+                m_OTSReport_Export.m_mbszclass.M_SY.LOGName = fileName;
+                string route2 = System.IO.Directory.GetCurrentDirectory() + "\\Config\\ReportTemplate\\" + fileName;
+                Bitmap decoupledImage = DecoupleImageFromFile(route2);
+                pictureBox7.Image = (Image)decoupledImage.Clone();
+                decoupledImage.Dispose();
+            }
+            
+            
         }
         public static Bitmap DecoupleImageFromFile(string imagePath)
         {