溯源中英文+SimImage.bmp第一行黑边问题处理

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

@@ -177,8 +177,8 @@
 	  <Control name="mouseMatter" text="MouseMatter" />
 	  <Control name="ribbonOrbMenuItem5" text="Copy" />
 	  <Control name="rbHelp" text="Help" />
-	  <Control name="ribbonOrbMenuItem_Extremum" text="Extremum analysis" />
-	  <Control name="ribbonOrbMenuItem_InclusionsTraceability" text="Tracing of foreign inclusions" />
+	  <Control name="ribbonOrbMenuItem_Extremum" text="Extremum" />
+	  <Control name="ribbonOrbMenuItem_InclusionsTraceability" text="InclusionsTraceability" />
 	  <Control name="ribbonOrbMenuItem_purity" text="Purity" />
 	  <Control name="message1" text="Now there are open measurement results files which will not be saved after new projects are built. Are you sure to build a new one?" />
 	  <Control name="AnalysisDiagram" text="Analysis diagram" />
@@ -1808,4 +1808,46 @@
 	  <Control name="str38" text="Tips" />
     </Controls>
  </Form>
+ <Form>
+    <Name>InclusionsTraceability</Name>
+    <Controls>
+	  <Control name="ToolStripMenuItem1" text="Copy Entire Table" />
+	  <Control name="ToolStripMenuItem2" text="Copy Selected Area" />
+	  <Control name="toolStripMenuItem4" text="Copy Current Displayed List Image" />
+	  <Control name="ToolStripMenuItem3" text="Restore to Initial State" />
+	  <Control name="ToolStripMenuItem5" text="Move SEM to Particle Field Position" />
+	  <Control name="ToolStripMenuItem_selectparticle" text="Select Particle" />
+	  <Control name="ToolStripMenuItem_exportimagefile" text="Export Image File" />
+	  <Control name="ToolStripMenuItem_exportzoomimagefile" text="Export Zoomed Image File" />
+	  <Control name="label_Condition" text="Query Condition:" />
+	  <Control name="label_Area" text="Area (μm²)" />
+	  <Control name="label_Dmax" text="Dmax(μm)" />
+	  <Control name="label_ParticleName" text="Particle Name" />
+	  <Control name="label1" text="The minimum ECD for foreign inclusions:" />
+	  <Control name="label3" text="Type:" />
+	  <Control name="cB_contain" text="Whether to include" />
+	  <Control name="btn_Sel" text="Query" />
+	  <Control name="bn_Find" text="Find" />
+	  <Control name="str1" text="Refining slag" />
+	  <Control name="str2" text="Refractory material" />
+	  <Control name="str3" text="Refining slag+Refractory material" />
+	  <Control name="str4" text="rowid" />
+	  <Control name="str5" text="ParticleImage" />
+	  <Control name="str6" text="TypeName" />
+	  <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 °" />
+	  <Control name="str34" text="Types of foreign inclusions" />
+    </Controls>
+ </Form>
 </Resource>

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

@@ -1787,9 +1787,9 @@
 	  <Control name="label_Dmax" text="Dmax(μm)" />
 	  <Control name="label_ParticleName" text="颗粒名称" />
 	  <Control name="btn_Sel" text="查询" />
-	  <Control name="str1" text="选择颗粒" />
-	  <Control name="str2" text="已选定" />
-	  <Control name="str3" text="颗颗粒,请切换到分析图查看！" />
+	  <Control name="str1" text="精炼渣" />
+	  <Control name="str2" text="耐材" />
+	  <Control name="str3" text="精炼渣+耐材" />
 	  <Control name="str4" text="序号" />
 	  <Control name="str5" text="颗粒图像" />
 	  <Control name="str6" text="颗粒名" />

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" standalone="yes"?>
 <Language>
-  <DefaultLanguage>EN</DefaultLanguage>
+  <DefaultLanguage>ZH</DefaultLanguage>
 </Language>

OTSCPP/OTSControl/Simulate/OTSScanSim.cpp

@@ -134,7 +134,7 @@ namespace OTSController {
 			long nActImageSize = width * height;
 			for (int i = 0; i < height; i++)
 			{
-				memcpy(pImageData + i * width, m_pPixel + (height - i) * width, width);
+				memcpy(pImageData + i * width, m_pPixel + (height - i-1) * width, width);
 			}
 
 			delete[]m_pPixel;

OTSIncAMeasureApp/ServiceCenter/CImageHandler.cs

@@ -40,6 +40,7 @@ namespace OTSModelSharp.ServiceCenter
                 return null;
             //// 申请目标位图的变量，并将其内存区域锁定    
             Bitmap bmp = new Bitmap(width, height, PixelFormat.Format8bppIndexed);
+
             //// BitmapData这部分内容  需要 using System.Drawing.Imaging;  
             BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, width, height),
             ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);

