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

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

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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" />
+<XMLData RunMode="ProfessionalMode" SysType="BatteryCleannessA">
+  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="1" EngineType="0:InclustionEngine" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="OTSIncASTD - Perception - Al kill" SteelTechnology="0" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
-    <Member RegName="BGGray" end="50" start="0" />
-    <Member RegName="IncArea" end="2000" start="3" />
-    <Member RegName="ParticleGray" end="255" start="0" />
+    <Member RegName="BGGray" end="255" start="160" />
+    <Member RegName="IncArea" end="200" start="3" />
+    <Member RegName="ParticleGray" end="255" start="200" />
   </Member>
   <Member RegName="ImageScanParam" ImageResolution="3:_1024_768" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode,4:AreaMode" StopParamArea="30" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
-  <Member RegName="SpecialGrayParam" ToRun="false">
+  <Member RegName="SpecialGrayParam" ToRun="true">
     <Collection RegName="GrayRangeList">
-      <Member collectXray="true" diameterEnd="200" diameterStart="6" end="146" rngName="rang1" start="58" />
-      <Member collectXray="true" diameterEnd="100" diameterStart="0" end="255" rngName="rang2" start="179" />
+      <Member collectXray="true" diameterEnd="200" diameterStart="0" end="171" rngName="rang1" start="26" />
     </Collection>
   </Member>
   <Member RegName="StageData" ControlDelay="2000" MinMag="65" scanFieldSize="1270" xAxisDir="1:RIGHT_TOWARD" yAxisDir="0:UP_TOWARD">

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -1183,7 +1183,7 @@ namespace OTSMeasureApp
                         }
                     }
                     control_XRayTable1.List_ShowElementInfo = list_showelementinfo;
-                    control_XRayTable1.GoodName = classifyName;
+                    control_XRayTable1.GoodName = classifyName+ " (Dmax:"+parts[0].GetDMAX().ToString("0.##")+")";
                     //设置分析Xray数据
                     control_XRayTable1.SetXRayShowLineValue(new uint[2000], u_ElementXrayData, list_showelementinfo);
                     //需要显示计数率

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/frmSpecialGrayParticle.Designer.cs

@@ -112,6 +112,7 @@
             this.btnYes.TabIndex = 10;
             this.btnYes.Text = "显示效果";
             this.btnYes.UseVisualStyleBackColor = true;
+            this.btnYes.Visible = false;
             this.btnYes.Click += new System.EventHandler(this.btnShowEffect_Click);
             // 
             // btnOk

OTSIncAMeasureApp/ServiceCenter/CImageHandler.cs

@@ -372,8 +372,14 @@ namespace OTSModelSharp.ServiceCenter
                         }
 
                     }
-
+                    tempFld.CalParticleImageProp(specialGreyparts);
+                    parts.AddRange(specialGreyparts);
+                    tempFld.SetListAnalysisParticles(parts);
+                    //tempFld.SelectParticlesAccordingImgProp(a_pImgProcessParam);    
+                   
+                   
                 }
+                
 
             }
            

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1672,7 +1672,6 @@
     <EmbeddedResource Include="Help.resx">
       <DependentUpon>Help.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

OTSIncAReportApp/Properties/licenses.licx

@@ -1,4 +0,0 @@
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v24.1.UI, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a