添加测量后复制标准库

OTSCPP/OTSClassifyEngine/ExpressionParseEngine/ParticleSTDDB.cpp

@@ -75,7 +75,7 @@ namespace OTSClassifyEngine
 		ASSERT(query);
 		int cols = query->GetColCount();
 		int defineCols =(int) CParticleSTDTable::ColumnID::MAX -(int) CParticleSTDTable::ColumnID::MIN;
-		if (cols != defineCols)
+		if (cols != defineCols+1+4)
 		{
 			LogErrorTrace(__FILE__, __LINE__, _T("std db version is not match!"));
 			return NULL;

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -15,6 +15,7 @@ using OTSCLRINTERFACE;
 using OTSMeasureApp._0_OTSModel.OTSDataType;
 using System.Windows.Forms;
 using System.Data;
+using System.IO;
 
 namespace OTSModelSharp
 {
@@ -805,6 +806,20 @@ namespace OTSModelSharp
             MsgSmplEnd.STMSampleStu.iMsrSampleStatu = OTS_MSR_SAMPLE_STATUS.SUCCESSED;
             MsgSmplEnd.STMSampleStu.cSampleName = theSample.GetName();
             m_pMsrThread.SendMessageToMeasureApp(MsgSmplEnd);
+
+            string userdB = m_Sample.GetMsrParams().GetSTDName();
+            if(userdB.ToLower() != "nostddb" && userdB.ToLower() != "nostddb.db")
+            {
+                try
+                {
+                    string userdBpath= Application.StartupPath + "\\Config\\SysData\\" + m_Sample.GetMsrParams().GetSTDName() + ".db";
+                    File.Copy(userdBpath, m_pSampleRstFile.GetFieldFileSubFolderStr().Remove(m_pSampleRstFile.GetFieldFileSubFolderStr().IndexOf("FIELD_FILES")) + m_Sample.GetMsrParams().GetSTDName() + ".db", true);
+                }
+                catch(Exception ex)
+                {
+                    MessageBox.Show("userdB copy failed:" + ex.ToString());
+                }
+            }
         }
 
         public bool DoMEasureForReMeasure()

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -218,7 +218,8 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\OpenDll\WordApiDll\office.dll</HintPath>
     </Reference>
-    <Reference Include="OINA.Extender">
+    <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>
       <Private>False</Private>
     </Reference>
@@ -231,6 +232,11 @@
       <HintPath>..\OpenDll\WordApiDll\OTS.WinFormsUI.Docking.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OxfordExtenderWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Bin\x64\Release_oxford61\OxfordExtender\OxfordExtenderWrapper.exe</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="SlmRuntimeCSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\SlmRuntimeCSharp\SlmRuntimeCSharp.dll</HintPath>
@@ -945,11 +951,6 @@
       <Name>OTSClrInterface</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\OxfordExtenderWrapper\OxfordExtenderWrapper.csproj">
-      <Project>{b2683648-c829-40e7-a479-ac90b1b80286}</Project>
-      <Name>OxfordExtenderWrapper</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

OTSSysMgrApp/OTSSysMgrApp.csproj

@@ -173,6 +173,11 @@
       <HintPath>..\OpenDll\Nlog\NLog.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OxfordExtenderWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Bin\x64\Release_oxford61\OxfordExtender\OxfordExtenderWrapper.exe</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
@@ -307,11 +312,6 @@
       <Name>OTSIncAMeasureApp</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\OxfordExtenderWrapper\OxfordExtenderWrapper.csproj">
-      <Project>{b2683648-c829-40e7-a479-ac90b1b80286}</Project>
-      <Name>OxfordExtenderWrapper</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

OxfordExtenderWrapper/OxfordExtenderWrapper.csproj

@@ -39,9 +39,10 @@
       <HintPath>..\OpenDll\Nlog\NLog.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OINA.Extender, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
+    <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>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />