Merge branch 'cxs' into dev 修改一些bug

OTSCPP/OTSClassifyEngine/InclutionClassifyEngine.cpp

@@ -36,12 +36,21 @@ bool InclutionClassifyEngine::Classify(COTSParticlePtr particle, int SteelTech,
 		particle->SetType(OTS_PARTICLE_TYPE::NOT_IDENTIFIED);
 		particle->TypeName("Not Identified");
 	}	
-	else if (stditm != nullptr)
+	else 
 	{
-		particle->SetType(OTS_PARTICLE_TYPE::IDENTIFIED);
-		particle->SetClassifyId(Id);
-		particle->TypeColor(stditm->GetColor().GetBuffer());
-		particle->TypeName(stditm->GetName().GetBuffer());
+		if (stditm != nullptr)
+		{
+			particle->SetType(OTS_PARTICLE_TYPE::IDENTIFIED);
+			particle->SetClassifyId(Id);
+			particle->TypeColor(stditm->GetColor().GetBuffer());
+			particle->TypeName(stditm->GetName().GetBuffer());
+		}
+		else
+		{
+			particle->SetType(OTS_PARTICLE_TYPE::NOT_IDENTIFIED);
+			particle->TypeName("Not Identified");
+		}
+		
 	}
 
 	return result;

OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp

@@ -37,7 +37,7 @@ namespace OTSClassifyEngine
 		if (!IsAnIncXRay(a_listElementChemistries, listElChemsInc, listElChemsIncNoFe, dMolarSum, dMolarSumNoFe, a_nIncId))
 		{
 			// this is not an inclusion, mark it as not identified
-			if(a_nIncId < 7)
+			if(a_nIncId < (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED)
 				a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return TRUE;
 		}
@@ -50,10 +50,11 @@ namespace OTSClassifyEngine
 		}
 
 		// system STD classification
-		int nIncId = (int)OTS_PARTICLE_TYPE::INVALID;
+		int nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 		if (!SystemClassify(a_pPartSTDData, steelTech, listElChemsIncNoFe, dMolarSumNoFe, nIncId))
 		{
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::ClassifyXray: failed to call SystemClassify method."));
+			a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return FALSE;
 		}
 
@@ -68,6 +69,7 @@ namespace OTSClassifyEngine
 		if (!UserClassify(a_pPartSTDData, listElChemsInc, dMolarSum, nIncId))
 		{
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::ClassifyXray: failed to call UserClassify method."));
+			a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return FALSE;
 		}
 
@@ -202,12 +204,14 @@ namespace OTSClassifyEngine
 		{
 			// something wrong
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::SulClassify: invalid CPartSTDDataPtr."));
+			a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return FALSE;
 		}
 		if (a_dMolarSumNoFe < MIN_ELEMENT_SUM)
 		{
 			// something wrong			
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::SulClassify: invalid molar sum value."));
+			a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return FALSE;
 		}
 
@@ -217,6 +221,7 @@ namespace OTSClassifyEngine
 		{
 			// something wrong
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::ClassifyXray: failed to call SulClassify method."));
+			a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return FALSE;
 		}
 
@@ -233,6 +238,7 @@ namespace OTSClassifyEngine
 		{
 			// something wrong
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::ClassifyXray: failed to call NitrideClassify method."));
+			a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return FALSE;
 		}
 		// inclusion identified?
@@ -248,6 +254,7 @@ namespace OTSClassifyEngine
 		{
 			// something wrong
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::ClassifyXray: failed to call OxideClassify method."));
+			a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return FALSE;
 		}
 		// inclusion identified?
@@ -263,6 +270,7 @@ namespace OTSClassifyEngine
 		{
 			// something wrong
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::ClassifyXray: failed to call CarbonClassify method."));
+			a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 			return FALSE;
 		}
 

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" />

OTSCPP/OTSData/OTSParticle.cpp

@@ -487,7 +487,7 @@ namespace OTSDATA {
 		m_nAnalysisId = -1;
 		m_nFieldId = -1;
 		// type
-		m_nTypeId = (int)OTS_PARTICLE_TYPE::INVALID;
+		m_nTypeId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
 		// area
 		m_dArea = 0;
 		// gray

OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureResultWindow.cs

@@ -313,7 +313,7 @@ namespace OTSMeasureApp
                         }
                         //添加统计行信息
                         DataRow dr = dt.NewRow();
-                        dr["TypeId"] = "";
+                        dr["TypeId"] = ""; 
                         dr["STDName"] = "";
                         string str = table["str6"].ToString();
                         dr["Number"] = str + IParticleAmount;

OTSIncAReportApp/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

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

OTSIncAReportApp/Control_Graph/OTSIncAReportGraphFuncation/OTSIncAReportFun.cs

