Merge branch 'cxs' into GSP

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -598,6 +598,8 @@
     <Content Include="OTSPeriodicTable\images\orthohombic.gif" />
     <Content Include="OTSPeriodicTable\images\rhombohedral.gif" />
     <Content Include="OTSPeriodicTable\images\teragonal.gif" />
+    <None Include="Resources\ConnnectHardware.png" />
+    <None Include="Resources\DisconnnectHardware.png" />
     <Content Include="Resources\toopstripbackimage.png" />
     <Content Include="Resources\保存.png" />
     <None Include="Resources\删除32.png" />

OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -165,7 +165,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);
+            this.rbMenu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.rbMenu.Minimized = true;
             this.rbMenu.Name = "rbMenu";
             // 
@@ -199,7 +199,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);
@@ -586,9 +586,9 @@
             // 
             this.rbConnectHardware.AltKey = null;
             this.rbConnectHardware.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
-            this.rbConnectHardware.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.rbConnectHardware.Image = global::OTSMeasureApp.Properties.Resources.开始32;
-            this.rbConnectHardware.SmallImage = global::OTSMeasureApp.Properties.Resources.start16;
+            this.rbConnectHardware.DropDownArrowSize = new System.Drawing.Size(3, 3);
+            this.rbConnectHardware.Image = global::OTSMeasureApp.Properties.Resources.ConnnectHardware;
+            this.rbConnectHardware.SmallImage = global::OTSMeasureApp.Properties.Resources.ConnnectHardware;
             this.rbConnectHardware.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
             this.rbConnectHardware.Tag = "rbConnectHardware";
             this.rbConnectHardware.Text = "连接硬件";
@@ -600,9 +600,9 @@
             // 
             this.rbDisconnectHardware.AltKey = null;
             this.rbDisconnectHardware.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
-            this.rbDisconnectHardware.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.rbDisconnectHardware.Image = global::OTSMeasureApp.Properties.Resources.停止32;
-            this.rbDisconnectHardware.SmallImage = global::OTSMeasureApp.Properties.Resources.stop16;
+            this.rbDisconnectHardware.DropDownArrowSize = new System.Drawing.Size(3, 3);
+            this.rbDisconnectHardware.Image = global::OTSMeasureApp.Properties.Resources.DisconnnectHardware;
+            this.rbDisconnectHardware.SmallImage = global::OTSMeasureApp.Properties.Resources.DisconnnectHardware;
             this.rbDisconnectHardware.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
             this.rbDisconnectHardware.Tag = "rbDisconnectHardware";
             this.rbDisconnectHardware.Text = "断开连接";
@@ -803,11 +803,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";
             // 
@@ -815,20 +815,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;
@@ -843,9 +843,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);
+            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;
@@ -922,9 +922,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);
@@ -932,8 +932,8 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(2);
-            this.MinimumSize = new System.Drawing.Size(682, 509);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.MinimumSize = new System.Drawing.Size(903, 625);
             this.Name = "OTSIncAMeasureAppForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OTSMeasureApp";

OTSIncAMeasureApp/Properties/Resources.Designer.cs

@@ -190,6 +190,16 @@ namespace OTSMeasureApp.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        public static System.Drawing.Bitmap ConnnectHardware {
+            get {
+                object obj = ResourceManager.GetObject("ConnnectHardware", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -300,6 +310,16 @@ namespace OTSMeasureApp.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        public static System.Drawing.Bitmap DisconnnectHardware {
+            get {
+                object obj = ResourceManager.GetObject("DisconnnectHardware", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

OTSIncAMeasureApp/Properties/Resources.resx

@@ -850,4 +850,10 @@
   <data name="关闭二32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\关闭二32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ConnnectHardware" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ConnnectHardware.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DisconnnectHardware" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DisconnnectHardware.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>