Merge branch 'Release2.3' into ZJX

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

@@ -929,6 +929,10 @@
 	  <Control name="m_NoWindowName" text="UnknownWorkingWindow" />
 	  <Control name="rbSTDEdit" text="Edit standard library" />
 	  <Control name="rbReClassify" text="Reclassification" />
+	  <Control name="rbConnectHardware" text="ConnectSem" />
+	  <Control name="rbDisconnectHardware" text="DisConnectSem" />
+	  <Control name="rbAutoBeamOff" text="AutoBeamOff" />
+	  <Control name="rbinterrupt" text="Interrupt" />
 	  <Control name="language" text="EN" />
 	  <Control name="message1" text="No OTSIncA valid pass!" />
 	  <Control name="message2" text="Is the current file modified or saved?" />

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

@@ -928,6 +928,10 @@
 	  <Control name="ribbonButton3" text="复位" />
 	  <Control name="ribbonButton1" text="打开" />
 	  <Control name="ribbonOrbRecentItem1" text="打开" />
+      <Control name="rbConnectHardware" text="连接电镜" />
+	  <Control name="rbDisconnectHardware" text="断开连接" />
+	  <Control name="rbAutoBeamOff" text="自动关枪" />
+	  <Control name="rbinterrupt" text="强制停止" />
 	
 	  <Control name="m_SamplespaceWindowName" text="样品台" />
 	  <Control name="m_MeasureStauWindowName" text="测量状态" />

OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -79,6 +79,7 @@
             this.rbConnectHardware = new System.Windows.Forms.RibbonButton();
             this.rbDisconnectHardware = new System.Windows.Forms.RibbonButton();
             this.rbinterrupt = new System.Windows.Forms.RibbonButton();
+            this.rbAutoBeamOff = new System.Windows.Forms.RibbonButton();
             this.rbPanelFunction = new System.Windows.Forms.RibbonPanel();
             this.rbStart = new System.Windows.Forms.RibbonButton();
             this.rbStop = new System.Windows.Forms.RibbonButton();
@@ -167,7 +168,7 @@
             this.rbMenu.BorderMode = System.Windows.Forms.RibbonWindowMode.InsideWindow;
             this.rbMenu.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
             this.rbMenu.Location = new System.Drawing.Point(0, 0);
-            this.rbMenu.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.rbMenu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.rbMenu.Minimized = true;
             this.rbMenu.Name = "rbMenu";
             // 
@@ -201,7 +202,7 @@
             this.rbMenu.QuickAcessToolbar.Image = null;
             this.rbMenu.QuickAcessToolbar.Tag = null;
             this.rbMenu.QuickAcessToolbar.ToolTipImage = null;
-            this.rbMenu.Size = new System.Drawing.Size(1277, 130);
+            this.rbMenu.Size = new System.Drawing.Size(1703, 130);
             this.rbMenu.TabIndex = 0;
             this.rbMenu.Tabs.Add(this.rbTabHome);
             this.rbMenu.Tabs.Add(this.rbTabView);
@@ -580,6 +581,7 @@
             this.rbSemFunction.Items.Add(this.rbConnectHardware);
             this.rbSemFunction.Items.Add(this.rbDisconnectHardware);
             this.rbSemFunction.Items.Add(this.rbinterrupt);
+            this.rbSemFunction.Items.Add(this.rbAutoBeamOff);
             this.rbSemFunction.Tag = "rbSemFunction";
             this.rbSemFunction.Text = "Sem控制";
             // 
@@ -628,6 +630,21 @@
             this.rbinterrupt.ToolTipTitle = null;
             this.rbinterrupt.Click += new System.EventHandler(this.rbinterrupt_Click);
             // 