OTSInclusionsTraceability/OTSInclusionsTraceability.Designer.cs

@@ -80,7 +80,7 @@ namespace OTSInclusionsTraceability
             // 
             this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(1010, 18);
+            this.label3.Location = new System.Drawing.Point(1013, 18);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(65, 12);
             this.label3.TabIndex = 6;
@@ -100,7 +100,7 @@ namespace OTSInclusionsTraceability
             // cB_contain
             // 
             this.cB_contain.AutoSize = true;
-            this.cB_contain.Location = new System.Drawing.Point(395, 17);
+            this.cB_contain.Location = new System.Drawing.Point(431, 17);
             this.cB_contain.Name = "cB_contain";
             this.cB_contain.Size = new System.Drawing.Size(72, 16);
             this.cB_contain.TabIndex = 3;
@@ -111,15 +111,15 @@ namespace OTSInclusionsTraceability
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(360, 18);
+            this.label2.Location = new System.Drawing.Point(361, 18);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(29, 12);
+            this.label2.Size = new System.Drawing.Size(23, 12);
             this.label2.TabIndex = 2;
-            this.label2.Text = "微米";
+            this.label2.Text = "μm";
             // 
             // tB_EquivalentCircularDiameter
             // 
-            this.tB_EquivalentCircularDiameter.Location = new System.Drawing.Point(247, 15);
+            this.tB_EquivalentCircularDiameter.Location = new System.Drawing.Point(248, 15);
             this.tB_EquivalentCircularDiameter.Name = "tB_EquivalentCircularDiameter";
             this.tB_EquivalentCircularDiameter.Size = new System.Drawing.Size(107, 21);
             this.tB_EquivalentCircularDiameter.TabIndex = 1;
@@ -128,7 +128,7 @@ namespace OTSInclusionsTraceability
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(14, 18);
+            this.label1.Location = new System.Drawing.Point(9, 18);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(227, 12);
             this.label1.TabIndex = 0;

OTSInclusionsTraceability/OTSInclusionsTraceability.cs

@@ -57,8 +57,11 @@ namespace OTSInclusionsTraceability
 
         private void InclusionsTraceability_Load(object sender, EventArgs e)
         {
-            comboBox_SourceType.Items.Add("精炼渣");
-            comboBox_SourceType.Items.Add("耐材");
+            lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
+
+            comboBox_SourceType.Items.Add(table["str1"]);
+            comboBox_SourceType.Items.Add(table["str2"]);
             //comboBox_SourceType.Items.Add("精炼渣+耐材");
             comboBox_SourceType.SelectedIndex = 0;
 
@@ -71,6 +74,9 @@ namespace OTSInclusionsTraceability
                 case "精炼渣": comboBox_SourceType.SelectedIndex = 0;break;
                 case "耐材": comboBox_SourceType.SelectedIndex = 1; break;
                 case "精炼渣+耐材": comboBox_SourceType.SelectedIndex = 2; break;
+                case "Refining slag": comboBox_SourceType.SelectedIndex = 0; break;
+                case "Refractory material": comboBox_SourceType.SelectedIndex = 1; break;
+                case "Refining slag+Refractory material": comboBox_SourceType.SelectedIndex = 2; break;
             }
             #region 界面缩放控件位置记录
             int count = this.Controls.Count * 2 + 2;
@@ -132,7 +138,7 @@ namespace OTSInclusionsTraceability
             string condition = AuquireEquCircleDiameter();
             if (condition == "")
             {
-                MessageBox.Show("请输入有效的数据！");
+                MessageBox.Show("Please enter valid data！");
                 return;
             }
             if(comboBox_SourceType.SelectedIndex==(int)SourceType.RefiningSlag)
@@ -308,9 +314,7 @@ namespace OTSInclusionsTraceability
 
         void Init()
         {
-            lan = new Language(this);
-            table = lan.GetNameTable(this.Name);
-
+            
             #region 数据库及表格
             dataOperation = new DataOperation(RetDBAddress);
             particles = dataOperation.GetParticlesByEquCircleDiameter("", "");
@@ -330,7 +334,6 @@ namespace OTSInclusionsTraceability
                 dataOperation.ReadXmlDataDefault("DisplaySource", ref sDisplaySource);
             }
             #endregion
-
             #region 表格
             dgV_Traceablilty.Rows.Clear();
             dgV_Traceablilty.Columns.Clear();
@@ -439,6 +442,7 @@ namespace OTSInclusionsTraceability
             #endregion
         }
 
+        
         /// <summary>
         /// 设置DataGridView样式
         /// </summary>