Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2

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

@@ -1,7 +1,7 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>有限公司</str_tb_FBT>
+    <str_tb_FBT>XXXXXX有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
     <str_tb_CKBZ>
     </str_tb_CKBZ>
@@ -12,7 +12,13 @@
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
     <LOGName>white.png</LOGName>
-    <StandardLibraryName>OTS_TC_Axia_per.db</StandardLibraryName>
+    <StandardLibraryName>Cleanness_F.db</StandardLibraryName>
+    <str_tb_SampleName>
+    </str_tb_SampleName>
+    <str_tb_djsb>
+    </str_tb_djsb>
+    <str_tb_npsb>
+    </str_tb_npsb>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -35,6 +41,8 @@
     <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
     <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
     <str_cb_klcc_ljb>j4.psf</str_cb_klcc_ljb>
+    <ParticleSizeGraphicSelection>0</ParticleSizeGraphicSelection>
+    <INCAGraphicSelection>0</INCAGraphicSelection>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
@@ -102,9 +110,9 @@
     <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
     <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
     <index_cb_kllb_sort>2</index_cb_kllb_sort>
-    <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
+    <index_cb_kllb_sort_p1>0</index_cb_kllb_sort_p1>
+    <str_cb_kllb_sort_p2>DMAX</str_cb_kllb_sort_p2>
+    <index_cb_kllb_sort_p2>1</index_cb_kllb_sort_p2>
     <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
     <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
     <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
@@ -113,7 +121,7 @@
     <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
     <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>
+    <str_cb_kllb_sort_p1>Area</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>False</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
       <YS0>C</YS0>
@@ -125,7 +133,7 @@
       <YS0>misc</YS0>
       <YS1>Other Non-Magnetic</YS1>
     </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>20</list_int_kllb_number>
+    <list_int_kllb_number>10</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
@@ -135,11 +143,12 @@
     <b_ck_chart>False</b_ck_chart>
   </M_JZWZB>
   <whole>