@@ -1362,7 +1362,8 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
         public void GetDistrbutionSortimage_ByQuery(OTSIncAReportApp.OTSSampleReportInfo.OTSSampleMeaInfo sourceGridData)
         {
             List<string> FLNameList = new List<string>();
-            List<int> FLID = new List<int>() { -1,0, 1, 2, 4, 6, 7, 8, 9 };
+            //List<int> FLID = new List<int>() { -1,0, 1, 2, 4, 6, 7, 8, 9 };
+            List<int> FLID = new List<int>() { 0, 1, 2, 4, 6, 9, 10};
             List<string> NameList = new List<string>();
             int fltype = 0;
             //先清除list
@@ -1454,7 +1455,8 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
             }
             if (fltype == 0)
             {
-                NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype7"].ToString(), table["partcletype8"].ToString(), table["partcletype9"].ToString(), table["partcletype10"].ToString() };
+                //NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype7"].ToString(), table["partcletype8"].ToString(), table["partcletype9"].ToString(), table["partcletype10"].ToString() };
+                NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype9"].ToString(), table["partcletype10"].ToString() };
             }
             if (fltype == 1)
             {

OTSIncAReportApp/frmReportApp.Designer.cs

@@ -197,7 +197,7 @@
             this.ribbon1.OrbDropDown.Name = "";
             this.ribbon1.OrbDropDown.OptionItems.Add(this.ribbonOrbOptionButton1);
             this.ribbon1.OrbDropDown.RecentItems.Add(this.ribbonOrbRecentItem1);
-            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 336);
+            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 248);
             this.ribbon1.OrbDropDown.TabIndex = 0;
             this.ribbon1.OrbImage = global::OTSIncAReportApp.Properties.Resources.logo_40;
             // 
@@ -210,7 +210,7 @@
             this.ribbon1.QuickAcessToolbar.ToolTip = null;
             this.ribbon1.QuickAcessToolbar.ToolTipImage = null;
             this.ribbon1.QuickAcessToolbar.ToolTipTitle = null;
-            this.ribbon1.Size = new System.Drawing.Size(1914, 130);
+            this.ribbon1.Size = new System.Drawing.Size(1914, 195);
             this.ribbon1.TabIndex = 0;
             this.ribbon1.Tabs.Add(this.ribbonTab1);
             this.ribbon1.Tabs.Add(this.rbMenu);
@@ -230,6 +230,7 @@
             this.dpbOpen.ToolTip = null;
             this.dpbOpen.ToolTipImage = null;
             this.dpbOpen.ToolTipTitle = null;
+            this.dpbOpen.Click += new System.EventHandler(this.dpbOpen_Click);
             // 
             // dpbExport
             // 
@@ -553,9 +554,9 @@
             this.DockWindowPanel.ActiveAutoHideContent = null;
             this.DockWindowPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DockWindowPanel.DockBackColor = System.Drawing.SystemColors.Control;
-            this.DockWindowPanel.Location = new System.Drawing.Point(0, 130);
+            this.DockWindowPanel.Location = new System.Drawing.Point(0, 195);
             this.DockWindowPanel.Name = "DockWindowPanel";
-            this.DockWindowPanel.Size = new System.Drawing.Size(1914, 873);
+            this.DockWindowPanel.Size = new System.Drawing.Size(1914, 808);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;

OTSIncAReportApp/frmReportApp.cs

@@ -1195,9 +1195,44 @@ namespace OTSIncAReportApp
             }));
         }
 
+
         #endregion
 
-        
+        private void dpbOpen_Click(object sender, EventArgs e)
+        {
+            OpenProFile();
+        }
+
+        /// <summary>
+        /// 打开报告项目工程文件，封装方法
+        /// </summary>
+        /// <returns></returns>
+        private bool OpenProFile()
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Filter = "Measure Project Files((*.prj)|*.prj";
+            openFileDialog.ValidateNames = true;
+            openFileDialog.CheckPathExists = true;
+            openFileDialog.CheckFileExists = true;
+            openFileDialog.Multiselect = false;
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                string strFilePath = System.IO.Path.GetDirectoryName(openFileDialog.FileName);
+
+                System.IO.DirectoryInfo folder = new System.IO.DirectoryInfo(strFilePath);
+
+                foreach (System.IO.DirectoryInfo directory in folder.GetDirectories())
+                {
+                    foreach (System.IO.FileInfo file in directory.GetFiles("*.rst"))
+                    {
+                        this.m_RstWindow.AddSampleClick(file.FullName);
+                    }
+                }
+                return true;
+            }
+
+            else return false;
+        }
     }
 }
 

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>

XMLData/AppResource_ZH.xml

@@ -141,7 +141,7 @@
 	  <Control name="str2" text="连接" />
      </Controls>
   </Form>
-  <!-- OTSIncAReportApp -->
+ <!-- OTSIncAReportApp -->
 <Form>
    <Name>frmReportApp</Name>
     <Controls>
