2 次代碼提交 0538891b66 ... 18d3b91384

作者 SHA1 備註 提交日期
  gsp 18d3b91384 Merge branch 'OTSRelease3_2' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_2 7 月之前
  gsp bfe2461937 Add Sample321.png blank.jpg etc. 7 月之前

二進制
Bin/x64/Debug/Config/SysData/OTSCleanlinessSTD1.db


+ 6 - 6
Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="BatteryCleannessA">
-  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="0:AUTO" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
-    <Member RegName="BGGray" end="255" start="80" />
-    <Member RegName="IncArea" end="100" start="2" />
+  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="OTS_TC_Axia_per" SteelTechnology="0" UseSysSTD="true" />
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
+    <Member RegName="BGGray" end="102" start="0" />
+    <Member RegName="IncArea" end="500" start="5" />
     <Member RegName="ParticleGray" end="255" start="0" />
   </Member>
-  <Member RegName="ImageScanParam" ImageResolution="4:_1536_1024" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
+  <Member RegName="ImageScanParam" ImageResolution="3:_1024_768" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
   <Member RegName="StageData" ControlDelay="1000" MinMag="65" scanFieldSize="1270" xAxisDir="0:LEFT_TOWARD" yAxisDir="1:DOWN_TOWARD">
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />
   </Member>
-  <Member RegName="XrayParam" AnalyExpCount="1000" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="200" QuantifyMinSize="1" ScanMode="0:PointMode" SmallPartAQTime="200" UseFilter="false" UsingXray="true" XrayLimit="50" />
+  <Member RegName="XrayParam" AnalyExpCount="1000" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="200" QuantifyMinSize="1" ScanMode="1:FeatureMode" SmallPartAQTime="200" UseFilter="false" UsingXray="true" XrayLimit="999999999" />
 </XMLData>

二進制
Bin/x64/Debug/Config/SysData/OTS_TC_Axia_per.db


二進制
Bin/x64/Debug/Resources/Add Sample321.png


二進制
Bin/x64/Debug/Resources/blank.jpg


二進制
Bin/x64/Debug/Resources/文档输出图标.PNG


+ 112 - 22
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -271,70 +271,160 @@
       <HintPath>..\OpenDll\WordApiDll\BouncyCastle.Crypto.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Charts.v24.1.Core, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Charts.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Charts.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Data.Desktop.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.CodeParser.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.CodeParser.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Data.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.Desktop.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Data.Desktop.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Drawing.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Data.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Office.v24.1.Core, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.DataAccess.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.DataAccess.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Pdf.v24.1.Core, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.DataAccess.v24.1.UI">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.DataAccess.v24.1.UI.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.PivotGrid.v24.1.Core, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.DataVisualization.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.DataVisualization.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Printing.v24.1.Core, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Diagram.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Diagram.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.RichEdit.v24.1.Core, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Drawing.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Drawing.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.RichEdit.v24.1.Export, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Images.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Images.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Sparkline.v24.1.Core, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Office.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Office.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Utils.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+    <Reference Include="DevExpress.Pdf.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Pdf.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.Utils.v24.1.UI, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+    <Reference Include="DevExpress.Pdf.v24.1.Drawing">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Pdf.v24.1.Drawing.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraBars.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+    <Reference Include="DevExpress.PivotGrid.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.PivotGrid.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraCharts.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Printing.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Printing.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraCharts.v24.1.UI, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.RichEdit.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraCharts.v24.1.Wizard, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+    <Reference Include="DevExpress.RichEdit.v24.1.Export">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.RichEdit.v24.1.Export.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraEditors.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+    <Reference Include="DevExpress.Sparkline.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Sparkline.v24.1.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraGauges.v24.1.Core, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Utils.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraPrinting.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+    <Reference Include="DevExpress.Utils.v24.1.UI">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Utils.v24.1.UI.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraReports.v24.1, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Xpo.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.Xpo.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DevExpress.XtraReports.v24.1.Extensions, Version=24.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+    <Reference Include="DevExpress.XtraBars.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraBars.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v24.1.Extensions">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.Extensions.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v24.1.UI">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.UI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v24.1.Wizard">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.Wizard.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraDiagram.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraDiagram.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraEditors.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraEditors.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraGauges.v24.1.Core">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraGauges.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraGrid.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraGrid.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraLayout.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraLayout.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraNavBar.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraNavBar.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraPivotGrid.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraPivotGrid.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraPrinting.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraPrinting.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraReports.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraReports.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraReports.v24.1.Extensions">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraReports.v24.1.Extensions.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraRichEdit.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraRichEdit.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraTreeList.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraTreeList.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraVerticalGrid.v24.1">
+      <HintPath>..\OpenDll\DevExpress\DevExpress.XtraVerticalGrid.v24.1.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">