Merge branch 'ZJX' into dev

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

@@ -189,6 +189,8 @@
       <Control name="AddSample" text="AddSample" />
       <Control name="button1" text="MultipleDataSources" />
       <Control name="frmMeasureRstMgr" text="MeasurementResult" />
+	  <Control name="str1" text="Delete  " />
+	  <Control name="str2" text=" file?" />
     </Controls>
  </Form>
 <Form>
@@ -238,6 +240,19 @@
 	  <Control name="frmPartSizeEditor" text="PartSizeEditor" />
     </Controls>
  </Form>
+ <Form>
+    <Name>Triangulation_List</Name>
+    <Controls>
+      <Control name="Triangulation_List" text="三元相图模板列表" />
+	  <Control name="button1" text="添  加" />
+	  <Control name="button3" text="保  存" />
+	  <Control name="button2" text="返  回" />
+	  <Control name="str1" text="序号" />
+	  <Control name="str2" text="模板名称" />
+	  <Control name="str3" text="修改" />
+	  <Control name="str4" text="删除" />
+    </Controls>
+ </Form>
  <Form>
     <Name>frmReportSysConfig</Name>
     <Controls>
@@ -709,7 +724,6 @@
 	  <Control name="sscaptionname10" text="Data Table Type" />
 	  <Control name="sscaptionname11" text="Data Graph Type" />
 	  <Control name="sscaptionname12" text="Ternary Phase Ciagram" />
-	  
 	  <Control name="sscaptionname13" text="Classification" />
 	  <Control name="sscaptionname14" text="Distribution Map" />
 	  <Control name="sscaptionname15" text="Permutation Diagram" />
@@ -792,6 +806,7 @@
 	  <Control name="rbMeasureRectangle" text="Rectangle" />
 	  <Control name="ribCircle" text="Circle" />
 	  <Control name="ribRectangle" text="Rectangle" />
+	  <Control name="ribPolygon" text="polygon" />
 	  <Control name="rbPanelFunction" text="MeasurementControl" />
 	  <Control name="rbStart" text="Start" />
 	  <Control name="rbStop" text="Stop" />
@@ -813,8 +828,11 @@
 	  <Control name="m_MeasureStauWindowName" text="MeasurementState" />
 	  <Control name="m_MeasureRetWindowName" text="MeasurementResult" />
 	  <Control name="m_NoWindowName" text="UnknownWorkingWindow" />
+	  <Control name="rbSTDEdit" text="Edit standard library" />
+	  <Control name="rbReClassify" text="Reclassification" />
+	  <Control name="language" text="EN" />
 	  <Control name="message1" text="No OTSIncA valid pass!" />
-	   <Control name="message2" text="Is the current file modified or saved?" />
+	  <Control name="message2" text="Is the current file modified or saved?" />
 	  <Control name="message3" text="Error log" />
 	  <Control name="message4" text="Whether to save modification information" />
 	  <Control name="message5" text="Confirm deletion  " />
@@ -1033,6 +1051,7 @@
     <Name>OTSMeasureStatusWindow</Name>
     <Controls>
       <Control name="SampleParaLock" text="GetBSEDiagram" />
+	  <Control name="ViewStripMenuItem" text="Set the visual gray range of BSE image" />
 	  <Control name="ChangeDiffImageShow" text="SwitchToBSE" />
 	  <Control name="ToolStripMenuItem" text="De-backgroundImage " />
 	  <Control name="grayToolStripMenuItem" text="DisplayB-GrayCurve" />
@@ -1059,6 +1078,11 @@
 	  <Control name="message17" text="AtomicNumber" />
 	  <Control name="message18" text="PercentageOfMass" />
 	  <Control name="message19" text="MoleRatio" />
+	  <Control name="message20" text="Acquire image error acquirebseimage_ Click:" />
+	  <Control name="message21" text="Delete single point acquisition information and display ruler information:" />
+	  <Control name="message22" text="Data is less than 2!" />
+	  <Control name="message23" text="error" />
+	  <Control name="message24" text="Get SEM current location:" />
     </Controls>
  </Form>
   <Form>
@@ -1157,6 +1181,16 @@
 	  <Control name="ToolStripMenuItem_selectparticle" text="Selected granules" />
 	  <Control name="ToolStripMenuItem_exportimagefile" text="Export image file" />
 	  <Control name="ToolStripMenuItem_exportzoomimagefile" text="Export enlarged image file" />
+	  <Control name="label_Condition" text="Condition query:" />
+	  <Control name="label_Area" text="Area(μm²)" />
+	  <Control name="label_Dmax" text="Dmax(μm)" />
+	  <Control name="label_ParticleName" text="ParticleName" />
+	  <Control name="btn_Sel" text="Sel" />
+	  <Control name="label_order" text="Sort by:" />
+	  <Control name="label1" text="common" />
+	  <Control name="label4" text="Records per page" />
+	  <Control name="label2" text="Article of" />
+	  <Control name="label6" text="page" />
 	  <Control name="str1" text="Selected particles" />
 	  <Control name="str2" text="Selected" />
 	  <Control name="str3" text="Please switch to the analysis chart!" />
@@ -1166,8 +1200,9 @@
 	  <Control name="str7" text="Start loading granular list information" />
 	  <Control name="str8" text="Particle list, loaded" />
 	  <Control name="str9" text="Export completed, image total" />
-	  
-	   <Control name="str12" text="Load the granular list and start creating table structured Columns" />
+	  <Control name="str10" text="The type of input is error!" />
+	  <Control name="str11" text="Please pay attention to the corresponding size relationship of the input value! "/>
+	  <Control name="str12" text="Load the granular list and start creating table structured Columns" />
 	  <Control name="str15" text="Loading particle list, getting" />
 	  <Control name="str18" text="Value" />
 	  <Control name="partcletype0" text="SMALL" />
@@ -1178,15 +1213,26 @@
       <Control name="partcletype7" text="NOT_IDENTIFIED_SIC" />
 	  <Control name="partcletype8" text="NOT_IDENTIFIED_FEO" />
 	  <Control name="partcletype9" text="NOT_IDENTIFIED" />
-	  
 	  <Control name="label_Condition" text="Query Conditions:" />
 	  <Control name="label_Area" text="Area" />
 	  <Control name="label_Dmax" text="Dmax" />
 	  <Control name="label_ParticleName" text="ParticleName" />
 	  <Control name="btn_Sel" text="Query" />
 	  <Control name="label_order" text="SortingMode:" />
-	  <Control name="str10" text="The type of input is error!" />
-	  <Control name="str11" text="Please pay attention to the corresponding size relationship of the input value! "/>
+	  
+	  <Control name="str21" text="Areaμm²" />
+	  <Control name="str22" text="Equivalent circle diameterμm" />
+	  <Control name="str23" text="Longest diameterμm" />
+	  <Control name="str24" text="Minimum diameterμm" />
+      <Control name="str25" text="Long short diameter ratio" />
+	  <Control name="str26" text="Ferret diameterμm" />
+	  <Control name="str27" text="Orthogonal diameterμm" />
+	  <Control name="str28" text="Perimeterμm" />
+	  <Control name="str29" text="Inscribed circle diameterμm" />
+	  <Control name="str30" text="Average diameter of inscribed circleμm！" />
+	  <Control name="str31" text="Expansion lengthμm" />
+	  <Control name="str32" text="Expanded aspect ratio" />
+	  <Control name="str33" text="Orientation angle °" />
     </Controls>
  </Form>
   <Form>
@@ -1341,6 +1387,35 @@
       <Control name="OTSMeasureOutputNlog" text="LogOutput" />
 	  <Control name="label1" text="LogOutputStype:" />
 	  <Control name="button_clear" text="Clear" />
+	  <Control name="button_stop" text="Stop" />
+    </Controls>
+ </Form>
+ 
+ 
+ <Form>
+    <Name>ToolWindow</Name>
+    <Controls>
+      <Control name="ToolWindow" text="Set the visual gray range of BSE image" />
+	  <Control name="groupBox1" text="Set parameters" />
+	  <Control name="label1" text="Gray scale range" />
+	  <Control name="btnYes" text="confirm" />
+	  <Control name="btnCancel" text="cancel" />
+    </Controls>
+ </Form>
+ <Form>
+    <Name>DINStandardABCDDS</Name>
+    <Controls>
+      <Control name="str1" text="Inclusion grade" />
+	  <Control name="str2" text="result" />
+	  <Control name="str3" text="K0 index" />
+    </Controls>
+ </Form>
+ <Form>
+    <Name>frmParticleClassification</Name>
+    <Controls>
+      <Control name="frmParticleClassification" text="Set particle classification" />
+	  <Control name="label1" text="Select type" />
+	  <Control name="button1" text="determine" />
     </Controls>
  </Form>
 </Resource>

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

@@ -718,13 +718,10 @@
 	  <Control name="sscaptionname6" text="最小颗粒" />
 	  <Control name="sscaptionname7" text="最大颗粒" />
 	  <Control name="sscaptionname8" text="尺寸计算法" />
-	  
 	  <Control name="sscaptionname9" text="数据类型" />
 	  <Control name="sscaptionname10" text="数据表类型" /> 
-	  
 	  <Control name="sscaptionname11" text="数据图类型" />
 	  <Control name="sscaptionname12" text="三元相图" />
-	  
 	  <Control name="sscaptionname13" text="颗粒分类图" />
 	  <Control name="sscaptionname14" text="颗粒分布图" />
 	  <Control name="sscaptionname15" text="颗粒排列图" />
@@ -763,7 +760,6 @@
 	  <Control name="str8" text="灰度#" />
 	  <Control name="str9" text="移动SEM到当前位置" />
 	  <Control name="str10" text="移动SEM到颗粒视域位置" />
-	 
     </Controls>
  </Form>
  <Form>
@@ -784,7 +780,6 @@
 	  <Control name="str8" text="灰度#" />
 	  <Control name="str9" text="移动SEM到当前位置" />
 	  <Control name="str10" text="移动SEM到颗粒视域位置" />
-	 
     </Controls>
  </Form>
   <!-- OTSIncAMeasureApp -->
@@ -882,20 +877,31 @@
 	  <Control name="label26" text="最大" />
 	  <Control name="label23" text="最小" />
 	  <Control name="label20" text="颗粒尺寸范围" />
+	  <Control name="lbShape" text="测量区域形状" />
+	  <Control name="lbArea" text="测量区域面积/mm2" />
 	  <Control name="groupBox6" text="X-ray参数" />
 	  <Control name="label17" text="使用系统库开关" />
 	  <Control name="label30" text="搜索X-ray最低计数" />
 	  <Control name="label29" text="搜索X-ray精度" />
 	  <Control name="label32" text="分析X-ray扫描时间" />
 	  <Control name="label33" text="分析X-ray计数期望值" />
-	  <Control name="label31" text="X-ray扫描方式" />
-	  <Control name="lbShape" text="测量区域形状" />
-	  <Control name="lbArea" text="测量区域面积/mm2" />
-	  <Control name="btnok" text="确  定" />
-	  <Control name="btncancel" text="取  消" />
+	  <Control name="label31" text="X-ray扫描方式" /> 
+	  <Control name="groupBox7" text="模式选择" />
+	  <Control name="lbModelSel" text="模式选择" />
+	  <Control name="lbLaboratoty" text="实验室" />
+	  <Control name="lbAnalysisReferenceNumber" text="分析参考编号" />
+	  <Control name="lbCustomerName" text="客户名称" />
+	  <Control name="lbOperatorName" text="操作员姓名" />
+	  <Control name="lbSampleDescription" text="样本描述" />
+	  <Control name="lbComment" text="评论" />
+	  <Control name="label_AUTOBGREMOVE_TYPE" text="AUTOBGREMOVE_TYPE" />
+	  <Control name="label_Auto" text="自动" />
+	  <Control name="label_FrameEndMode" text="帧结束模式" />
 	  <Control name="groupBox9" text="标准库选择" />
 	  <Control name="label43" text="标准库选择：" />
 	  <Control name="label44" text="是否使用X-ray" />
+	  <Control name="btnok" text="确  定" />
+	  <Control name="btncancel" text="取  消" />
 	  <Control name="ProgMgrInfoForm" text="程序管理" />
 	  <Control name="message1" text="样品台信息不能为空" />
 	  <Control name="message2" text="100倍时屏幕尺寸不能为空" />
@@ -1070,13 +1076,11 @@
 	  <Control name="message17" text="原子数" />
 	  <Control name="message18" text="质量百分比" />
 	  <Control name="message19" text="摩尔比" />
-	  
 	  <Control name="message20" text="获取图像错误AcquireBSEImage_Click:" />
 	  <Control name="message21" text="删除单点采集信息与显示标尺信息:" />
 	  <Control name="message22" text="数据小于2！" />
 	  <Control name="message23" text="错误" />
 	  <Control name="message24" text="获取SEM当前位置:" />
-	  
     </Controls>
  </Form>
  <Form>
@@ -1153,8 +1157,7 @@
 	 
 	  <Control name="str12" text="加载颗粒列表，开始创建表结构列...." />
 	  <Control name="str15" text="加载颗粒列表,正在获取" />
-	  <Control name="str18" text="数值" />
-	  
+	  <Control name="str18" text="数值" />	  
 	  <Control name="partcletype0" text="过小颗粒" />
 	  <Control name="partcletype1" text="过大颗粒" />
 	  <Control name="partcletype2" text="亮度不在分析范围内的颗粒" />
