修改报告导出BUG清洁度模式下切换库，名称不变的问题

Bin/x64/Debug/Config/ReportTemplate/TCleannessA_Template/ReportTemplateConfig.xml

@@ -12,7 +12,7 @@
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
     <LOGName>ReportIdentification.bmp</LOGName>
-    <StandardLibraryName>OTSCleanlinessSTD1.db</StandardLibraryName>
+    <StandardLibraryName>STD.db</StandardLibraryName>
     <str_tb_SampleName>
     </str_tb_SampleName>
     <str_tb_djsb>
@@ -142,11 +142,11 @@
     <b_ck_chart>False</b_ck_chart>
   </M_JZWZB>
   <whole>
-    <list_str_MainPriority>System.Collections.Generic.List`1[System.String]<YS0>Mullite</YS0><YS1>Ti-Zr-Al oxid</YS1><YS2>Ti-Al-Si oxide</YS2><YS3>Ti-Al oxide</YS3><YS4>A1-Si-Ca oxide</YS4><YS5>Al-Si-Zr-Ni oxide</YS5><YS6>Ca-Al oxide</YS6><YS7>Si-Mg-Al oxide</YS7><YS8>Al-silicate</YS8><YS9>Apatite MgAlSi</YS9><YS10>Corundum</YS10><YS11>Si-Zr oxide</YS11><YS12>Quartz</YS12><YS13>Mo-Fe-Co-Ni</YS13><YS14>Mg-Fe Silicate</YS14><YS15>Fe oxide</YS15><YS16>Monazite</YS16><YS17>Ca-Mg oxide</YS17><YS18>Xenotime</YS18><YS19>Rutile</YS19><YS20>Willemite</YS20><YS21>Fluorite</YS21><YS22>Periclase</YS22><YS23>Ilmenite</YS23></list_str_MainPriority>
+    <list_str_MainPriority>System.Collections.Generic.List`1[System.String]<YS0>Cu</YS0><YS1>Zn</YS1><YS2>Fe</YS2><YS3>Other Non-Magnetic</YS3></list_str_MainPriority>
     <list_str_SecondaryPriority>System.Collections.Generic.List`1[System.String]<YS0>Nialloy</YS0><YS1>Fe-O</YS1><YS2>Fe-Cr</YS2><YS3>Fe-alloy</YS3></list_str_SecondaryPriority>
-    <str_MainPriority>Mullite , Ti-Zr-Al oxid , Ti-Al-Si oxide , Ti-Al oxide , A1-Si-Ca oxide , Al-Si-Zr-Ni oxide , Ca-Al oxide , Si-Mg-Al oxide , Al-silicate , Apatite MgAlSi , Corundum , Si-Zr oxide , Quartz , Mo-Fe-Co-Ni , Mg-Fe Silicate , Fe oxide , Monazite , Ca-Mg oxide , Xenotime , Rutile , Willemite , Fluorite , Periclase , Ilmenite</str_MainPriority>
+    <str_MainPriority>Cu , Zn , Fe , Other Non-Magnetic</str_MainPriority>
     <str_SecondaryPriority>Nialloy,Fe-O,Fe-Cr,Fe-alloy</str_SecondaryPriority>
-    <list_str_MainPriority_Serial>System.Collections.Generic.List`1[System.String]<YS0>40001</YS0><YS1>40004</YS1><YS2>40006</YS2><YS3>40003</YS3><YS4>40010</YS4><YS5>40012</YS5><YS6>40013</YS6><YS7>40016</YS7><YS8>40014</YS8><YS9>40023</YS9><YS10>40002</YS10><YS11>40007</YS11><YS12>40009</YS12><YS13>40005</YS13><YS14>40008</YS14><YS15>40011</YS15><YS16>40015</YS16><YS17>40017</YS17><YS18>40018</YS18><YS19>40019</YS19><YS20>40020</YS20><YS21>40021</YS21><YS22>40022</YS22><YS23>40024</YS23></list_str_MainPriority_Serial>
+    <list_str_MainPriority_Serial>System.Collections.Generic.List`1[System.String]<YS0>40004</YS0><YS1>40007</YS1><YS2>40005</YS2><YS3>40006</YS3></list_str_MainPriority_Serial>
   </whole>
   <M_DZ>
     <Notes>

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="BatteryCleannessA">
+<XMLData RunMode="ProfessionalMode" SysType="TCCleannessA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="1" EngineType="0:InclustionEngine" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="MineralSpectrumSTDLib" SteelTechnology="0" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="50" start="0" />

Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="BatteryCleannessA">
+<XMLData systype="TCCleannessA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="ParticleCoordinate,Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation,XRayDataCount" />
   <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -372,9 +372,12 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             {
                 m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add(after[i]);
             }
-         
-            //主要优先显示
-            m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Clear();
+
+
+            m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName = comboBox1.Text;
+
+			//主要优先显示
+			m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Clear();
             m_OTSReport_Export.m_mbszclass.list_str_MainPriority = list_MainPriority.Copy();
   
 
@@ -846,7 +849,28 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             {
                 CurrentDatabase = comboBox1.Text;
                 SwitchCategories = true;
-            }
+                TCCleannessAList.Clear();
+                list_MainPriority.Clear();
+				DataTable dataTable = ReadClassification(comboBox1.SelectedIndex);
+                for (int i = 0; i < dataTable.Rows.Count; i++)
+                {
+                    TCCleannessAList.Add(dataTable.Rows[i][0].ToString());
+					list_MainPriority.Add(dataTable.Rows[i][1].ToString());
+				}
+				string str = "";
+				for (int i = 0; i < list_MainPriority.Count; i++)
+				{
+					if (i == list_MainPriority.Count - 1)
+					{
+						str = str + list_MainPriority[i];
+					}
+					else
+					{
+						str = str + list_MainPriority[i] + " , ";
+					}
+				}
+                textBox_zypxss.Text = str;
+			}
         }
     }
 }