Merge branch 'release2.31' into Release2.4

Bin/x64/Debug/Config/ProData/DefaultTriTemplateFile.tpf

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData Name="TriangulationTemplate" Version="1.3.1">
-  <Member TemplateId="1" TemplateName="MgO.CaO.Al2O3" Element="Mg.Ca,Na.Al" Group="MgO-Mg.CaO-Ca,Na.Al2O3-Al" />
-  <Member TemplateId="2" TemplateName="CaO.S.Al2O3" Element="Ca.S.Al" Group="CaO-Ca.S-S.Al2O3-Al" />
-  <Member TemplateId="3" TemplateName="CaO.SiO2.Al2O3" Element="Ca.Si.Al" Group="CaO-Ca.SiO2-Si.Al2O3-Al" />
-  <Member TemplateId="4" TemplateName="MnO.S.Al2O3" Element="Mn.S.Al" Group="MnO-Mn.S-S.Al2O3-Al" />
-  <Member TemplateId="5" TemplateName="CaO.TiN.Al2O3" Element="Ca.Ti.Al" Group="CaO-Ca.TiN-Ti.Al2O3-Al" />
-  <Member TemplateId="6" TemplateName="Mn.Ni.Co" Element=".Ni." Group="Mn-.Ni-Ni.Co-" />
-  <Member TemplateId="20210913145438" TemplateName="CaO.CaS.Al2O3" Element="Ca.S,Ca.Al" Group="CaO-Ca.CaS-S,Ca.Al2O3-Al" />
-  <Member TemplateId="20211223164219" TemplateName="MnS.CaS.Al2O3" Element="Mn.Ca.Al" Group="MnS-Mn.CaS-Ca.Al2O3-Al" />
+  <Member TemplateId="1" TemplateName="MgO.CaO.Al₂O₃" Element="Mg.Ca,Na.Al" Group="MgO-Mg.CaO-Ca,Na.Al₂O₃-Al" />
+  <Member TemplateId="2" TemplateName="CaO.S.Al₂O₃" Element="Ca.S.Al" Group="CaO-Ca.S-S.Al₂O₃-Al" />
+  <Member TemplateId="3" TemplateName="CaO.SiO₂.Al₂O₃" Element="Ca.Si.Al" Group="CaO-Ca.SiO₂-Si.Al₂O₃-Al" />
+  <Member TemplateId="4" TemplateName="MnO.S.Al₂O₃" Element="Mn.S.Al" Group="MnO-Mn.S-S.Al₂O₃-Al" />
+  <Member TemplateId="5" TemplateName="CaO.TiN.Al₂O₃" Element="Ca.Ti.Al" Group="CaO-Ca.TiN-Ti.Al₂O₃-Al" />
+  <Member TemplateId="6" TemplateName="Mn.Ni.Co" Element="Ac.Ni.Ac" Group="Mn-Ac.Ni-Ni.Co-Ac" />
+  <Member TemplateId="20210913145438" TemplateName="CaO.CaS.Al₂O₃" Element="Ca.S,Ca.Al" Group="CaO-Ca.CaS-S,Ca.Al₂O₃-Al" />
+  <Member TemplateId="20211223164219" TemplateName="MnS.CaS.Al₂O₃" Element="Mn.Ca.Al" Group="MnS-Mn.CaS-Ca.Al₂O₃-Al" />
 </XMLData>

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-EN.xml

@@ -11,8 +11,8 @@
 			<member itemKey="20006" itemName="" itemText="SteelTechnology"/>
 			<member itemKey="20008" itemName="" itemText="SysLib switch"/>
 			<member itemKey="20353" itemName="" itemText="General Method"/>
-			<member itemKey="20354" itemName="" itemText="Magnesium Treatment"/>
-			<member itemKey="20355" itemName="" itemText="Calcium Treatment"/>
+			<member itemKey="20354" itemName="" itemText="Calcium Treatment"/>
+			<member itemKey="20355" itemName="" itemText="Magnesium Treatment"/>
 			<member itemKey="20356" itemName="" itemText="Rare Earth Treatment"/>
 			<member itemKey="20070" itemName="" itemText="SampleName"/>
 			<member itemKey="20071" itemName="" itemText="SampleHoleName"/>

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-ZH.xml

@@ -11,8 +11,8 @@
 			<member itemKey="20006" itemName="" itemText="精炼工艺"/>
 			<member itemKey="20008" itemName="" itemText="使用系统库开关"/>
 			<member itemKey="20353" itemName="" itemText="通用方法"/>
-			<member itemKey="20354" itemName="" itemText="镁处理"/>
-			<member itemKey="20355" itemName="" itemText="钙处理"/>
+			<member itemKey="20354" itemName="" itemText="钙处理"/>
+			<member itemKey="20355" itemName="" itemText="镁处理"/>
 			<member itemKey="20356" itemName="" itemText="稀土处理"/>
 			<member itemKey="20070" itemName="" itemText="样品名。"/>
 			<member itemKey="20071" itemName="" itemText="样品所在样品孔名。"/>