@@ -1197,7 +1200,9 @@
 	  <Control name="str9" text="导出完成，图像共" />
 	  <Control name="str10" text="输入类型错误！" />
 	  <Control name="str11" text="请注意输入数值的对应大小关系！"/>
-	  
+	  <Control name="str12" text="加载粒度列表并开始创建表结构列" />
+	  <Control name="str15" text="正在加载颗粒列表，正在获取" />
+	  <Control name="str18" text="Value" />
 	  <Control name="partcletype0" text="过小颗粒" />
 	  <Control name="partcletype1" text="过大颗粒" />
 	  <Control name="partcletype2" text="亮度不在分析范围内的颗粒" />
@@ -1206,12 +1211,17 @@
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
 	  <Control name="partcletype9" text="未识别颗粒" />
-
+	  <Control name="label_Condition" text="查询条件：" />
+	  <Control name="label_Area" text="Area" />
+	  <Control name="label_Dmax" text="Dmax" />
+	  <Control name="label_ParticleName" text="颗粒名称" />
+	  <Control name="btn_Sel" text="查询" />
+	  <Control name="label_order" text="排序模式：" />
+	  
 	  <Control name="str21" text="面积μm²" />
 	  <Control name="str22" text="等效圆直径μm" />
 	  <Control name="str23" text="最长直径μm" />
 	  <Control name="str24" text="最短直径μm" />
-	  
       <Control name="str25" text="长短直径比" />
 	  <Control name="str26" text="费雷特直径μm" />
 	  <Control name="str27" text="正交直径μm" />

OTSIncAReportApp/frmMeasureRstMgr.Designer.cs

@@ -31,30 +31,18 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMeasureRstMgr));
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.RDeleteNode = new System.Windows.Forms.ToolStripMenuItem();
             this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.AddSample = new System.Windows.Forms.ToolStripMenuItem();
             this.treeView1 = new System.Windows.Forms.TreeView();
             this.button1 = new System.Windows.Forms.Button();
-            this.contextMenuStrip1.SuspendLayout();
             this.contextMenuStrip2.SuspendLayout();
             this.SuspendLayout();
             // 
             // contextMenuStrip1
             // 
             this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
-            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.RDeleteNode});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(157, 34);
-            // 
-            // RDeleteNode
-            // 
-            this.RDeleteNode.Image = global::OTSIncAReportApp.Properties.Resources.delete32;
-            this.RDeleteNode.Name = "RDeleteNode";
-            this.RDeleteNode.Size = new System.Drawing.Size(156, 30);
-            this.RDeleteNode.Text = "删除测量结果";
-            this.RDeleteNode.Click += new System.EventHandler(this.RDeleteNode_Click_1);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 26);
             // 
             // contextMenuStrip2
             // 
@@ -94,7 +82,7 @@
             // button1
             // 
             this.button1.Location = new System.Drawing.Point(1, 1);
-            this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(88, 25);
             this.button1.TabIndex = 7;
@@ -116,12 +104,11 @@
             | 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 = "frmMeasureRstMgr";
             this.RightToLeftLayout = true;
             this.Text = "测量结果窗口";
             this.WindowState = System.Windows.Forms.FormWindowState.Minimized;
-            this.contextMenuStrip1.ResumeLayout(false);
             this.contextMenuStrip2.ResumeLayout(false);
             this.ResumeLayout(false);
 
@@ -129,7 +116,6 @@
 
         #endregion
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem RDeleteNode;
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip2;
         private System.Windows.Forms.ToolStripMenuItem AddSample;
         public System.Windows.Forms.TreeView treeView1;

OTSIncAReportApp/frmMeasureRstMgr.cs

@@ -385,10 +385,8 @@ namespace OTSIncAReportApp
             if (DialogResult.OK == MessageBox.Show(sDeleteSampleName, "Tip", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning))
             {
                 //删除当前选中的节点
-                TreeNode tvnode = treeView1.SelectedNode;
-                treeView1.Nodes.Remove(tvnode);
+                DeletSample_Event(treeView1.SelectedNode.Text);
 
-                
                 //当节点全部删除完时刷新树以及主窗口的控件
                 if (treeView1.Nodes.Count == 0)
                 {
@@ -404,6 +402,7 @@ namespace OTSIncAReportApp
                     //删除树上的节点
                     m_WorkSampleName = m_ReportApp.m_DataMgrFun.GetSampleName();
                     m_TreeViewData.GetTreeWorkSampleNode(m_WorkSampleName);
+                    
                 }
             }
         }