修改一些bugs，extender引用5.1

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSSampleVisualPropertyInfo.cs

@@ -787,6 +787,11 @@ namespace OTSMeasureApp
                 listSTDLibName.Add(fileName);
             }
 
+            if (listSTDLibName.Count > 0)
+            {
+                listSTDLibName.Add("NoSTDDB");
+            }
+
             if (a_nPos > (int)listSTDLibName.Count)
             {
                 return false;

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -209,9 +209,8 @@
       <HintPath>..\OpenDll\Json\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog">
       <HintPath>..\OpenDll\Nlog\NLog.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
@@ -219,9 +218,8 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\OpenDll\WordApiDll\office.dll</HintPath>
     </Reference>
-    <Reference Include="OINA.Extender, Version=6.1.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\OpenDll\OxfordApi61Dll\OINA.Extender.dll</HintPath>
+    <Reference Include="OINA.Extender">
+      <HintPath>..\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="OpenCvSharp">
@@ -964,7 +962,7 @@
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <PropertyGroup>
-    <PostBuildEvent>If $(ConfigurationName) NEQ Debug (xcopy $(SolutionDir)\Bin\x64\Debug\Config\*.*  $(TargetDir)Config\ /y/e)
-If $(ConfigurationName) NEQ Debug (xcopy $(SolutionDir)\Bin\x64\Debug\Resources\*.*  $(TargetDir)Resources\ /y/e)</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
 </Project>

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -208,17 +208,20 @@ namespace OTSIncAReportGrids
                 //m_frm_userprogress = new Frm_UserProgress();
                 fieldData = new FieldData(result.FilePath);
                 Particledata = new ParticleData(result.FilePath);
-                //string str_libraryName = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString();
-                string str_libraryName = result.GetSTDName();
-                userLibrary = new UserLibraryData(str_libraryName);
-                if (userLibrary.GetSqlHelper() != null)
+                var systype = m_ReportApp.m_RptConfigFile.Systype;
+                if (systype == OTSCommon.Model.OTS_SysType_ID.CleannessA)
                 {
-                    userLibraryData = userLibrary.GetSubAttributeFromDatabase();
-                }
-                else
-                {
-                    userLibraryData = null;
-                    MessageBox.Show("未读取到用户标准库！");
+                    string str_libraryName = result.GetSTDName();
+                    userLibrary = new UserLibraryData(str_libraryName);
+                    if (userLibrary.GetSqlHelper() != null)
+                    {
+                        userLibraryData = userLibrary.GetSubAttributeFromDatabase();
+                    }
+                    else
+                    {
+                        userLibraryData = null;
+                        MessageBox.Show("未读取到用户标准库！");
+                    }
                 }
                 //初始化底层操作类
                 m_OTSIncAReportGridsFun = new OTSReportGridsFun(m_ReportApp, this);

OTSIncAReportApp/1-UI/GBCalculate/Purity.Designer.cs

@@ -51,7 +51,7 @@ namespace OTSIncAReportApp._1_UI.GBCalculate
             // 
             this.btn_cal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btn_cal.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn_cal.Location = new System.Drawing.Point(274, 17);
+            this.btn_cal.Location = new System.Drawing.Point(266, 17);
             this.btn_cal.Name = "btn_cal";
             this.btn_cal.Size = new System.Drawing.Size(83, 28);
             this.btn_cal.TabIndex = 0;
@@ -82,7 +82,7 @@ namespace OTSIncAReportApp._1_UI.GBCalculate
             this.cBox_gride.FormattingEnabled = true;
             this.cBox_gride.Location = new System.Drawing.Point(152, 17);
             this.cBox_gride.Name = "cBox_gride";
-            this.cBox_gride.Size = new System.Drawing.Size(101, 28);
+            this.cBox_gride.Size = new System.Drawing.Size(93, 28);
             this.cBox_gride.TabIndex = 2;
             // 
             // label2
@@ -107,7 +107,7 @@ namespace OTSIncAReportApp._1_UI.GBCalculate
             this.tB_result.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tB_result.Location = new System.Drawing.Point(152, 12);
             this.tB_result.Name = "tB_result";
-            this.tB_result.Size = new System.Drawing.Size(123, 31);
+            this.tB_result.Size = new System.Drawing.Size(115, 31);
             this.tB_result.TabIndex = 4;
             // 
             // label3
@@ -157,7 +157,7 @@ namespace OTSIncAReportApp._1_UI.GBCalculate
             this.splitContainer1.Panel2.Controls.Add(this.label2);
             this.splitContainer1.Panel2.Controls.Add(this.label3);
             this.splitContainer1.Panel2.Controls.Add(this.tB_result);
-            this.splitContainer1.Size = new System.Drawing.Size(876, 772);
+            this.splitContainer1.Size = new System.Drawing.Size(868, 772);
             this.splitContainer1.SplitterDistance = 62;
             this.splitContainer1.TabIndex = 7;
             // 

OxfordExtenderWrapper/OxfordExtenderWrapper.csproj

@@ -25,7 +25,7 @@
     <StartupObject>OxfordExtenderWrapper.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_oxford61|x64' ">
-    <OutputPath>..\Bin\x64\Release_oxford61\OxfordExtender\</OutputPath>
+    <OutputPath>..\Bin\x64\Release_oxford61\</OutputPath>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
@@ -39,9 +39,9 @@
       <HintPath>..\OpenDll\Nlog\NLog.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OINA.Extender, Version=6.1.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
+    <Reference Include="OINA.Extender, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\OpenDll\OxfordApi61Dll\OINA.Extender.dll</HintPath>
+      <HintPath>..\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />