Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.3

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -830,6 +830,7 @@
 	  <Control name="SelectParticles" text="SelectParticles" />
 	  <Control name="DataSourceType" text="DataSourceType" />
 	  <Control name="InclusionAreaRatio" text="ParticleAreaRatio" />
+	  <Control name="IncaArea scale" text="ParticleAreaRatio" />
     </Controls>
  </Form>
   <Form>
@@ -983,9 +984,11 @@
 	  <Control name="label17" text="Time" />
 	  <Control name="label30" text="MinimumCount" />
 	  <Control name="label29" text="Accuracy" />
-	  <Control name="label32" text="ScanningTime" />
+	  <Control name="label32" text="LargeParticleX-rayTime" />
+	  <Control name="label45" text="SmallParticleX-rayTime" />
 	  <Control name="label33" text="CountingExpectations" />
-	  <Control name="label31" text="ScanningMode" />
+	  <Control name="label31" text="ScanningMode(Large particles)" />
+	  <Control name="label37" text="Analysis threshold" />
 	  <Control name="groupBox7" text="ModeSelection" />
 	  <Control name="lbModelSel" text="ModeSelection" />
 	  <Control name="lbLaboratoty" text="Laboratoty" />
@@ -1066,7 +1069,8 @@
 	  <Control name="message61" text="The item which called Using X-ray cannot be empty!" />
 	  
 	  <Control name="message62" text="The entered measurement area area cannot be empty!" />
-	  
+	  <Control name="message63" text="Please enter the correct numerical format!" />
+	  <Control name="message64" text="Please enter the correct numerical format!" />
     </Controls>
  </Form>
  <Form>

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -585,7 +585,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
 	  <Control name="partcletype10" text="分析颗粒" />
     </Controls>
  </Form>
@@ -690,7 +690,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
     </Controls>
  </Form>
  <Form>
@@ -718,7 +718,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
 	  <Control name="str20" text="尖晶石" />
 	  <Control name="str21" text="氧化物" />
 	  <Control name="str22" text="硫氧化物" />
@@ -744,7 +744,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
     </Controls>
  </Form>
  <Form>
@@ -800,7 +800,7 @@
 	  <Control name="sscaptionname27" text="颗粒成分" />
 	  <Control name="sscaptionname29" text="颗粒尺寸分布" />
 	  <Control name="sscaptionname30" text="平均元素成分" />
-          <Control name="m_reportname1" text="常用颗粒分类" />
+          <Control name="m_reportname1" text="颗粒分组" />
 	  <Control name="m_str_axisy1" text="颗粒数" />
 	  <Control name="str_operatonmodule1" text="常用颗粒分类图" />
 	  <Control name="m_reportname2" text="颗粒成份" />
@@ -821,11 +821,12 @@
 	  <Control name="ChineseStandard2" text="国标方法二" />
 	  <Control name="AmericanStandard" text="美标" />
 	  <Control name="GermanStandard" text="德标" />
-	  <Control name="CommonClassification" text="常用颗粒分类" />
+	  <Control name="CommonClassification" text="颗粒分组" />
 	  <Control name="AllParticles" text="全部颗粒" />
 	  <Control name="SelectParticles" text="选择颗粒" />
 	  <Control name="DataSourceType" text="数据源类型" />
 	  <Control name="InclusionAreaRatio" text="颗粒面积比" />
+	  <Control name="IncaAreascale" text="颗粒面积比" />
     </Controls>
  </Form>
  <Form>
@@ -875,7 +876,7 @@
 	  <Control name="str8" text="灰度#" />
 	  <Control name="str9" text="移动SEM到当前位置" />
 	  <Control name="str10" text="移动SEM到颗粒视域位置" />
-          <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+          <Control name="partcletype9" text="未识别颗粒" />
 	  <Control name="partcletype10" text="分析颗粒" />
     </Controls>
  </Form>
@@ -980,9 +981,11 @@
 	  <Control name="label17" text="使用系统库开关" />
 	  <Control name="label30" text="搜索X-ray最低计数" />
 	  <Control name="label29" text="搜索X-ray精度" />
