improve the Auto BC feature.

Bin/x64/Debug/Config/ProData/lj2.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi2" Sizes="0,5,15,25,50,80,100,200" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi2" Sizes="1,2,5,15,25,50,80,100,200" Version="1.1.1" />

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

@@ -1,12 +1,9 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>夹杂物报告</str_tb_ZBT>
-    <str_tb_FBT>
-    </str_tb_FBT>
-    <str_tb_YPBH>
-    </str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_FBT>xxxxx有限公司</str_tb_FBT>
+    <str_tb_YPBH>1#</str_tb_YPBH>
+    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -20,8 +17,7 @@
     </str_tb_djsb>
     <str_tb_npsb>
     </str_tb_npsb>
-    <str_tb_SampleName>
-    </str_tb_SampleName>
+    <str_tb_SampleName>sample1</str_tb_SampleName>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -45,28 +41,36 @@
     <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
     <str_cb_klcc_ljb>lj.psf</str_cb_klcc_ljb>
     <GraphicSelection>2</GraphicSelection>
-    <ParticleSizeGraphicSelection>2</ParticleSizeGraphicSelection>
+    <ParticleSizeGraphicSelection>0</ParticleSizeGraphicSelection>
     <INCAGraphicSelection>0</INCAGraphicSelection>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>True</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>
+    <str_tb_ysfx_xsys>Al,Si,P,C,S,N,O,F,Fe,Mo,Cr,Zr,Ti,Mn,Ca,Ce,Nb,V,La,Na,Mg</str_tb_ysfx_xsys>
     <list_str_tb_ysfx_xsys>
       <YS0>Al</YS0>
       <YS1>Si</YS1>
-      <YS2>C</YS2>
-      <YS3>S</YS3>
-      <YS4>N</YS4>
-      <YS5>O</YS5>
-      <YS6>Fe</YS6>
-      <YS7>Ti</YS7>
-      <YS8>Mn</YS8>
-      <YS9>Mg</YS9>
-      <YS10>Ca</YS10>
-      <YS11>Ce</YS11>
-      <YS12>La</YS12>
+      <YS2>P</YS2>
+      <YS3>C</YS3>
+      <YS4>S</YS4>
+      <YS5>N</YS5>
+      <YS6>O</YS6>
+      <YS7>F</YS7>
+      <YS8>Fe</YS8>
+      <YS9>Mo</YS9>
+      <YS10>Cr</YS10>
+      <YS11>Zr</YS11>
+      <YS12>Ti</YS12>
+      <YS13>Mn</YS13>
+      <YS14>Ca</YS14>
+      <YS15>Ce</YS15>
+      <YS16>Nb</YS16>
+      <YS17>V</YS17>
+      <YS18>La</YS18>
+      <YS19>Na</YS19>
+      <YS20>Mg</YS20>
     </list_str_tb_ysfx_xsys>
     <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
     <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
@@ -129,7 +133,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>Area</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>Ar</YS0>
       <YS1>C</YS1>
@@ -138,11 +142,19 @@
     <str_kllb_qcys>Ar,C,Fe</str_kllb_qcys>
     <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
-      <YS0>Silicate</YS0>
+      <YS0>Al2O3</YS0>
+      <YS1>SiO2</YS1>
+      <YS2>CaO</YS2>
+      <YS3>SiC</YS3>
+      <YS4>FeO</YS4>
     </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>10</list_int_kllb_number>
+    <list_int_kllb_number>20</list_int_kllb_number>
     <list_str_kllb_DeleteClass_Serial>
-      <YS0>10201</YS0>
+      <YS0>10001</YS0>
+      <YS1>10003</YS1>
+      <YS2>10005</YS2>
+      <YS3>20001</YS3>
+      <YS4>20002</YS4>
     </list_str_kllb_DeleteClass_Serial>
   </M_KLLBXX>
   <M_address>

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="IncA">
   <Member RegName="BrightnessContrastRegulateParam" AutoRegulateType="EveryPeriod" BrightPhaseElement="Al" BrightPhaseValue="124" DarkPhaseElement="C" DarkPhaseValue="11" InitialBrightness="45.53382111" InitialContrast="60.21995716" mag="100" Period="5" StdMaterialOTSPos="41475,-4357" ToRun="true" />
   <Member RegName="GenParam" DefaultArea="1450" DefaultSampleName="Sample" DefaultShape="0" EngineType="1:ExpressionParse" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Cleanness_ND1" SteelTechnology="0" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="0" OverlapParam="0" ParticleSelectionCondition="">

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="BatteryCleannessA">
+<XMLData systype="IncA">
   <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" />
-  <Member RegName="PartSizeFile" name="ljNuw.psf" />
+  <Member RegName="PartSizeFile" name="lj2.psf" />
   <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />
   <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="ECD" />
 </XMLData>

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

