diff --git a/LargeSquareOne/CustomMessageBox.Designer.cs b/LargeSquareOne/CustomMessageBox.Designer.cs
index 69561b6..5d29f4f 100644
--- a/LargeSquareOne/CustomMessageBox.Designer.cs
+++ b/LargeSquareOne/CustomMessageBox.Designer.cs
@@ -29,17 +29,17 @@ namespace LargeSquareOne
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.panel3 = new System.Windows.Forms.Panel();
+ this.btStop = new HML.ButtonPlus();
+ this.btSatrt = new HML.ButtonPlus();
this.panel2 = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.lblMessage = new System.Windows.Forms.Label();
- this.btStop = new HML.ButtonPlus();
- this.btSatrt = new HML.ButtonPlus();
this.panel1.SuspendLayout();
this.panel4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
@@ -75,29 +75,29 @@ namespace LargeSquareOne
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;
this.dataGridView1.BackgroundColor = System.Drawing.Color.White;
- dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle5.Font = new System.Drawing.Font("思源黑体 CN Regular", 14.25F);
- dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
- dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F);
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.White;
- dataGridViewCellStyle6.Font = new System.Drawing.Font("思源黑体 CN Regular", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
- dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlLightLight;
- dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlLightLight;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.White;
- this.dataGridView1.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("思源黑体 CN Regular", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.dataGridView1.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dataGridView1.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Black;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(652, 319);
@@ -115,6 +115,28 @@ namespace LargeSquareOne
this.panel3.Size = new System.Drawing.Size(652, 56);
this.panel3.TabIndex = 3;
//
+ // btStop
+ //
+ this.btStop.BackNormalColor = System.Drawing.Color.Red;
+ this.btStop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
+ this.btStop.Location = new System.Drawing.Point(390, 4);
+ this.btStop.Name = "btStop";
+ this.btStop.Size = new System.Drawing.Size(101, 49);
+ this.btStop.TabIndex = 15;
+ this.btStop.Text = "取 消";
+ this.btStop.Click += new System.EventHandler(this.btnNo_Click);
+ //
+ // btSatrt
+ //
+ 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(134, 4);
+ this.btSatrt.Name = "btSatrt";
+ this.btSatrt.Size = new System.Drawing.Size(101, 49);
+ this.btSatrt.TabIndex = 14;
+ this.btSatrt.Text = "确 定";
+ this.btSatrt.Click += new System.EventHandler(this.btnOK_Click);
+ //
// panel2
//
this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(40)))), ((int)(((byte)(49)))));
@@ -139,34 +161,14 @@ namespace LargeSquareOne
// lblMessage
//
this.lblMessage.AutoSize = true;
- this.lblMessage.Font = new System.Drawing.Font("思源黑体 CN Bold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMessage.ForeColor = System.Drawing.Color.Red;
this.lblMessage.Location = new System.Drawing.Point(58, 14);
this.lblMessage.Name = "lblMessage";
- this.lblMessage.Size = new System.Drawing.Size(42, 23);
+ this.lblMessage.Size = new System.Drawing.Size(43, 20);
this.lblMessage.TabIndex = 0;
this.lblMessage.Text = "提示";
//
- // btStop
- //
- this.btStop.BackNormalColor = System.Drawing.Color.Red;
- this.btStop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
- this.btStop.Location = new System.Drawing.Point(390, 4);
- this.btStop.Name = "btStop";
- this.btStop.Size = new System.Drawing.Size(101, 49);
- this.btStop.TabIndex = 15;
- this.btStop.Text = "取 消";
- //
- // btSatrt
- //
- 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(134, 4);
- this.btSatrt.Name = "btSatrt";
- this.btSatrt.Size = new System.Drawing.Size(101, 49);
- this.btSatrt.TabIndex = 14;
- this.btSatrt.Text = "确 定";
- //
// CustomMessageBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
diff --git a/LargeSquareOne/FrmDataMonitor.Designer.cs b/LargeSquareOne/FrmDataMonitor.Designer.cs
index 74466cf..8d613ea 100644
--- a/LargeSquareOne/FrmDataMonitor.Designer.cs
+++ b/LargeSquareOne/FrmDataMonitor.Designer.cs
@@ -29,12 +29,12 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDataMonitor));
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBoxEX3 = new JinYuan.ControlLib.GroupBoxEX();
@@ -62,7 +62,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.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -104,6 +103,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();
@@ -135,7 +135,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
@@ -154,7 +154,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 = "操作设置";
@@ -240,11 +240,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 = "参数";
@@ -266,7 +266,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;
@@ -305,12 +305,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 = "进站";
@@ -324,14 +324,14 @@
this.dgvFeedingData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.dgvFeedingData.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvFeedingData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
- dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F);
- dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvFeedingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvFeedingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dgvFeedingData.ColumnHeadersHeight = 34;
this.dgvFeedingData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dgvFeedingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -341,14 +341,14 @@
this.InResult,
this.Column5,
this.Column139});
- dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
- dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 10.5F);
- dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
- dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvFeedingData.DefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvFeedingData.DefaultCellStyle = dataGridViewCellStyle2;
this.dgvFeedingData.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvFeedingData.EnableHeadersVisualStyles = false;
this.dgvFeedingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
@@ -358,19 +358,19 @@
this.dgvFeedingData.Name = "dgvFeedingData";
this.dgvFeedingData.ReadOnly = true;
this.dgvFeedingData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
- dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.5F);
- dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvFeedingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvFeedingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dgvFeedingData.RowHeadersVisible = false;
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 = "出站";
@@ -486,14 +486,14 @@
this.dgvBlankingData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.dgvBlankingData.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvBlankingData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
- dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 10.5F);
- dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvBlankingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvBlankingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvBlankingData.ColumnHeadersHeight = 34;
this.dgvBlankingData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dgvBlankingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -538,14 +538,14 @@
this.Column35,
this.Column102,
this.Column22});
- dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
- dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 10.5F);
- dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
- dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvBlankingData.DefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+ dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvBlankingData.DefaultCellStyle = dataGridViewCellStyle5;
this.dgvBlankingData.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvBlankingData.EnableHeadersVisualStyles = false;
this.dgvBlankingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
@@ -555,30 +555,22 @@
this.dgvBlankingData.Name = "dgvBlankingData";
this.dgvBlankingData.ReadOnly = true;
this.dgvBlankingData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
- dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.5F);
- dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
- dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvBlankingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+ dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvBlankingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
this.dgvBlankingData.RowHeadersVisible = false;
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.DataPropertyName = "ChannelNo";
@@ -889,13 +881,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 7474d2b..0b8bf43 100644
--- a/LargeSquareOne/FrmDataMonitor.resx
+++ b/LargeSquareOne/FrmDataMonitor.resx
@@ -120,9 +120,6 @@
True
-
- True
-
True
@@ -197,7 +194,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE
- DQAAAk1TRnQBSQFMAgEBAwEAAWABAgFgAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ DQAAAk1TRnQBSQFMAgEBAwEAAWgBAgFoAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1
ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA
HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2