ClassificationEngine/Win32/include/IClassifyEngine.h

@@ -1,36 +0,0 @@
-#pragma once
-#include <string>
-#include "OTSParticle.h"
-#include "PosXrayInfo.h"
-#include <PosXray.h>
-namespace OTSClassifyEngine
-{
-
-using std::string;
-using namespace OTSDATA;
-//define interface
-class __declspec(dllexport) IClassifyEngine
-{
-public:
-	IClassifyEngine()  //³ÉÔ±Áбí³õʼ»¯²ÎÊý
-	{};
-	virtual ~IClassifyEngine() {};
-	virtual bool Init() = 0;//
-	//virtual bool ClassifyByXrayInfo(COTSParticlePtr particle, CPosXrayInfoPtr xrayInfo) = 0;//
-	virtual bool Classify(COTSParticlePtr particle, CPosXrayPtr xray) = 0;//
-
-	virtual bool Classify(COTSParticlePtr particle,int SteelTech, CPosXrayPtr xray) = 0;//
-	virtual bool IfNeedMaxEDS(COTSParticlePtr particle, CPosXrayPtr xray, double& MaxEDSTime) = 0;
-
-};
-
-
-
-typedef  std::shared_ptr<IClassifyEngine> __declspec(dllexport) CLEEnginePtr;
-
-__declspec(dllexport) CLEEnginePtr GetInclutionEngine();//will be initialized at the first time.and it's a singleton object.
-__declspec(dllexport) CLEEnginePtr GetParticleEngine(std::string libName);//will be initialized at the first time.and it's a singleton object.
-__declspec(dllexport) CLEEnginePtr GetCurveCompareEngine(std::string libName);//will be initialized at the first time.and it's a singleton object.
-}
-
-

OTSCommon/OTSCommon.csproj

@@ -83,7 +83,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CleannessRelease|x64'">
-    <OutputPath>bin\x64\CleannessRelease\</OutputPath>
+    <OutputPath>..\bin\x64\CleannessRelease\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

OTSExtremum/ChartControl.Designer.cs

@@ -110,7 +110,7 @@
             series3.MarkerColor = System.Drawing.Color.Magenta;
             series3.MarkerSize = 7;
             series3.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Triangle;
-            series3.Name = "Xhig";
+            series3.Name = "Xlow";
             series4.ChartArea = "ChartArea1";
             series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
             series4.Legend = "Legend1";
@@ -118,7 +118,7 @@
             series4.MarkerColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
             series4.MarkerSize = 7;
             series4.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Diamond;
-            series4.Name = "Xlow";
+            series4.Name = "Xhig";
             this.chart1.Series.Add(series1);
             this.chart1.Series.Add(series2);
             this.chart1.Series.Add(series3);

OTSExtremum/ChartSherp.Designer.cs

@@ -88,7 +88,7 @@
             series3.MarkerColor = System.Drawing.Color.Magenta;
             series3.MarkerSize = 7;
             series3.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Triangle;
-            series3.Name = "Xhig";
+            series3.Name = "Xlow";
             series4.ChartArea = "ChartArea1";
             series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
             series4.Legend = "Legend1";
@@ -96,7 +96,7 @@
             series4.MarkerColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
             series4.MarkerSize = 7;
             series4.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Diamond;
-            series4.Name = "Xlow";
+            series4.Name = "Xhig";
             this.chart1.Series.Add(series1);
             this.chart1.Series.Add(series2);
             this.chart1.Series.Add(series3);

OTSExtremum/OTSExtremum.csproj

@@ -96,7 +96,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CleannessRelease|x64'">
-    <OutputPath>bin\x64\CleannessRelease\</OutputPath>
+    <OutputPath>..\bin\x64\CleannessRelease\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -116,7 +116,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CleannessRelease|x64'">
-    <OutputPath>bin\x64\CleannessRelease\</OutputPath>
+    <OutputPath>..\bin\x64\CleannessRelease\</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -80,7 +80,7 @@ namespace OTSIncAReportGrids
         Hashtable table;
         //测量结果
         ResultFile result = null;
-        //二次测量参数页面
+        string str_SysType = "";//当前启动模式（夹杂物、清洁度）
         frmReMeasure frmReMeasure = new frmReMeasure();
 
         frmReportConditionChoose m_condition;
@@ -218,9 +218,16 @@ namespace OTSIncAReportGrids
                 //m_frm_userprogress = new Frm_UserProgress();
                 fieldData = new FieldData(result.FilePath);
                 Particledata = new ParticleData(result.FilePath);
+                str_SysType = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
+                if (str_SysType== "0:IncA")
+                {
+                    userLibraryData = null;
+                }
+                else
+                {
                 string str_libraryName = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString();
                 userLibrary = new UserLibraryData(str_libraryName);
-                if(userLibrary!=null)
+                    if (userLibrary.GetSqlHelper() != null)
                 {
                     userLibraryData = userLibrary.GetSubAttributeFromDatabase();
                 }
@@ -228,6 +235,7 @@ namespace OTSIncAReportGrids
                 {
                     userLibraryData = null;
                 }
+                }
                 //初始化底层操作类
                 m_OTSIncAReportGridsFun = new OTSReportGridsFun(m_ReportApp, this);
                 return true;
