Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2

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

@@ -1488,7 +1488,7 @@ field of view(%)" />
   <Form>
     <Name>OTSMeasureStatusWindow</Name>
     <Controls>
-      <Control name="SampleParaLock" text="GetBSEDiagram" />
+      <Control name="AcquireBSEImageMenuItem" text="GetBSEDiagram" />
 	  <Control name="VisualAdjustingMenu" text="Set the visual gray range of BSE image" />
 	  <Control name="toolStripMenuItem1" text="Set the grayscale range of special particles for visualization" />
 	  <Control name="ChangeDiffImageShow" text="SwitchToBSE" />
@@ -1499,6 +1499,8 @@ field of view(%)" />
 	  <Control name="MenuItemLineScan" text="LineScanningCurve" />
 	  <Control name="PointScanElementMenuItem" text="PointScanElement" />
 	  <Control name="ExportScanInfoMenuItem" text="ExportScanInfo" />
+      <Control name="autobc" text="AutoBC" />
+	  <Control name="ToolStripMenuItem_batchcapture" text="BatchCapture" />
 	  <Control name="message1" text="SwitchBSEDiagram" />
 	  <Control name="message2" text="SwitchBSEDiagram" />
 	  <Control name="message3" text="Data less than 2!" />

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

@@ -1385,6 +1385,8 @@
 	  <Control name="MenuItemLineScan" text="线扫描曲线" />
 	  <Control name="PointScanElementMenuItem" text="单点采集" />
 	  <Control name="ExportScanInfoMenuItem" text="导出采集信息" />
+	  <Control name="autobc" text="自动亮度对比度" />
+	  <Control name="ToolStripMenuItem_batchcapture" text="批量采集" />
 	  <Control name="message1" text="切换显示至BSE图" />
 	  <Control name="message2" text="切换显示至BSE图" />
 	  <Control name="message3" text="数据小于2！" />

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -84,6 +84,8 @@ namespace OTSModelSharp
            
         }
 
+
+
         bool SetSEMDataMrs(CSEMFieldData pSEMDataMsr)
         {
             //var pSEMDataMsr = sample.GetSEMDataMsr();

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.Designer.cs

@@ -42,11 +42,11 @@ namespace OTSMeasureApp
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.MenuItemLineScan = new System.Windows.Forms.ToolStripMenuItem();
+            this.autobc = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
             this.PointScanElementMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.批量采集ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ToolStripMenuItem_batchcapture = new System.Windows.Forms.ToolStripMenuItem();
             this.ExportScanInfoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.autobc = new System.Windows.Forms.ToolStripMenuItem();
             this.panelXray = new System.Windows.Forms.Panel();
             this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
@@ -88,10 +88,10 @@ namespace OTSMeasureApp
             this.autobc,
             this.toolStripSeparator3,
             this.PointScanElementMenuItem,
-            this.批量采集ToolStripMenuItem,
+            this.ToolStripMenuItem_batchcapture,
             this.ExportScanInfoMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(243, 242);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(243, 286);
             this.contextMenuStrip1.Opened += new System.EventHandler(this.contextMenuStrip1_Opened);
             // 
             // AcquireBSEImageMenuItem
@@ -154,6 +154,13 @@ namespace OTSMeasureApp
             this.MenuItemLineScan.Text = "线扫描曲线";
             this.MenuItemLineScan.Click += new System.EventHandler(this.ShowLineScanChart_Click);
             // 
+            // autobc
+            // 
+            this.autobc.Name = "autobc";
+            this.autobc.Size = new System.Drawing.Size(242, 22);
+            this.autobc.Text = "自动亮度对比度";
+            this.autobc.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
+            // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
@@ -166,12 +173,12 @@ namespace OTSMeasureApp
             this.PointScanElementMenuItem.Text = "X-Ray采集";
             this.PointScanElementMenuItem.Click += new System.EventHandler(this.单点采集MenuItem_Click);
             // 
-            // 批量采集ToolStripMenuItem
+            // ToolStripMenuItem_batchcapture
             // 
-            this.批量采集ToolStripMenuItem.Name = "批量采集ToolStripMenuItem";
-            this.批量采集ToolStripMenuItem.Size = new System.Drawing.Size(242, 22);
-            this.批量采集ToolStripMenuItem.Text = "批量采集";
-            this.批量采集ToolStripMenuItem.Click += new System.EventHandler(this.批量采集ToolStripMenuItem_Click);
+            this.ToolStripMenuItem_batchcapture.Name = "ToolStripMenuItem_batchcapture";
+            this.ToolStripMenuItem_batchcapture.Size = new System.Drawing.Size(242, 22);
+            this.ToolStripMenuItem_batchcapture.Text = "批量采集";
+            this.ToolStripMenuItem_batchcapture.Click += new System.EventHandler(this.批量采集ToolStripMenuItem_Click);
             // 
             // ExportScanInfoMenuItem
             // 
@@ -180,13 +187,6 @@ namespace OTSMeasureApp
             this.ExportScanInfoMenuItem.Text = "输出X-Ray信息";
             this.ExportScanInfoMenuItem.Click += new System.EventHandler(this.ExportScanInfoMenuItem_Click);
             // 
-            // autobc
-            // 
-            this.autobc.Name = "autobc";
-            this.autobc.Size = new System.Drawing.Size(242, 22);
-            this.autobc.Text = "自动亮度对比度";
-            this.autobc.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
-            // 
             // panelXray
             // 
             this.panelXray.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -268,7 +268,7 @@ namespace OTSMeasureApp
         private System.Windows.Forms.Timer timer1;
         public System.Windows.Forms.PictureBox pictureBox2;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
-        private System.Windows.Forms.ToolStripMenuItem 批量采集ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem_batchcapture;
         private Control_Ruler control_Ruler;
         private System.Windows.Forms.ToolStripMenuItem autobc;
     }

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -633,7 +633,7 @@ namespace OTSMeasureApp
 
             VisualAdjustingMenu.Enabled = isEnabled;
             toolStripMenuItem1.Enabled = true;
-            批量采集ToolStripMenuItem.Enabled = true;
+            ToolStripMenuItem_batchcapture.Enabled = true;
             autobc.Enabled = true;
             this.Cursor = Cursors.Default;
             this.Validate();