cxs 2 недель назад
Родитель
Сommit
cec9b93351

+ 3 - 3
Bin/x64/Debug/Config/ReportTemplate/Inca_Template/ReportTemplateConfig.xml

@@ -87,7 +87,7 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
@@ -106,7 +106,7 @@
     <str_cb_syxt_ljb>lj.psf</str_cb_syxt_ljb>
   </M_SYXT>
   <M_KLLBXX>
-    <b_ck_kllb_xsmk>False</b_ck_kllb_xsmk>
+    <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>
     <index_cb_kllb_jsfs>0</index_cb_kllb_jsfs>
     <index_cb_kllb_klfw>0</index_cb_kllb_klfw>
     <int_tb_kllb_ylsx>1</int_tb_kllb_ylsx>
@@ -138,7 +138,7 @@
     <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>False</b_ck_kllb_fjzt>
+    <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
       <YS0>C</YS0>
       <YS1>Fe</YS1>

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSInclusionsTraceabilityParam.rpf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <XMLData>
-  <Member RegName="EquivalentCircularDiameter" strValue="10" />
+  <Member RegName="EquivalentCircularDiameter" strValue="0.1" />
   <Member RegName="Contains" strValue="False" />
   <Member RegName="DisplaySource" strValue="精炼渣" />
 </XMLData>

+ 2 - 2
Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
-  <Member RegName="DefaultComputedColName" strValue="Area,MinDiameter,DiameterRatio,PERP,XRayDataCount" />
-  <Member RegName="ElementsColName" strValue="O,Mg,Si,Ti,Pm,N,Na,Cl,K,S,Ca,Al,Zr,P,Fe,Zn,Cu,F,Sn,Br,V,Ba,Ni,Mo,Cr" />
+  <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,N,O,Na,Si,Br,Al,S,Ca,Ni,Fe,P,Mg,Cr,Cl,K,Ti" />
   <Member RegName="PartSizeFile" name="ljInclusionLevel" />
   <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />
   <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="ECD" />

+ 0 - 2
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -886,8 +886,6 @@ namespace OTSIncAReportGrids
         #endregion
 
 
-
-
         #region 健壮性判断
         private bool IsNumericColumn(string columnName)
         {

+ 1 - 3
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1813,9 +1813,7 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="1-UI\Control_Grids\OTSIncAReportGridsFuncation\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\OTSCommon\OTSCommon.csproj">
       <Project>{3b7695aa-8231-45ac-b493-84390a945d02}</Project>