处理合并冲突

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData systype="TCCleannessA">
   <Member RegName="Scale" strValue="1000" />
-  <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
-  <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />
+  <Member RegName="DefaultComputedColName" strValue="" />
+  <Member RegName="ElementsColName" strValue="C,Cr,Ni,Mn,Si,P,S,Mo" />
   <Member RegName="PartSizeFile" name="lj.psf" />
   <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />
   <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="ECD" />

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -214,6 +214,162 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DevExpress.Charts.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Charts.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.CodeParser.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.CodeParser.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Data.Desktop.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Data.Desktop.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Data.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Data.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.DataAccess.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.DataAccess.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.DataAccess.v24.1.UI">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.DataAccess.v24.1.UI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.DataVisualization.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.DataVisualization.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Diagram.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Diagram.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Drawing.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Drawing.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Images.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Images.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Office.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Office.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Pdf.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Pdf.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Pdf.v24.1.Drawing">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Pdf.v24.1.Drawing.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.PivotGrid.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.PivotGrid.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Printing.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Printing.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.RichEdit.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.RichEdit.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.RichEdit.v24.1.Export">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.RichEdit.v24.1.Export.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Sparkline.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Sparkline.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Utils.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Utils.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Utils.v24.1.UI">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Utils.v24.1.UI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.Xpo.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Xpo.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraBars.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraBars.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v24.1.Extensions">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.Extensions.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v24.1.UI">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.UI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraCharts.v24.1.Wizard">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.Wizard.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraDiagram.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraDiagram.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraEditors.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraEditors.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraGauges.v24.1.Core">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraGauges.v24.1.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraGrid.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraGrid.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraLayout.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraLayout.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraNavBar.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraNavBar.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraPivotGrid.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraPivotGrid.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraPrinting.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraPrinting.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraReports.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraReports.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraReports.v24.1.Extensions">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraReports.v24.1.Extensions.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraRichEdit.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraRichEdit.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraTreeList.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraTreeList.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="DevExpress.XtraVerticalGrid.v24.1">
+      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraVerticalGrid.v24.1.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="FEIApiControl">
       <HintPath>..\OpenDll\FEIAPI\FEIApiControl.dll</HintPath>
       <Private>False</Private>
@@ -1029,7 +1185,47 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Charts.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.CodeParser.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Data.Desktop.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Data.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.DataAccess.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.DataAccess.v24.1.UI.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.DataVisualization.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Diagram.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Drawing.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Images.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Office.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Pdf.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Pdf.v24.1.Drawing.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.PivotGrid.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Printing.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.RichEdit.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.RichEdit.v24.1.Export.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Sparkline.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Utils.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Utils.v24.1.UI.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.Xpo.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraBars.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.Extensions.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.UI.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraCharts.v24.1.Wizard.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraDiagram.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraEditors.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraGauges.v24.1.Core.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraGrid.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraLayout.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraNavBar.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraPivotGrid.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraPrinting.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraReports.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraReports.v24.1.Extensions.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraRichEdit.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraTreeList.v24.1.dll" />
+    <Analyzer Include="..\..\..\OTS2_7\OTS2_0\OpenDll\DevExpress\DevExpress.XtraVerticalGrid.v24.1.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>