diff --git a/LargeSquareOne/FrmDataMonitor.Designer.cs b/LargeSquareOne/FrmDataMonitor.Designer.cs index 31117ff..8c9020f 100644 --- a/LargeSquareOne/FrmDataMonitor.Designer.cs +++ b/LargeSquareOne/FrmDataMonitor.Designer.cs @@ -63,7 +63,6 @@ this.rtb_Info = new System.Windows.Forms.RichTextBox(); this.groupBoxEX5 = new JinYuan.ControlLib.GroupBoxEX(); this.dgvBlankingData = new System.Windows.Forms.DataGridView(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -96,6 +95,7 @@ this.Column35 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column102 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.tableLayoutPanel1.SuspendLayout(); this.groupBoxEX3.SuspendLayout(); this.groupBoxEX2.SuspendLayout(); @@ -127,7 +127,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 54.37666F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 477F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1370, 749); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1920, 1080); this.tableLayoutPanel1.TabIndex = 0; // // groupBoxEX3 @@ -146,7 +146,7 @@ this.groupBoxEX3.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX3.Name = "groupBoxEX3"; this.groupBoxEX3.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX3.Size = new System.Drawing.Size(206, 120); + this.groupBoxEX3.Size = new System.Drawing.Size(343, 271); this.groupBoxEX3.TabIndex = 14; this.groupBoxEX3.TabStop = false; this.groupBoxEX3.Text = "操作设置"; @@ -155,7 +155,7 @@ // this.btSatrt.BackNormalColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); this.btSatrt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btSatrt.Location = new System.Drawing.Point(42, 29); + this.btSatrt.Location = new System.Drawing.Point(42, 104); this.btSatrt.Margin = new System.Windows.Forms.Padding(2); this.btSatrt.Name = "btSatrt"; this.btSatrt.Padding = new System.Windows.Forms.Padding(2); @@ -232,11 +232,11 @@ this.groupBoxEX2.Controls.Add(this.lVConfigRange); this.groupBoxEX2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX2.ForeColor = System.Drawing.Color.White; - this.groupBoxEX2.Location = new System.Drawing.Point(2, 126); + this.groupBoxEX2.Location = new System.Drawing.Point(2, 277); this.groupBoxEX2.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX2.Name = "groupBoxEX2"; this.groupBoxEX2.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX2.Size = new System.Drawing.Size(206, 143); + this.groupBoxEX2.Size = new System.Drawing.Size(343, 323); this.groupBoxEX2.TabIndex = 13; this.groupBoxEX2.TabStop = false; this.groupBoxEX2.Text = "参数"; @@ -258,7 +258,7 @@ this.lVConfigRange.Margin = new System.Windows.Forms.Padding(2); this.lVConfigRange.Name = "lVConfigRange"; this.lVConfigRange.OwnerDraw = true; - this.lVConfigRange.Size = new System.Drawing.Size(202, 120); + this.lVConfigRange.Size = new System.Drawing.Size(339, 300); this.lVConfigRange.TabIndex = 2; this.lVConfigRange.UseCompatibleStateImageBehavior = false; this.lVConfigRange.View = System.Windows.Forms.View.Details; @@ -297,12 +297,12 @@ this.groupBoxEX4.Controls.Add(this.dgvFeedingData); this.groupBoxEX4.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX4.ForeColor = System.Drawing.Color.White; - this.groupBoxEX4.Location = new System.Drawing.Point(212, 2); + this.groupBoxEX4.Location = new System.Drawing.Point(349, 2); this.groupBoxEX4.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX4.Name = "groupBoxEX4"; this.groupBoxEX4.Padding = new System.Windows.Forms.Padding(2); this.tableLayoutPanel1.SetRowSpan(this.groupBoxEX4, 2); - this.groupBoxEX4.Size = new System.Drawing.Size(1156, 267); + this.groupBoxEX4.Size = new System.Drawing.Size(1569, 598); this.groupBoxEX4.TabIndex = 15; this.groupBoxEX4.TabStop = false; this.groupBoxEX4.Text = "进站"; @@ -363,7 +363,7 @@ this.dgvFeedingData.RowHeadersWidth = 60; this.dgvFeedingData.RowTemplate.Height = 23; this.dgvFeedingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvFeedingData.Size = new System.Drawing.Size(1152, 244); + this.dgvFeedingData.Size = new System.Drawing.Size(1565, 575); this.dgvFeedingData.TabIndex = 10; this.dgvFeedingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvFeedingData_CellContentClick); this.dgvFeedingData.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvFeedingData_RowPrePaint); @@ -437,11 +437,11 @@ this.groupBoxEX1.Controls.Add(this.rtb_Info); this.groupBoxEX1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX1.ForeColor = System.Drawing.Color.White; - this.groupBoxEX1.Location = new System.Drawing.Point(2, 273); + this.groupBoxEX1.Location = new System.Drawing.Point(2, 604); this.groupBoxEX1.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX1.Name = "groupBoxEX1"; this.groupBoxEX1.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX1.Size = new System.Drawing.Size(206, 474); + this.groupBoxEX1.Size = new System.Drawing.Size(343, 474); this.groupBoxEX1.TabIndex = 12; this.groupBoxEX1.TabStop = false; this.groupBoxEX1.Text = "日志记录"; @@ -456,7 +456,7 @@ this.rtb_Info.Margin = new System.Windows.Forms.Padding(2); this.rtb_Info.Name = "rtb_Info"; this.rtb_Info.ReadOnly = true; - this.rtb_Info.Size = new System.Drawing.Size(202, 451); + this.rtb_Info.Size = new System.Drawing.Size(339, 451); this.rtb_Info.TabIndex = 1; this.rtb_Info.Text = ""; // @@ -468,11 +468,11 @@ this.groupBoxEX5.Controls.Add(this.dgvBlankingData); this.groupBoxEX5.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX5.ForeColor = System.Drawing.Color.White; - this.groupBoxEX5.Location = new System.Drawing.Point(212, 273); + this.groupBoxEX5.Location = new System.Drawing.Point(349, 604); this.groupBoxEX5.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX5.Name = "groupBoxEX5"; this.groupBoxEX5.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX5.Size = new System.Drawing.Size(1156, 474); + this.groupBoxEX5.Size = new System.Drawing.Size(1569, 474); this.groupBoxEX5.TabIndex = 16; this.groupBoxEX5.TabStop = false; this.groupBoxEX5.Text = "出站"; @@ -558,18 +558,10 @@ this.dgvBlankingData.RowHeadersWidth = 60; this.dgvBlankingData.RowTemplate.Height = 23; this.dgvBlankingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvBlankingData.Size = new System.Drawing.Size(1152, 451); + this.dgvBlankingData.Size = new System.Drawing.Size(1565, 451); this.dgvBlankingData.TabIndex = 10; this.dgvBlankingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBlankingData_CellContentClick); // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "info.png"); - this.imageList1.Images.SetKeyName(1, "error.png"); - this.imageList1.Images.SetKeyName(2, "warning.png"); - // // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.HeaderText = "序号"; @@ -814,13 +806,21 @@ this.Column22.ReadOnly = true; this.Column22.Width = 150; // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "info.png"); + this.imageList1.Images.SetKeyName(1, "error.png"); + this.imageList1.Images.SetKeyName(2, "warning.png"); + // // FrmDataMonitor // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(1370, 749); + this.ClientSize = new System.Drawing.Size(1920, 1080); this.Controls.Add(this.tableLayoutPanel1); this.DoubleBuffered = true; this.Font = new System.Drawing.Font("微软雅黑", 10.5F); diff --git a/LargeSquareOne/FrmDataMonitor.resx b/LargeSquareOne/FrmDataMonitor.resx index cbf6e11..3a94f42 100644 --- a/LargeSquareOne/FrmDataMonitor.resx +++ b/LargeSquareOne/FrmDataMonitor.resx @@ -197,7 +197,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE - DQAAAk1TRnQBSQFMAgEBAwEAAYABAgGAAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + DQAAAk1TRnQBSQFMAgEBAwEAAYgBAgGIAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1 ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2