rare earth classification optimize.

OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.h

@@ -50,7 +50,7 @@ namespace OTSClassifyEngine
 	};
 	const CString INC_SULFILSES_NAMES[INC_SUL_SUB_ELEMENT_MAX] =
 	{
-		_T("MnS"),_T("CaS"),_T("MgS"),_T("Ce2S3"),_T("La2S3")
+		_T("MnS"),_T("CaS"),_T("MgS"),_T("Ce(La)2S3"),_T("Ce(La)2S3")
 	};
 	const double INC_SULFILSES_MAPPING_RATIO[INC_SUL_SUB_ELEMENT_MAX] =
 	{

OTSIncAMeasureApp/6-OTSDisplayTreeViewData/OTSSolutionWindow.Designer.cs

@@ -37,6 +37,7 @@
             this.RightClickCheckContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.SampleParaLock = new System.Windows.Forms.ToolStripMenuItem();
             this.ClearMeasureData = new System.Windows.Forms.ToolStripMenuItem();
+            this.reClassifyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.RightClickNoCheckContextMenuStrip.SuspendLayout();
             this.RightClickCheckContextMenuStrip.SuspendLayout();
             this.SuspendLayout();
@@ -88,7 +89,7 @@
             // DeleteNode
             // 
             this.DeleteNode.Name = "DeleteNode";
-            this.DeleteNode.Size = new System.Drawing.Size(160, 22);
+            this.DeleteNode.Size = new System.Drawing.Size(180, 22);
             this.DeleteNode.Text = "删除样品";
             this.DeleteNode.Click += new System.EventHandler(this.DeleteNode_Click);
             // 
@@ -98,15 +99,16 @@
             this.RightClickCheckContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.DeleteNode,
             this.SampleParaLock,
-            this.ClearMeasureData});
+            this.ClearMeasureData,
+            this.reClassifyToolStripMenuItem});
             this.RightClickCheckContextMenuStrip.Name = "contextMenuStrip1";
-            this.RightClickCheckContextMenuStrip.Size = new System.Drawing.Size(161, 70);
+            this.RightClickCheckContextMenuStrip.Size = new System.Drawing.Size(181, 114);
             // 
             // SampleParaLock
             // 
             this.SampleParaLock.CheckOnClick = true;
             this.SampleParaLock.Name = "SampleParaLock";
-            this.SampleParaLock.Size = new System.Drawing.Size(160, 22);
+            this.SampleParaLock.Size = new System.Drawing.Size(180, 22);
             this.SampleParaLock.Text = "样品参数编辑锁";
             this.SampleParaLock.Visible = false;
             this.SampleParaLock.Click += new System.EventHandler(this.SampleParaLock_Click);
@@ -114,11 +116,18 @@
             // ClearMeasureData
             // 
             this.ClearMeasureData.Name = "ClearMeasureData";
-            this.ClearMeasureData.Size = new System.Drawing.Size(160, 22);
+            this.ClearMeasureData.Size = new System.Drawing.Size(180, 22);
             this.ClearMeasureData.Text = "清除测量数据";
             this.ClearMeasureData.Visible = false;
             this.ClearMeasureData.Click += new System.EventHandler(this.ClearSampleMeasureData_Click);
             // 
+            // reClassifyToolStripMenuItem
+            // 
+            this.reClassifyToolStripMenuItem.Name = "reClassifyToolStripMenuItem";
+            this.reClassifyToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.reClassifyToolStripMenuItem.Text = "ReClassify";
+            this.reClassifyToolStripMenuItem.Click += new System.EventHandler(this.reClassifyToolStripMenuItem_Click);
+            // 
             // OTSSolutionWindow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -131,7 +140,7 @@
             | OTS.WinFormsUI.Docking.DockAreas.DockBottom)));
             this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OTSSolutionWindow";
             this.RightToLeftLayout = true;
             this.Text = "样品窗口";
