界面调整

TheMachine/FormMain.Designer.cs

@@ -49,6 +49,8 @@ namespace TheMachine
             this.tabc = new System.Windows.Forms.TabControl();
             this.tabP1 = new System.Windows.Forms.TabPage();
             this.pnl = new System.Windows.Forms.Panel();
+            this.button2 = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
             this.btnClearNgPos = new System.Windows.Forms.Button();
             this.chbDIsAgv = new System.Windows.Forms.CheckBox();
             this.btnDownScan = new System.Windows.Forms.Button();
@@ -64,8 +66,6 @@ namespace TheMachine
             this.btn_IgnoreX09 = new System.Windows.Forms.Button();
             this.btn_PauseBuzzer = new System.Windows.Forms.Button();
             this.listView1 = new System.Windows.Forms.ListView();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
             this.menuStrip1.SuspendLayout();
             this.tabc.SuspendLayout();
             this.tabP1.SuspendLayout();
@@ -235,6 +235,7 @@ namespace TheMachine
             // 
             // pnl
             // 
+            this.pnl.Controls.Add(this.listReelInfo);
             this.pnl.Controls.Add(this.button2);
             this.pnl.Controls.Add(this.button1);
             this.pnl.Controls.Add(this.btnClearNgPos);
@@ -245,7 +246,6 @@ namespace TheMachine
             this.pnl.Controls.Add(this.btnResetOut3);
             this.pnl.Controls.Add(this.btnResetOut2);
             this.pnl.Controls.Add(this.btnResetOut1);
-            this.pnl.Controls.Add(this.listReelInfo);
             this.pnl.Controls.Add(this.groupBox1);
             this.pnl.Controls.Add(this.pictureBox2);
             this.pnl.Controls.Add(this.btn_IgnoreX09);
@@ -256,6 +256,30 @@ namespace TheMachine
             this.pnl.Size = new System.Drawing.Size(1000, 576);
             this.pnl.TabIndex = 273;
             // 
+            // button2
+            // 
+            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.button2.Location = new System.Drawing.Point(628, 259);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(98, 32);
+            this.button2.TabIndex = 280;
+            this.button2.Text = "IN_2复位";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // button1
+            // 
+            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.button1.Location = new System.Drawing.Point(521, 259);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(98, 32);
+            this.button1.TabIndex = 279;
+            this.button1.Text = "IN_1复位";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
             // btnClearNgPos
             // 
             this.btnClearNgPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
@@ -360,7 +384,7 @@ namespace TheMachine
             this.listReelInfo.HideSelection = false;
             this.listReelInfo.Location = new System.Drawing.Point(3, 300);
             this.listReelInfo.Name = "listReelInfo";
-            this.listReelInfo.Size = new System.Drawing.Size(530, 268);
+            this.listReelInfo.Size = new System.Drawing.Size(986, 268);
             this.listReelInfo.TabIndex = 1;
             this.listReelInfo.UseCompatibleStateImageBehavior = false;
             // 
@@ -445,30 +469,6 @@ namespace TheMachine
             this.listView1.TabIndex = 2;
             this.listView1.UseCompatibleStateImageBehavior = false;
             // 
-            // button1
-            // 
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(521, 259);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(98, 32);
-            this.button1.TabIndex = 279;
-            this.button1.Text = "IN_1复位";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // button2
-            // 
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button2.Location = new System.Drawing.Point(628, 259);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(98, 32);
-            this.button2.TabIndex = 280;
-            this.button2.Text = "IN_2复位";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
             // FormMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

TheMachine/FormMain.cs

@@ -86,16 +86,16 @@ namespace TheMachine
             #region 状态信息listview初始化
             stateView.View = View.Details;
             AddHeader(stateView, "", 0);
-            AddHeader(stateView, crc.GetString("Res0049", "模块"), 120);
-            AddHeader(stateView, crc.GetString("Res0050", "步骤"), 200);
-            AddHeader(stateView, crc.GetString("Res0047", "信息"), stateView.Width-120-200-3); 
+            AddHeader(stateView, crc.GetString("Res0049", "模块"), 80);
+            AddHeader(stateView, crc.GetString("Res0050", "步骤"), 130);
+            AddHeader(stateView, crc.GetString("Res0047", "信息"), stateView.Width-80-130-3); 
             stateView.ColumnWidthChanging += listView_ColumnWidthChanging;
             #endregion
             #region 物料信息显示列表
             listReelInfo.View = View.Details; 
             AddHeader(listReelInfo, "", 0);
-            AddHeader(listReelInfo, "位置", 100);
-            AddHeader(listReelInfo, "料盘信息", listReelInfo.Width-200-3);
+            AddHeader(listReelInfo, "位置", 80);
+            AddHeader(listReelInfo, "料盘信息", listReelInfo.Width-80-3);
             listReelInfo.ColumnWidthChanging += listView_ColumnWidthChanging;
             #endregion
 
@@ -143,6 +143,7 @@ namespace TheMachine
         {
             this.Invoke((EventHandler<Bitmap>)delegate
             {
+                return;
                 pictureBox2.Visible = true;
                 pictureBox2.Image = DeepClone(e);
             }, sender, e);