-	  <Control name="label32" text="分析X-ray扫描时间" />
+	  <Control name="label32" text="大颗粒X-ray时间" />
+	  <Control name="label45" text="小颗粒Xray时间" />
 	  <Control name="label33" text="分析X-ray计数期望值" />
-	  <Control name="label31" text="X-ray扫描方式" /> 
+	  <Control name="label31" text="扫描方式(大颗粒）" /> 
+	  <Control name="label37" text="分析阈值" />
 	  <Control name="groupBox7" text="模式选择" />
 	  <Control name="lbModelSel" text="模式选择" />
 	  <Control name="lbLaboratoty" text="实验室" />
@@ -1062,6 +1065,8 @@
 	  <Control name="message60" text="请输入正确的数值格式!" />
 	  <Control name="message61" text="是否使用X-ray项不能为空" />
 	  <Control name="message62" text="输入的测量区域面积不可以为空!" />
+	  <Control name="message63" text="请输入正确的数值范围!" />
+	  <Control name="message64" text="请输入正确的数值范围!" />
     </Controls>
  </Form>
  <Form>
@@ -1232,7 +1237,7 @@
   <Form>
     <Name>SampleGrid</Name>
     <Controls>
-      <Control name="m_reportname1" text="常用颗粒分类" />
+      <Control name="m_reportname1" text="颗粒分组" />
 	  <Control name="m_str_axisy1" text="颗粒数" />
 	  <Control name="str_operatonmodule1" text="常用颗粒分类图" />
 	  <Control name="m_reportname2" text="颗粒成份" />
@@ -1280,7 +1285,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" />
+	  <Control name="partcletype9" text="未识别颗粒" />
     </Controls>
  </Form>
  <Form>
@@ -1325,7 +1330,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒/非夹杂物" /> 
+	  <Control name="partcletype9" text="未识别颗粒" /> 
 	  <Control name="str21" text="面积μm²" />
 	  <Control name="str22" text="等效圆直径μm" />
 	  <Control name="str23" text="最长直径μm" />
@@ -1354,7 +1359,7 @@
 	  <Control name="str8" text="不进行x-ray分析的颗粒" />
 	  <Control name="str9" text="非夹杂物颗粒SiC" />
 	  <Control name="str10" text="非夹杂物颗粒FeO" />
-	  <Control name="str11" text="未识别颗粒/非夹杂物" />
+	  <Control name="str11" text="未识别颗粒" />
     </Controls>
  </Form>
   <!-- OTSPeriodicTable -->

OTSCPP/OTSRptCalculate/DTL/DBConst.cpp

@@ -45,7 +45,7 @@ namespace OTSSQLITE
 	const CString g_sMineralElementsTableName("MineralElements");
 
 	//
-	const CString g_sMineralGroupTableName("MineralGroups");
+	const CString g_sMineralGroupTableName("STDGroups");
 
 	// MergedParticlesTable
 	const CString g_sMergedParticlesTableName("MergedParticles");

OTSCPP/OTSSQLiteDll/DBConst.cpp

@@ -45,5 +45,5 @@ namespace OTSSQLITE
 	const CString g_sMineralElementsTableName("MineralElements");
 
 	//
-	const CString g_sMineralGroupTableName("MineralGroups");
+	const CString g_sMineralGroupTableName("STDGroups");
 }

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -678,6 +678,9 @@ namespace OTSMeasureApp
             //分析X-ray计数期望值
             IDC_EDIT_ANALYXRAYAIMVALUE.Text = m_cotsxrayprm.GetAnalyExpCount().ToString();
 
+            IDC_EDIT_QuantifyMinSize.Text = m_cotsxrayprm.GetQuantifyMinSize().ToString();
+
+            IDC_EDIT_SmallPartAQTime.Text = m_cotsxrayprm.GetFastXrayTime().ToString();
             //IDC_XRAY_MODE_SWITCH.Checked = m_cotsxrayprm.GetShowScanMode();
             //IDC_XRAY_TIME_SWITCH.Checked = m_cotsxrayprm.GetShowSpeed();
             //IDC_XRAY_COUNT_SWITCH.Checked = m_cotsxrayprm.GetShowExpCount();