+            // rbAutoBeamOff
+            // 
+            this.rbAutoBeamOff.AltKey = null;
+            this.rbAutoBeamOff.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
+            this.rbAutoBeamOff.DropDownArrowSize = new System.Drawing.Size(3, 3);
+            this.rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
+            this.rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
+            this.rbAutoBeamOff.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.rbAutoBeamOff.Tag = "rbAutoBeamOff";
+            this.rbAutoBeamOff.Text = "自动关枪";
+            this.rbAutoBeamOff.ToolTip = null;
+            this.rbAutoBeamOff.ToolTipImage = null;
+            this.rbAutoBeamOff.ToolTipTitle = null;
+            this.rbAutoBeamOff.Click += new System.EventHandler(this.rbAutoBeamOff_Click);
+            // 
             // rbPanelFunction
             // 
             this.rbPanelFunction.ButtonMoreEnabled = false;
@@ -831,11 +848,11 @@
             this.TSGrayVal,
             this.STSemCoordinate,
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 671);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 841);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 14, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(3, 0, 19, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1277, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(1703, 30);
             this.statusStrip1.TabIndex = 2;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -843,20 +860,20 @@
             // 
             this.TSGrayVal.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.TSGrayVal.Name = "TSGrayVal";
-            this.TSGrayVal.Size = new System.Drawing.Size(48, 21);
+            this.TSGrayVal.Size = new System.Drawing.Size(58, 24);
             this.TSGrayVal.Text = "灰度值";
             // 
             // STSemCoordinate
             // 
             this.STSemCoordinate.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.STSemCoordinate.Name = "STSemCoordinate";
-            this.STSemCoordinate.Size = new System.Drawing.Size(62, 21);
+            this.STSemCoordinate.Size = new System.Drawing.Size(75, 24);
             this.STSemCoordinate.Text = "SEM坐标";
             // 
             // toolStripStatusLabel1
             // 
             this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-            this.toolStripStatusLabel1.Size = new System.Drawing.Size(54, 21);
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(65, 24);
             this.toolStripStatusLabel1.Text = "IsReady";
             this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.toolStripStatusLabel1.Visible = false;
@@ -871,9 +888,9 @@
             this.dockPanel.DockLeftPortion = 0.21D;
             this.dockPanel.DockRightPortion = 0.27D;
             this.dockPanel.Location = new System.Drawing.Point(0, 130);
-            this.dockPanel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.dockPanel.Margin = new System.Windows.Forms.Padding(8);
             this.dockPanel.Name = "dockPanel";
-            this.dockPanel.Size = new System.Drawing.Size(1277, 541);
+            this.dockPanel.Size = new System.Drawing.Size(1703, 711);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -950,9 +967,9 @@
             // 
             // OTSIncAMeasureAppForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1277, 697);
+            this.ClientSize = new System.Drawing.Size(1703, 871);
             this.Controls.Add(this.dockPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.rbMenu);
@@ -960,8 +977,8 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.MinimumSize = new System.Drawing.Size(680, 506);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.MinimumSize = new System.Drawing.Size(901, 621);
             this.Name = "OTSIncAMeasureAppForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OTSMeasureApp";
@@ -1033,8 +1050,9 @@
         private System.Windows.Forms.RibbonOrbRecentItem ribbonOrbRecentItem1;
         private System.Windows.Forms.RibbonButton rbThreePoints;
         public System.Windows.Forms.RibbonButton rbConnectHardware;
-        public System.Windows.Forms.RibbonButton rbDisconnectHardware;
+        public System.Windows.Forms.RibbonButton rbDisconnectHardware; 
         public System.Windows.Forms.RibbonButton rbinterrupt;
+        public System.Windows.Forms.RibbonButton rbAutoBeamOff;
         public System.Windows.Forms.RibbonButton rbSysMgrApp;
     }
 }

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -1403,5 +1403,21 @@ namespace OTSMeasureApp
             
             log.Warn("StopXrayAcquisition!");
         }
+
+        private void rbAutoBeamOff_Click(object sender, EventArgs e)
+        {
+            if (m_ProjData.GetGenParam().AutoBeamOff)
+            {
+                m_ProjData.GetGenParam().AutoBeamOff = false;
+                rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
+                rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
+            }
+            else
+            {
+                m_ProjData.GetGenParam().AutoBeamOff = true;
+                rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_on;
+                rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_on;
+            }
+        }
     }
 }