@@ -83,8 +83,8 @@ namespace OTSMeasureApp._1_OTSMeasure.Measure._3_MeasureFlow
            
             log = NLog.LogManager.GetCurrentClassLogger();
 
-             imgwidth = m_pMsrThread.m_pMeasureParam.GetDefaultParam().GetImageScanParam().GetImageResolutionSize().cx/2;
-             imgheight = m_pMsrThread.m_pMeasureParam.GetDefaultParam().GetImageScanParam().GetImageResolutionSize().cy/2;
+             imgwidth = m_pMsrThread.m_pMeasureParam.GetDefaultParam().GetImageScanParam().GetImageResolutionSize().cx;
+             imgheight = m_pMsrThread.m_pMeasureParam.GetDefaultParam().GetImageScanParam().GetImageResolutionSize().cy;
 
             m_BrightnessContrastRegulateParam = a_msrThread.m_pMeasureParam.GetDefaultParam().BrightnessContrastRegulationParam;
 
@@ -274,7 +274,7 @@ namespace OTSMeasureApp._1_OTSMeasure.Measure._3_MeasureFlow
                     {
                         BCstatedic.Add(varerror, BcsemState);                       
                     }   
-                    if((DateTime.Now-starttime).TotalSeconds>20)
+                    if((DateTime.Now-starttime).TotalSeconds>30)
                     {
                         log.Warn("Auto BC time out, stop the auto BC!");
 
@@ -285,8 +285,8 @@ namespace OTSMeasureApp._1_OTSMeasure.Measure._3_MeasureFlow
                             m_SemHardwareMgr.SetSemBrightness(minstate.brightness);
                             m_SemHardwareMgr.SetSemContrast(minstate.contrast);
                             log.Warn("Auto BC set brightness and contrast to:" + minstate.brightness + " " + minstate.contrast);
-                        }   
-                        break;
+                        }
+                        return;
                     }
                     RegulateBrightnessAndContrast(bright, desirebright, dark, desiredark,curbrightness,curcontrast);
 
@@ -302,7 +302,7 @@ namespace OTSMeasureApp._1_OTSMeasure.Measure._3_MeasureFlow
                         return;
                     }
                     ProcessBSEImageToGetTheTwoGrayValue(pBSEIamge, ref bright, ref dark);
-
+                   
                 }
                 m_SemHardwareMgr.GetSemContrast(ref m_BrightnessContrastRegulateParam.initialContrast);
                 m_SemHardwareMgr.GetSemBrightness(ref m_BrightnessContrastRegulateParam.initialBrightness);

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -361,6 +361,7 @@ namespace OTSMeasureApp
             {
                 //MessageBox.Show("Already saved!", "Tip");
             }
+            m_MeasureAppForm.m_ProjParam.SetDefaultParam(m_cotsprogmgrparamfile);
         }
 
         private void TSEdit_Click(object sender, EventArgs e)

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -1581,7 +1581,7 @@ namespace OTSMeasureApp
                         var sam = GetWorkingVisualSample();
                         if (sam != null)
                         {
-                            var item = sam.GetMeasureGDIObject();
+                           
 
                             //var selWSampleMeasureStatus = m_MeasureAppForm.m_ProjParam.GetWorkSampleMeasureStatus();
                             COTSSample COTSSample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
@@ -1590,7 +1590,7 @@ namespace OTSMeasureApp
                             {
                                 return;
                             }
-                            
+                            var item = sam.GetMeasureGDIObject();
 
                             if (item.Myshape == ShapeType.POLYGON)
                             {

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1842,6 +1842,7 @@
     <PropertyGroup>
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
+    <Error Condition="!Exists('..\packages\EmptyLicensesLicx.3.0.0\build\EmptyLicensesLicx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EmptyLicensesLicx.3.0.0\build\EmptyLicensesLicx.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <PropertyGroup>
@@ -1852,4 +1853,5 @@ echo debug donot copy files
 xcopy /E /I /Y "$(SolutionDir)Bin\x64\Debug\Resources" "$(TargetDir)Resources" 
 )</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="..\packages\EmptyLicensesLicx.3.0.0\build\EmptyLicensesLicx.targets" Condition="Exists('..\packages\EmptyLicensesLicx.3.0.0\build\EmptyLicensesLicx.targets')" />
 </Project>

OTSIncAReportApp/OTSIncAReportApp.csproj.user

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ReferencePath>
@@ -11,6 +11,7 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>en-US</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
     <EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>

OTSIncAReportApp/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EmptyLicensesLicx" version="3.0.0" targetFramework="net48" developmentDependency="true" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net472" />
   <package id="NPOI" version="2.5.6" targetFramework="net472" />
   <package id="OpenCvSharp4" version="4.8.0.20230708" targetFramework="net48" />