@@ -848,6 +851,10 @@ namespace OTSMeasureApp
 
             //分析X-ray计数期望值
             m_cotsxrayprm.SetAnalyExpCount(Convert.ToInt32(IDC_EDIT_ANALYXRAYAIMVALUE.Text));
+
+            m_cotsxrayprm.SetQuantifyMinSize(Convert.ToInt32(IDC_EDIT_QuantifyMinSize.Text));
+
+            m_cotsxrayprm.SetFastXrayTime(Convert.ToInt32(IDC_EDIT_SmallPartAQTime.Text));
             //m_cotsxrayprm.SetShowScanMode(IDC_XRAY_MODE_SWITCH.Checked);
             //m_cotsxrayprm.SetShowSpeed(IDC_XRAY_TIME_SWITCH.Checked);
             //m_cotsxrayprm.SetShowExpCount(IDC_XRAY_COUNT_SWITCH.Checked);
@@ -1485,6 +1492,22 @@ namespace OTSMeasureApp
                 return false;
             }
 
+            if (false == rg.Match(IDC_EDIT_QuantifyMinSize.Text.Trim()).Success)
+            {
+                IDC_EDIT_QuantifyMinSize.Focus();
+                IDC_EDIT_QuantifyMinSize.SelectAll();
+                string message = table["message63"].ToString();
+                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return false;
+            }
+            if (false == rg.Match(IDC_EDIT_SmallPartAQTime.Text.Trim()).Success)
+            {
+                IDC_EDIT_SmallPartAQTime.Focus();
+                IDC_EDIT_SmallPartAQTime.SelectAll();
+                string message = table["message64"].ToString();
+                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return false;
+            }
             //测量区域面积mm2
             if (false == rg.Match(tBMeasArea.Text.Trim()).Success)
             {

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1920,19 +1920,17 @@ namespace OTSIncAReportGraph.Controls
         private void GetPic(PaintEventArgs args)
         {
 
-                    foreach (var f in m_list_allDfield)
-                    {
+            foreach (var f in m_list_allDfield)
+            {
 
-                        var curfldrec = f.Current_Rect;
-                        if (curfldrec.Left > -1000 && curfldrec.Right <this.Width + 1000 && curfldrec.Top > -1000 && curfldrec.Bottom < this.Height + 1000)
-                        {
+                var curfldrec = f.Current_Rect;
+                if (curfldrec.Left > -1000 && curfldrec.Right < this.Width + 1000 && curfldrec.Top > -1000 && curfldrec.Bottom < this.Height + 1000)
+                {
 
+                    args.Graphics.DrawImage(f.OriginalImage, f.Current_Rect.X, f.Current_Rect.Y, f.Current_Rect.Width, f.Current_Rect.Height);
+                }
+            }
 
-                     
-                            args.Graphics.DrawImage(f.OriginalImage, f.Current_Rect.X, f.Current_Rect.Y, f.Current_Rect.Width, f.Current_Rect.Height);
-                        }
-                    }
-          
         }
 
         

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -754,7 +754,7 @@ namespace OTSIncAReportApp
                             break;
 
                         case CALCULATE_CHART_TYPE.INCLUSION_AREA_RATIO:
-                            m_reportname = "夹杂物面积比";
+                            m_reportname = resTable["incaareascale"].ToString();
                             m_str_AxisY = "平方微米";
 
                             m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.EChart_ParticlesComposition(m_ReportApp, "InclusionareaRatio");

OTSPartA_STDEditor/Attributes.cs

@@ -209,7 +209,7 @@ namespace OTSPartA_STDEditor
             Grid_Attributes[8, 1].Value = m_MainForm.STDDictionary[STDId].Formula;
             Grid_Attributes[9, 1].Value = m_MainForm.STDDictionary[STDId].Element;
 
-            m_MainForm.AddMineralGroupsToAttribute();
+            m_MainForm.AddSTDGroupsToAttribute();
             Grid_Attributes[10, 1].Value = m_MainForm.GroupIdDictionaryFromId[int.Parse(m_MainForm.STDDictionary[STDId].GroupId)];
 
             //SourceGrid.Position po = new SourceGrid.Position(1, 0);

OTSPartA_STDEditor/Form_ConstantsEditor2.cs

@@ -514,7 +514,6 @@ namespace OTSPartA_STDEditor
                     return false;
                 }
             }
