瀏覽代碼

修改因修改报告排列图导致的查看X-ray信息时报错bug

CXS 4 年之前
父節點
當前提交
f4a8ec3c79

+ 1 - 4
OTSCPP/OTSControl/OTSControl.vcxproj

@@ -405,10 +405,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="OINA.Extender">
-      <HintPath>..\OpenDll\OxfordApiDll\OINA.Extender.dll</HintPath>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+      <HintPath>..\..\..\..\OTS2_0\OTS\OTS\OTSCPP\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

+ 2 - 2
OTSIncAReportApp/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1180,7 +1180,7 @@ namespace OTSIncAReportGraph.Controls
             //获取使用标准库的名称
             string str_stdname = "";
             string str_IncALibName = "";
-            List<int> FLID = new List<int>() { 0, 1, 2, 3, 4, 5, 6, 9 };
+            List<int> FLID = new List<int>() { 0, 1, 2, 4, 6, 9 };
             //List<string> NameList = new List<string>() { "过小颗粒", "过大颗粒", "亮度不在分析范围内的颗粒", "低计数率颗粒", "不含分析元素的颗粒", "非夹杂物颗粒SiC", "非夹杂物颗粒FeO", "未识别颗粒" };
             List<string> NameList = new List<string>() { "过小颗粒", "过大颗粒", "亮度不在分析范围内的颗粒", "低计数率颗粒", "不含分析元素的颗粒", "未识别颗粒" };
 
@@ -1189,7 +1189,7 @@ namespace OTSIncAReportGraph.Controls
                 int index = FLID.IndexOf(in_dparticle.TypeId);
                 if (index == -1)
                 {
-                    index = 7;
+                    index = 5;
                 }
                 //小于1000,使用系统默认分类
                 str_IncALibName = NameList[index];

+ 1 - 1
OTSIncAReportTemplate/OTSIncAReportTemplate.csproj

@@ -68,7 +68,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
-    <OutputPath>bin\x64\Release_oxford50\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford50\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>