@@ -377,12 +385,12 @@ namespace OTSIncAReportGrids
                 }
                 if (sel == 0)
                 {
-                    string str = "TypeId <> -1 and TypeId <> 9";
+                    string str = "TypeId <> -1 and TypeId <> 9 and TypeId <> 0";
                     particlesAll = SreeenDataTable(particlesAll, str);
                 }
                 if (sel == 2)
                 {
-                    string str = "TypeId = " + "-1 or TypeId =" + "9";
+                    string str = "TypeId = " + "-1 or TypeId =" + "9 or TypeId =" + "0";
                     particlesAll = SreeenDataTable(particlesAll, str);
                 }
                 btn_Sel.Enabled = true;
@@ -429,23 +437,23 @@ namespace OTSIncAReportGrids
             }
             return dtNew;
         }
-        /// <summary>
-        /// DataRow转换为DataTable
-        /// </summary>
-        /// <param name="dt"></param>
-        /// <param name="strWhere">筛选的条件</param>
-        /// <returns></returns>
-        public DataTable SreeenDataTable(DataTable dt, string strWhere)
-        {
-            if (dt.Rows.Count <= 0) return dt;        //当数据为空时返回
-            DataTable dtNew = dt.Clone();         //复制数据源的表结构
-            DataRow[] dr = dt.Select(strWhere);  //strWhere条件筛选出需要的数据！
-            for (int i = 0; i < dr.Length; i++)
-            {
-                dtNew.Rows.Add(dr[i].ItemArray);  // 将DataRow添加到DataTable中
-            }
-            return dtNew;
-        }
+        ///// <summary>
+        ///// DataRow转换为DataTable
+        ///// </summary>
+        ///// <param name="dt"></param>
+        ///// <param name="strWhere">筛选的条件</param>
+        ///// <returns></returns>
+        //public DataTable SreeenDataTable(DataTable dt, string strWhere)
+        //{
+        //    if (dt.Rows.Count <= 0) return dt;        //当数据为空时返回
+        //    DataTable dtNew = dt.Clone();         //复制数据源的表结构
+        //    DataRow[] dr = dt.Select(strWhere);  //strWhere条件筛选出需要的数据！
+        //    for (int i = 0; i < dr.Length; i++)
+        //    {
+        //        dtNew.Rows.Add(dr[i].ItemArray);  // 将DataRow添加到DataTable中
+        //    }
+        //    return dtNew;
+        //}
 
         /// <summary>
         /// 传入单颗颗粒的particle类对象,返回从field中抠取出的bitmap对象,抠取单颗颗粒
@@ -609,7 +617,6 @@ namespace OTSIncAReportGrids
 
             dgV_ParticlesDevidePage.Rows.Clear();
             dgV_ParticlesDevidePage.Columns.Clear();
-            string startFun = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
             //从报告xml文件中加载,显示计算列，显示元素信息
             string str_DefaultComputedColName = "", str_ElementsColName = "";
             DataSet ds = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.GetXmlData(Application.StartupPath + m_ReportApp.m_OTSReportMgrParamFile, "XMLData");
@@ -695,7 +702,7 @@ namespace OTSIncAReportGrids
                 {
                     keyValues.Add("ORIENTATION", table["str33"].ToString());
                 }
-                if (startFun == "1:CleannessA")
+                if (str_SysType == "1:CleannessA")
                 {
                     if (strs[i] == "Hardness")
                     {

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -668,5 +668,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             DT = dbHelper.ExecuteQuery(sqliteString);
             return DT;
         }
+
+        public SqlHelper GetSqlHelper() { return dbHelper; }
     }
 }

OTSIncAReportApp/OTSIncAReportApp.csproj

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

OTSIncAReportTemplate/OTSIncAReportTemplate.csproj

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

OTSPartA_STDEditor/OTSPartA_STDEditor.csproj

@@ -84,7 +84,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CleannessRelease|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\CleannessRelease\</OutputPath>
+    <OutputPath>..\bin\x64\CleannessRelease\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>

OTSRegister/OTSRegister.csproj

@@ -84,7 +84,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CleannessRelease|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\CleannessRelease\</OutputPath>
+    <OutputPath>..\bin\x64\CleannessRelease\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>

OTSSysMgrApp/OTSSysMgrApp.csproj

@@ -109,7 +109,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CleannessRelease|x64'">
-    <OutputPath>bin\x64\CleannessRelease\</OutputPath>
+    <OutputPath>..\bin\x64\CleannessRelease\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

RegistrationAuthorization/RegistrationAuthorization.csproj

@@ -84,7 +84,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CleannessRelease|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\CleannessRelease\</OutputPath>
+    <OutputPath>..\bin\x64\CleannessRelease\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>