-
             #region 化学式和元素暂无限制
             //if (m_Attributes.Grid_Attributes[7, 1].Value.ToString())
             //{
@@ -1276,13 +1275,13 @@ namespace OTSPartA_STDEditor
         }
 
 
-        public void AddMineralGroupsToAttribute()
+        public void AddSTDGroupsToAttribute()
         {
             try
             {
                 System.Data.SQLite.SQLiteConnection m_dbConnection = new System.Data.SQLite.SQLiteConnection("data source='" + STDDBAddress + "'");
                 m_dbConnection.Open();
-                System.Data.SQLite.SQLiteDataAdapter m_dataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select name,id from MineralGroups order by iorder", m_dbConnection);
+                System.Data.SQLite.SQLiteDataAdapter m_dataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select name,id from STDGroups order by iorder", m_dbConnection);
                 DataSet ds = new DataSet();
                 m_dataAdapter.Fill(ds);
                 DataTable dt = ds.Tables[0];
@@ -1323,7 +1322,7 @@ namespace OTSPartA_STDEditor
             DialogResult dialogResult = form_GroupId.ShowDialog();
             if (dialogResult == DialogResult.Yes)
             {
-                AddMineralGroupsToAttribute();
+                AddSTDGroupsToAttribute();
             }
         }
 

OTSPartA_STDEditor/Form_GroupId.cs

@@ -18,7 +18,7 @@ namespace OTSPartA_STDEditor
         System.Collections.Hashtable table_GroupId;
 
         string MineralGroupDBAddress = Application.StartupPath + "\\Config\\SysData\\" + "OTSCleanlinesSTD.db";
-        Dictionary<int,MineralGroups> MineralGroupDictionary = new Dictionary<int, MineralGroups>();
+        Dictionary<int,STDGroups> MineralGroupDictionary = new Dictionary<int, STDGroups>();
 
         /// <summary>
         ///数据库修改状态
@@ -36,7 +36,7 @@ namespace OTSPartA_STDEditor
             {
                 System.Data.SQLite.SQLiteConnection m_dbConnection = new System.Data.SQLite.SQLiteConnection("data source='" + DBaddress + "'");
                 m_dbConnection.Open();
-                System.Data.SQLite.SQLiteDataAdapter m_dataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select * from MineralGroups order by iorder", m_dbConnection);
+                System.Data.SQLite.SQLiteDataAdapter m_dataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select * from STDGroups order by iorder", m_dbConnection);
                 DataSet ds = new DataSet();
                 m_dataAdapter.Fill(ds);
                 DataTable dt = ds.Tables[0];
@@ -47,7 +47,7 @@ namespace OTSPartA_STDEditor
                     {
                         foreach (DataRow item in dt.Rows)
                         {
-                            MineralGroups new_STDdata = new MineralGroups();
+                            STDGroups new_STDdata = new STDGroups();
                             new_STDdata.name = item["name"].ToString();
                             new_STDdata.color = item["color"].ToString();
                             new_STDdata.iorder = int.Parse(item["iorder"].ToString());
@@ -105,7 +105,7 @@ namespace OTSPartA_STDEditor
         protected bool WhetherExistsInDBById(System.Data.SQLite.SQLiteConnection m_dbConnection, int id)
         {
             bool selResult = false;
-            System.Data.SQLite.SQLiteDataAdapter m_dataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select * from MineralGroups where id=" + id.ToString() + "", m_dbConnection);
+            System.Data.SQLite.SQLiteDataAdapter m_dataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select * from STDGroups where id=" + id.ToString() + "", m_dbConnection);
             DataSet ds = new DataSet();
             m_dataAdapter.Fill(ds);
             DataTable dt = ds.Tables[0];
@@ -124,7 +124,7 @@ namespace OTSPartA_STDEditor
             System.Data.SQLite.SQLiteCommand cmm = m_dbConnection.CreateCommand();
             try
             {
-               string insertstr = "Insert into MineralGroups(id,name,color,iorder)";
+               string insertstr = "Insert into STDGroups(id,name,color,iorder)";
                string aa = "values(" + id + ",'" + name + "','" + color + "'," + iorder+ ")";
                cmm.CommandText = insertstr + aa;
                cmm.ExecuteNonQuery();
@@ -141,7 +141,7 @@ namespace OTSPartA_STDEditor
             System.Data.SQLite.SQLiteCommand cmm = m_dbConnection.CreateCommand();
             try
             {
-                string insertstr = "update MineralGroups set name='" + name + "',color='"+ color + "',iorder=" + iorder+ " where id=" + id + ";";
+                string insertstr = "update STDGroups set name='" + name + "',color='"+ color + "',iorder=" + iorder+ " where id=" + id + ";";
                 cmm.CommandText = insertstr;
                 cmm.ExecuteNonQuery();
                 return true;
@@ -157,7 +157,7 @@ namespace OTSPartA_STDEditor
             System.Data.SQLite.SQLiteCommand cmm = m_dbConnection.CreateCommand();
             try
             {
-                string insertstr = "delete from MineralGroups where id=" + id + ";";
+                string insertstr = "delete from STDGroups where id=" + id + ";";
                 cmm.CommandText = insertstr;
                 cmm.ExecuteNonQuery();
                 return true;
@@ -177,7 +177,7 @@ namespace OTSPartA_STDEditor
             System.Data.SQLite.SQLiteConnection m_dbConnection = new System.Data.SQLite.SQLiteConnection("data source='" + DBAddress + "'");
             m_dbConnection.Open();
 
-            foreach (KeyValuePair<int, MineralGroups> kv in MineralGroupDictionary)
+            foreach (KeyValuePair<int, STDGroups> kv in MineralGroupDictionary)
             {
                 int infoState = kv.Value.InfoState;
                 if (infoState == (int)DBInfoState.Modify)
@@ -253,7 +253,7 @@ namespace OTSPartA_STDEditor
 
 
                 int i = 1;
-                foreach (KeyValuePair<int, MineralGroups> kv in MineralGroupDictionary)
+                foreach (KeyValuePair<int, STDGroups> kv in MineralGroupDictionary)
                 {
                     Grid_FroupId[i, 0] = new SourceGrid.Cells.Cell(kv.Value.name, typeof(string));
                     Grid_FroupId[i, 1] = new SourceGrid.Cells.Cell("", typeof(string));
@@ -282,14 +282,13 @@ namespace OTSPartA_STDEditor
         }
         public int AddMineralGroupDictionaryItem()
         {
-            MineralGroups new_MineralGroup = new MineralGroups();//定义一个TreeNode节点对象
+            STDGroups new_MineralGroup = new STDGroups();//定义一个TreeNode节点对象
             new_MineralGroup.name = "New Group";
             new_MineralGroup.color = Attributes.colorRGBtoHx16(Color.Gray.R, Color.Gray.G, Color.Gray.B);
             new_MineralGroup.InfoState = (int)DBInfoState.Modify;
 
-            int Id = 1;
-
-            foreach (KeyValuePair<int, MineralGroups> kv in MineralGroupDictionary)
+            int Id = 100;
+            foreach (KeyValuePair<int, STDGroups> kv in MineralGroupDictionary)
             {
                 if (Id < kv.Key)
                 {

OTSPartA_STDEditor/OTSPartA_STDEditor.csproj

@@ -132,7 +132,7 @@
     <Compile Include="Form_PeriodicTable.Designer.cs">
       <DependentUpon>Form_PeriodicTable.cs</DependentUpon>
     </Compile>
-    <Compile Include="MineralGroups.cs" />
+    <Compile Include="STDGroups.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

OTSPartA_STDEditor/MineralGroups.cs → OTSPartA_STDEditor/STDGroups.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace OTSPartA_STDEditor
 {
-    class MineralGroups
+    class STDGroups
     {
         //int s_id = 0;
         string s_name = "";