@@ -155,5 +164,6 @@
         private System.Windows.Forms.ContextMenuStrip RightClickCheckContextMenuStrip;
         private System.Windows.Forms.ToolStripMenuItem ClearMeasureData;
         public System.Windows.Forms.ToolStripMenuItem SampleParaLock;
+        private System.Windows.Forms.ToolStripMenuItem reClassifyToolStripMenuItem;
     }
 }

OTSIncAMeasureApp/6-OTSDisplayTreeViewData/OTSSolutionWindow.cs

@@ -781,5 +781,10 @@ namespace OTSMeasureApp
         {
             m_MeasureAppForm.m_SamplepaceWindow.KeyUps();
         }
+
+        private void reClassifyToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

OTSIncAMeasureApp/Program.cs

@@ -13,13 +13,13 @@ namespace OTSMeasureApp
         static void Main()
         {
             //判断是否有授权
-            var reg = new CRegistration();
-            if (!reg.RegistrationVerification())
-            {
-                MessageBox.Show("Error: missing authorization");
-                System.Environment.Exit(0);
-                return;
-            }
+            //var reg = new CRegistration();
+            //if (!reg.RegistrationVerification())
+            //{
+            //    MessageBox.Show("Error: missing authorization");
+            //    System.Environment.Exit(0);
+            //    return;
+            //}
             //--------------------------只运行一个测量程序--------------------------------
 
             bool flag = false;

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -231,13 +231,11 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\OpenDll\WordApiDll\office.dll</HintPath>
     </Reference>
-    <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\OpenCvSharpOriginal\OpenCvSharp.dll</HintPath>
+    <Reference Include="OpenCvSharp">
+      <HintPath>..\Bin\x64\CleannessRelease\OpenCvSharp.dll</HintPath>
     </Reference>
-    <Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\OpenCvSharpOriginal\OpenCvSharp.Extensions.dll</HintPath>
+    <Reference Include="OpenCvSharp.Extensions">
+      <HintPath>..\Bin\x64\CleannessRelease\OpenCvSharp.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="OTS.WinFormsUI.Docking">
       <HintPath>..\Bin\x64\Debug\OTS.WinFormsUI.Docking.dll</HintPath>

OTSSysMgrApp/SemTestForms.Designer.cs

@@ -546,7 +546,7 @@
             // 
             this.tbPositionY.Enabled = false;
             this.tbPositionY.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbPositionY.Location = new System.Drawing.Point(230, 26);
+            this.tbPositionY.Location = new System.Drawing.Point(230, 21);
             this.tbPositionY.Margin = new System.Windows.Forms.Padding(2);
             this.tbPositionY.Name = "tbPositionY";
             this.tbPositionY.Size = new System.Drawing.Size(88, 23);
@@ -576,7 +576,7 @@
             // 
             this.tbPositionX.Enabled = false;
             this.tbPositionX.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbPositionX.Location = new System.Drawing.Point(95, 22);
+            this.tbPositionX.Location = new System.Drawing.Point(95, 21);
             this.tbPositionX.Margin = new System.Windows.Forms.Padding(2);
             this.tbPositionX.Name = "tbPositionX";
             this.tbPositionX.Size = new System.Drawing.Size(88, 23);
@@ -1074,7 +1074,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(5, 22);
+            this.label1.Location = new System.Drawing.Point(35, 27);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(23, 12);

OTSSysMgrTools/OTSSysMgrTools.csproj

@@ -106,10 +106,6 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OTSClrInterface, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Bin\Win32\Debug\OTSClrInterface.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
@@ -139,5 +135,11 @@
     <Compile Include="SQliteManageClass.cs" />
     <Compile Include="XMLManageClass.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OTSCPP\OTSClrInterface\OTSClrInterface.vcxproj">
+      <Project>{490a8592-7b13-4536-b475-028e73007fae}</Project>
+      <Name>OTSClrInterface</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>