-    <list_str_MainPriority>System.Collections.Generic.List`1[System.String]<YS0>Glass</YS0><YS1>Glass</YS1><YS2>Si Rich</YS2><YS3>Al-Alloy</YS3><YS4>Oxidized Al</YS4><YS5>Al2O3 with S</YS5><YS6>Al2O3</YS6><YS7>Al-Rich</YS7><YS8>SiO2</YS8><YS9>W Rich (W-C)</YS9><YS10>Aluminosilicates</YS10><YS11>Ca-Aluminosilicates</YS11><YS12>High Ca</YS12><YS13>Mn-P Coating</YS13><YS14>Cr Coating</YS14><YS15>Zn-Cr Coating</YS15><YS16>Zn Coating</YS16><YS17>Zn-P Coating</YS17><YS18>Zn-Cu</YS18><YS19>Steel(Fe&gt;40)</YS19><YS20>Steel(FeCrNi)</YS20><YS21>Steel(Fe&gt;60)</YS21><YS22>Steel(Fe&gt;20)</YS22><YS23>Flourinated</YS23><YS24>Brass</YS24><YS25>Bronze CuSn</YS25><YS26>Non-Ferrous Metal</YS26><YS27>Misc Salts</YS27><YS28>Mineral Fiber</YS28><YS29>Mineral</YS29><YS30>Al alloy -Cu</YS30><YS31>Misc Carbons</YS31></list_str_MainPriority>
+    <list_str_MainPriority>System.Collections.Generic.List`1[System.String]</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>Glass , Glass , Si Rich , Al-Alloy , Oxidized Al , Al2O3 with S , Al2O3 , Al-Rich , SiO2 , W Rich (W-C) , Aluminosilicates , Ca-Aluminosilicates , High Ca , Mn-P Coating , Cr Coating , Zn-Cr Coating , Zn Coating , Zn-P Coating , Zn-Cu , Steel(Fe&gt;40) , Steel(FeCrNi) , Steel(Fe&gt;60) , Steel(Fe&gt;20) , Flourinated , Brass , Bronze CuSn , Non-Ferrous Metal , Misc Salts , Mineral Fiber , Mineral , Al alloy -Cu , Misc Carbons</str_MainPriority>
+    <str_MainPriority>Cu(Zn):Cu alloy , Cu(Zn):Cu(Zn) , Cu(Zn):Zn alloy , Cu(Zn):Cu-O , Cu(Zn):Zn-O , Ferrous:Fe-Cr-Ni , Ferrous:Fe-Cr , Ferrous:Fe-Ni , Ferrous:Fe-O , Ferrous:Fe-NCM  , Ferrous:Fe-P , Ferrous:Fe-alloy , NonFerrous:Nialloy , NonFerrous:Ni-Cr , NonFerrous:Cr-alloy , NonFerrous:NCM , NonFerrous:W-alloy , NonFerrous:Zr alloy , NonFerrous:Ti alloy , NonFerrous:Al alloy , NonFerrous:Al-0</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>40002</YS1><YS2>40003</YS2><YS3>40004</YS3><YS4>40005</YS4><YS5>40006</YS5><YS6>40007</YS6><YS7>40008</YS7><YS8>40009</YS8><YS9>40010</YS9><YS10>40011</YS10><YS11>40012</YS11><YS12>40013</YS12><YS13>40014</YS13><YS14>40015</YS14><YS15>40016</YS15><YS16>40017</YS16><YS17>40018</YS17><YS18>40019</YS18><YS19>40020</YS19><YS20>40021</YS20><YS21>40022</YS21><YS22>40023</YS22><YS23>40024</YS23><YS24>40025</YS24><YS25>40026</YS25><YS26>40027</YS26><YS27>40028</YS27><YS28>40029</YS28><YS29>40030</YS29><YS30>40031</YS30><YS31>40033</YS31></list_str_MainPriority_Serial>
+    <list_str_MainPriority_Serial>System.Collections.Generic.List`1[System.String]</list_str_MainPriority_Serial>
+    <str_MainPriorityID>1:40003 , 1:40004 , 1:40005 , 1:40002 , 1:40009 , 2:40006 , 2:40007 , 2:40008 , 2:40001 , 2:40012 , 2:40013 , 2:40014 , 3:40010 , 3:40011 , 3:40015 , 3:40016 , 3:40017 , 3:40018 , 3:40019 , 3:40020 , 3:40021</str_MainPriorityID>
   </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="TCCleannessA">
+<XMLData RunMode="ProfessionalMode" SysType="BatteryCleannessA">
   <Member RegName="GenParam" DefaultArea="1400" DefaultSampleName="Sample" DefaultShape="0" EngineType="1:ExpressionParse" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Cleanness_F" SteelTechnology="0" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="26" start="0" />

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="TCCleannessA">
+<XMLData systype="BatteryCleannessA">
   <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" />

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -861,19 +861,7 @@ namespace OTSModelSharp
           
             m_pMsrThread.SendMessageToMeasureGUI(MsgSmplEnd);
 
-            string userdB = m_Sample.GetMsrParams().GetSTDName();
-            if(userdB.ToLower() != "nostddb" && userdB.ToLower() != "nostddb.db")
-            {
-                try
-                {
-                    string userdBpath= System.Windows.Forms.Application.StartupPath + "\\Config\\SysData\\" + m_Sample.GetMsrParams().GetSTDName() + ".db";
-                    File.Copy(userdBpath, m_pSampleRstFile.GetFieldFileSubFolderStr().Remove(m_pSampleRstFile.GetFieldFileSubFolderStr().IndexOf("FIELD_FILES")) + m_Sample.GetMsrParams().GetSTDName() + ".db", true);
-                }
-                catch(Exception ex)
-                {
-                    MessageBox.Show("userdB copy failed:" + ex.ToString());
-                }
-            }
+           
         }
 
         public bool DoMEasureForReMeasure()

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMsrResult.cs

@@ -1,8 +1,8 @@
 
 using OTSDataType;
-
+using System;
 using System.IO;
-
+using System.Windows.Forms;
 using System.Xml;
 
 namespace OTSModelSharp
@@ -296,6 +296,22 @@ namespace OTSModelSharp
 
             m_DBFileMgr.InitFile();
             m_DBFileMgr.InitDataTable();
+            //copy the relevant user defined database file to the field file sub folder
+            string userdB = m_pSample.GetMsrParams().GetSTDName();
+            if (userdB.ToLower() != "nostddb" && userdB.ToLower() != "nostddb.db")
+            {
+                try
+                {
+                    string userdBpath = System.Windows.Forms.Application.StartupPath + "\\Config\\SysData\\" + m_pSample.GetMsrParams().GetSTDName() + ".db";
+                    File.Copy(userdBpath, GetFieldFileSubFolderStr().Remove(GetFieldFileSubFolderStr().IndexOf("FIELD_FILES")) + m_pSample.GetMsrParams().GetSTDName() + ".db", true);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("userdB copy failed:" + ex.ToString());
+                }
+            }
+
+
             return true;
         }