@@ -300,7 +300,7 @@
 	  <Control name="str6" text="是否按指定标准库重新进行分类?" />
 	  <Control name="str7" text="重新分类完成,请重新加载" />
 	  <Control name="str8" text="重新分类" />
-	  <Control name="str9" text="重新分类完成,请重新加载" />
+	  <Control name="str9" text="按指定标准库重新分类完成,请重新加载" />
 	  <Control name="str10" text="请先添加测量结果文件，才可以重新分类" />
     </Controls>
  </Form>
@@ -370,7 +370,7 @@
 	  <Control name="label2" text="左下点" />
 	  <Control name="label1" text="顶点" />
 	  <Control name="str1" text="常规参数" />
-	  <Control name="str2" text="颗粒成份图" />
+	  <Control name="str2" text="颗粒成分图" />
 	  <Control name="str3" text="请将模板中信息选择完整！" />
 	  <Control name="str4" text="模板中有相同选项是否生成！" />
     </Controls>
@@ -567,7 +567,7 @@
 	  <Control name="ToolStripMenuItem3" text="恢复至初始状态" />
       <Control name="str1" text="序号" />
 	  <Control name="str2" text="颗粒类型" />
-	  <Control name="str3" text="面积" />
+	  <Control name="str3" text="面积μm²" />
 	  <Control name="str4" text="颗粒名" />
     </Controls>
  </Form>
@@ -594,7 +594,8 @@
 	  <Control name="ToolStripMenuItem2" text="复制选择区域" />
 	  <Control name="ToolStripMenuItem3" text="恢复至初始状态" />
 	  <Control name="str1" text="序号" />
-	  <Control name="str8" text="颗粒名" />
+	  <Control name="str10" text="含小颗粒" />
+      <Control name="str8" text="颗粒名" />
     </Controls>
  </Form>
 <Form>
@@ -766,7 +767,7 @@
 	  <Control name="message40" text="请输入0-255之间的整数" />
 	  <Control name="message41" text="请输入正确的数值格式" />
 	  <Control name="message42" text="请输入正确的数值格式" />
-	  <Control name="message43" text="请输入正确的数值格式" />
+	  <Control name="message43" text="请输入不小于40的数值" />
 	  <Control name="message44" text="输入的数值过大!" />
 	  <Control name="message45" text="输入的数值过大" />
 	  <Control name="message46" text="输入的数值过大" />
@@ -938,12 +939,11 @@
       <Control name="m_reportname1" text="常用夹杂物分类" />
 	  <Control name="m_str_axisy1" text="颗粒数" />
 	  <Control name="str_operatonmodule1" text="常用夹杂物分类图" />
-	  <Control name="m_reportname2" text="颗粒成份" />
+	  <Control name="m_reportname2" text="颗粒成分" />
 	  <Control name="m_str_axisy2" text="颗粒数" />
-	  <Control name="str_operatonmodule2" text="颗粒成份图" />
-	  <Control name="m_reportname3" text="元素成份" />
+	  <Control name="m_reportname3" text="元素成分" />
 	  <Control name="m_str_axisy3" text="元素含量" />
-	  <Control name="str_operatonmodule3" text="元素成份图" />
+	  <Control name="str_operatonmodule3" text="元素成分图" />
 	  <Control name="m_reportname4" text="颗粒尺寸分布" />
 	  <Control name="m_str_axisy4" text="颗粒数" />
 	  <Control name="str_operatonmodule4" text="颗粒尺寸分布图" />
@@ -1250,22 +1250,18 @@
 	  <Control name="groupBox5" text="元素成分图" />
 	  <Control name="groupBox7" text="三元相图" />
 	  <Control name="groupBox8" text="颗粒列表" />
-	  
 	  <Control name="label3" text="主标题" />
 	  <Control name="label5" text="副标题" />
 	  <Control name="label1" text="样品编号" />
 	  <Control name="label4" text="参考标准" />
 	  <Control name="label7" text="显示结果概况" />
-	  
 	  <Control name="label8" text="页眉文本" />
 	  <Control name="label10" text="页脚文本" />
 	  <Control name="label2" text="客户号" />
-	  
 	  <Control name="label17" text="显示该模块" />
 	  <Control name="label14" text="计算方式" />
 	  <Control name="label15" text="粒级表信息" />
 	  <Control name="label16" text="颗粒范围" />
-	  
 	  <Control name="label18" text="显示该模块" />
 	  <Control name="label19" text="显示图形" />
 	  <Control name="label11" text="计算方式" />
@@ -1289,7 +1285,7 @@
 	  <Control name="label38" text="粒级表信息" />
 	  <Control name="label42" text="每行显示数量" />
 	  <Control name="label33" text="三元相图模板列表" />
-	  
+
 	  <Control name="label34" text="显示该模块" />
 	  <Control name="label37" text="计算方式" />
 	  <Control name="label35" text="颗粒范围" />