diff --git a/CompressorXN/FrmAgreement.Designer.cs b/CompressorXN/FrmAgreement.Designer.cs index 2bd4043..08233dc 100644 --- a/CompressorXN/FrmAgreement.Designer.cs +++ b/CompressorXN/FrmAgreement.Designer.cs @@ -28,6 +28,11 @@ /// private void InitializeComponent() { + 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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -42,14 +47,29 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = 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(); this.panelEx1 = new CompressorXN_ControlLib.PanelEx(); this.btn_Confirm = new System.Windows.Forms.Button(); this.btn_Unlock = new System.Windows.Forms.Button(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.cmb_FrameType = new System.Windows.Forms.ComboBox(); + this.cmb_MsgFormat = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.cmb_Bps = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.txt_AgreementName = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.gridView_FuZhu = new System.Windows.Forms.DataGridView(); + this.bit7 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.bit6 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.bit5 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.bit4 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.bit3 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.bit2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.bit1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.bit0 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.SortIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox6 = new System.Windows.Forms.GroupBox(); this.GridView_Recive = new System.Windows.Forms.DataGridView(); this.ReciveMsgName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -82,31 +102,14 @@ this.txt_SendId = new System.Windows.Forms.TextBox(); this.txt_SendPeriod = new System.Windows.Forms.TextBox(); this.label8 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.cmb_FrameType = new System.Windows.Forms.ComboBox(); - this.cmb_MsgFormat = new System.Windows.Forms.ComboBox(); - this.label4 = new System.Windows.Forms.Label(); - this.cmb_Bps = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.txt_AgreementName = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.gridView_FuZhu = new System.Windows.Forms.DataGridView(); - this.bit7 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.bit6 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.bit5 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.bit4 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.bit3 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.bit2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.bit1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.bit0 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.SortIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.leftPanel = new CompressorXN_ControlLib.PanelEx(); this.listBox = new DevExpress.XtraEditors.ListBoxControl(); this.searchControl = new DevExpress.XtraEditors.SearchControl(); this.Loading = new DevExpress.XtraSplashScreen.SplashScreenManager(); ((System.ComponentModel.ISupportInitialize)(this.panelEx1)).BeginInit(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridView_FuZhu)).BeginInit(); this.groupBox6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.GridView_Recive)).BeginInit(); this.groupBox5.SuspendLayout(); @@ -114,9 +117,6 @@ this.groupBox4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.GridView_SendSpeed)).BeginInit(); this.groupBox3.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gridView_FuZhu)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.leftPanel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.listBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.searchControl.Properties)).BeginInit(); @@ -165,6 +165,221 @@ this.btn_Unlock.UseVisualStyleBackColor = false; this.btn_Unlock.Click += new System.EventHandler(this.btn_Unlock_Click); // + // groupBox2 + // + this.groupBox2.Controls.Add(this.cmb_FrameType); + this.groupBox2.Controls.Add(this.cmb_MsgFormat); + this.groupBox2.Controls.Add(this.label4); + this.groupBox2.Controls.Add(this.cmb_Bps); + this.groupBox2.Controls.Add(this.label3); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Controls.Add(this.txt_AgreementName); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.groupBox2.ForeColor = System.Drawing.Color.Black; + this.groupBox2.Location = new System.Drawing.Point(7, 26); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(610, 221); + this.groupBox2.TabIndex = 12; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "报文"; + // + // cmb_FrameType + // + this.cmb_FrameType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_FrameType.FormattingEnabled = true; + this.cmb_FrameType.Location = new System.Drawing.Point(354, 130); + this.cmb_FrameType.Name = "cmb_FrameType"; + this.cmb_FrameType.Size = new System.Drawing.Size(200, 29); + this.cmb_FrameType.TabIndex = 2; + // + // cmb_MsgFormat + // + this.cmb_MsgFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_MsgFormat.FormattingEnabled = true; + this.cmb_MsgFormat.Location = new System.Drawing.Point(59, 130); + this.cmb_MsgFormat.Name = "cmb_MsgFormat"; + this.cmb_MsgFormat.Size = new System.Drawing.Size(200, 29); + this.cmb_MsgFormat.TabIndex = 2; + // + // label4 + // + this.label4.Location = new System.Drawing.Point(354, 99); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(111, 28); + this.label4.TabIndex = 0; + this.label4.Text = "帧类型"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // cmb_Bps + // + this.cmb_Bps.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_Bps.Location = new System.Drawing.Point(354, 53); + this.cmb_Bps.Name = "cmb_Bps"; + this.cmb_Bps.Size = new System.Drawing.Size(200, 29); + this.cmb_Bps.TabIndex = 2; + // + // label3 + // + this.label3.Location = new System.Drawing.Point(59, 99); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(111, 28); + this.label3.TabIndex = 0; + this.label3.Text = "报文格式"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.Location = new System.Drawing.Point(354, 25); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(111, 28); + this.label2.TabIndex = 0; + this.label2.Text = "波特率[bps]"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // txt_AgreementName + // + this.txt_AgreementName.Location = new System.Drawing.Point(59, 53); + this.txt_AgreementName.Name = "txt_AgreementName"; + this.txt_AgreementName.Size = new System.Drawing.Size(200, 29); + this.txt_AgreementName.TabIndex = 1; + // + // label1 + // + this.label1.Location = new System.Drawing.Point(59, 21); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(84, 28); + this.label1.TabIndex = 0; + this.label1.Text = "协议名称"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.gridView_FuZhu); + this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.groupBox1.Location = new System.Drawing.Point(657, 26); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(601, 400); + this.groupBox1.TabIndex = 10; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "辅助位"; + // + // gridView_FuZhu + // + this.gridView_FuZhu.AllowUserToAddRows = false; + this.gridView_FuZhu.AllowUserToDeleteRows = false; + this.gridView_FuZhu.AllowUserToResizeColumns = false; + this.gridView_FuZhu.AllowUserToResizeRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.gridView_FuZhu.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.gridView_FuZhu.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.gridView_FuZhu.BackgroundColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gridView_FuZhu.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.gridView_FuZhu.ColumnHeadersHeight = 40; + this.gridView_FuZhu.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.bit7, + this.bit6, + this.bit5, + this.bit4, + this.bit3, + this.bit2, + this.bit1, + this.bit0, + this.SortIndex}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.gridView_FuZhu.DefaultCellStyle = dataGridViewCellStyle3; + this.gridView_FuZhu.Dock = System.Windows.Forms.DockStyle.Fill; + this.gridView_FuZhu.Location = new System.Drawing.Point(3, 25); + this.gridView_FuZhu.Margin = new System.Windows.Forms.Padding(0); + this.gridView_FuZhu.MultiSelect = false; + this.gridView_FuZhu.Name = "gridView_FuZhu"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gridView_FuZhu.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.gridView_FuZhu.RowHeadersWidth = 70; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.gridView_FuZhu.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.gridView_FuZhu.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.gridView_FuZhu.RowTemplate.Height = 40; + this.gridView_FuZhu.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.gridView_FuZhu.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.gridView_FuZhu.ShowEditingIcon = false; + this.gridView_FuZhu.Size = new System.Drawing.Size(595, 372); + this.gridView_FuZhu.TabIndex = 3; + // + // bit7 + // + this.bit7.DataPropertyName = "Bit7"; + this.bit7.HeaderText = "bit7"; + this.bit7.Name = "bit7"; + // + // bit6 + // + this.bit6.DataPropertyName = "Bit6"; + this.bit6.HeaderText = "bit6"; + this.bit6.Name = "bit6"; + // + // bit5 + // + this.bit5.DataPropertyName = "Bit5"; + this.bit5.HeaderText = "bit5"; + this.bit5.Name = "bit5"; + // + // bit4 + // + this.bit4.DataPropertyName = "Bit4"; + this.bit4.HeaderText = "bit4"; + this.bit4.Name = "bit4"; + // + // bit3 + // + this.bit3.DataPropertyName = "Bit3"; + this.bit3.HeaderText = "bit3"; + this.bit3.Name = "bit3"; + // + // bit2 + // + this.bit2.DataPropertyName = "Bit2"; + this.bit2.HeaderText = "bit2"; + this.bit2.Name = "bit2"; + // + // bit1 + // + this.bit1.DataPropertyName = "Bit1"; + this.bit1.HeaderText = "bit1"; + this.bit1.Name = "bit1"; + // + // bit0 + // + this.bit0.DataPropertyName = "Bit0"; + this.bit0.HeaderText = "bit0"; + this.bit0.Name = "bit0"; + // + // SortIndex + // + this.SortIndex.DataPropertyName = "SortIndex"; + this.SortIndex.HeaderText = "排序"; + this.SortIndex.Name = "SortIndex"; + this.SortIndex.Visible = false; + // // groupBox6 // this.groupBox6.Controls.Add(this.GridView_Recive); @@ -551,221 +766,6 @@ this.label8.Text = "周期[ms]"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // groupBox2 - // - this.groupBox2.Controls.Add(this.cmb_FrameType); - this.groupBox2.Controls.Add(this.cmb_MsgFormat); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Controls.Add(this.cmb_Bps); - this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Controls.Add(this.txt_AgreementName); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 12F); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Location = new System.Drawing.Point(7, 26); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(610, 221); - this.groupBox2.TabIndex = 12; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "报文"; - // - // cmb_FrameType - // - this.cmb_FrameType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_FrameType.FormattingEnabled = true; - this.cmb_FrameType.Location = new System.Drawing.Point(354, 130); - this.cmb_FrameType.Name = "cmb_FrameType"; - this.cmb_FrameType.Size = new System.Drawing.Size(200, 29); - this.cmb_FrameType.TabIndex = 2; - // - // cmb_MsgFormat - // - this.cmb_MsgFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_MsgFormat.FormattingEnabled = true; - this.cmb_MsgFormat.Location = new System.Drawing.Point(59, 130); - this.cmb_MsgFormat.Name = "cmb_MsgFormat"; - this.cmb_MsgFormat.Size = new System.Drawing.Size(200, 29); - this.cmb_MsgFormat.TabIndex = 2; - // - // label4 - // - this.label4.Location = new System.Drawing.Point(354, 99); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(111, 28); - this.label4.TabIndex = 0; - this.label4.Text = "帧类型"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // cmb_Bps - // - this.cmb_Bps.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_Bps.Location = new System.Drawing.Point(354, 53); - this.cmb_Bps.Name = "cmb_Bps"; - this.cmb_Bps.Size = new System.Drawing.Size(200, 29); - this.cmb_Bps.TabIndex = 2; - // - // label3 - // - this.label3.Location = new System.Drawing.Point(59, 99); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(111, 28); - this.label3.TabIndex = 0; - this.label3.Text = "报文格式"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label2 - // - this.label2.Location = new System.Drawing.Point(354, 25); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(111, 28); - this.label2.TabIndex = 0; - this.label2.Text = "波特率[bps]"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // txt_AgreementName - // - this.txt_AgreementName.Location = new System.Drawing.Point(59, 53); - this.txt_AgreementName.Name = "txt_AgreementName"; - this.txt_AgreementName.Size = new System.Drawing.Size(200, 29); - this.txt_AgreementName.TabIndex = 1; - // - // label1 - // - this.label1.Location = new System.Drawing.Point(59, 21); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(84, 28); - this.label1.TabIndex = 0; - this.label1.Text = "协议名称"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.gridView_FuZhu); - this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.groupBox1.Location = new System.Drawing.Point(657, 26); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(601, 400); - this.groupBox1.TabIndex = 10; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "辅助位"; - // - // gridView_FuZhu - // - this.gridView_FuZhu.AllowUserToAddRows = false; - this.gridView_FuZhu.AllowUserToDeleteRows = false; - this.gridView_FuZhu.AllowUserToResizeColumns = false; - this.gridView_FuZhu.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.gridView_FuZhu.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.gridView_FuZhu.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.gridView_FuZhu.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gridView_FuZhu.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.gridView_FuZhu.ColumnHeadersHeight = 40; - this.gridView_FuZhu.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.bit7, - this.bit6, - this.bit5, - this.bit4, - this.bit3, - this.bit2, - this.bit1, - this.bit0, - this.SortIndex}); - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gridView_FuZhu.DefaultCellStyle = dataGridViewCellStyle3; - this.gridView_FuZhu.Dock = System.Windows.Forms.DockStyle.Fill; - this.gridView_FuZhu.Location = new System.Drawing.Point(3, 25); - this.gridView_FuZhu.Margin = new System.Windows.Forms.Padding(0); - this.gridView_FuZhu.MultiSelect = false; - this.gridView_FuZhu.Name = "gridView_FuZhu"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.Transparent; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gridView_FuZhu.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; - this.gridView_FuZhu.RowHeadersWidth = 70; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.gridView_FuZhu.RowsDefaultCellStyle = dataGridViewCellStyle5; - this.gridView_FuZhu.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.gridView_FuZhu.RowTemplate.Height = 40; - this.gridView_FuZhu.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.gridView_FuZhu.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.gridView_FuZhu.ShowEditingIcon = false; - this.gridView_FuZhu.Size = new System.Drawing.Size(595, 372); - this.gridView_FuZhu.TabIndex = 3; - // - // bit7 - // - this.bit7.DataPropertyName = "Bit7"; - this.bit7.HeaderText = "bit7"; - this.bit7.Name = "bit7"; - // - // bit6 - // - this.bit6.DataPropertyName = "Bit6"; - this.bit6.HeaderText = "bit6"; - this.bit6.Name = "bit6"; - // - // bit5 - // - this.bit5.DataPropertyName = "Bit5"; - this.bit5.HeaderText = "bit5"; - this.bit5.Name = "bit5"; - // - // bit4 - // - this.bit4.DataPropertyName = "Bit4"; - this.bit4.HeaderText = "bit4"; - this.bit4.Name = "bit4"; - // - // bit3 - // - this.bit3.DataPropertyName = "Bit3"; - this.bit3.HeaderText = "bit3"; - this.bit3.Name = "bit3"; - // - // bit2 - // - this.bit2.DataPropertyName = "Bit2"; - this.bit2.HeaderText = "bit2"; - this.bit2.Name = "bit2"; - // - // bit1 - // - this.bit1.DataPropertyName = "Bit1"; - this.bit1.HeaderText = "bit1"; - this.bit1.Name = "bit1"; - // - // bit0 - // - this.bit0.DataPropertyName = "Bit0"; - this.bit0.HeaderText = "bit0"; - this.bit0.Name = "bit0"; - // - // SortIndex - // - this.SortIndex.DataPropertyName = "SortIndex"; - this.SortIndex.HeaderText = "排序"; - this.SortIndex.Name = "SortIndex"; - this.SortIndex.Visible = false; - // // leftPanel // this.leftPanel.BorderColor = System.Drawing.Color.Silver; @@ -840,6 +840,10 @@ this.Text = "协议配置"; this.Load += new System.EventHandler(this.FrmAgreement_Load); ((System.ComponentModel.ISupportInitialize)(this.panelEx1)).EndInit(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridView_FuZhu)).EndInit(); this.groupBox6.ResumeLayout(false); this.groupBox6.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.GridView_Recive)).EndInit(); @@ -849,10 +853,6 @@ ((System.ComponentModel.ISupportInitialize)(this.GridView_SendSpeed)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gridView_FuZhu)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.leftPanel)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.listBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.searchControl.Properties)).EndInit(); diff --git a/CompressorXN/FrmAgreement.cs b/CompressorXN/FrmAgreement.cs index 109f40d..0b9f760 100644 --- a/CompressorXN/FrmAgreement.cs +++ b/CompressorXN/FrmAgreement.cs @@ -1,4 +1,4 @@ -using CompressorXN.Untils; +using CompressorXN.Untils; using CompressorXN_Model; using CompressorXN_Model.Enums; using CompressorXN_Model.ViewModel.Response; @@ -35,8 +35,17 @@ namespace CompressorXN BindListBox(); - // 绑定CellPainting事件处理程序 + //绑定CellPainting事件处理程序 gridView_FuZhu.RowPostPaint += gridView_Assist_RowPostPaint; + + //gridView_FuZhu.DataBindingComplete += (s, e) => + //{ + // for (int i = 0; i < gridView_FuZhu.Rows.Count; i++) + // { + // gridView_FuZhu.Rows[i].HeaderCell.Value = $"Byte{i}"; + // } + //}; + Loading.CloseWaitForm(); } @@ -446,6 +455,17 @@ namespace CompressorXN agreementVM.AgreementHelpRuleList.Add(helpRule); } + //辅助位至少64条，不够64补到64条 + int count = agreementVM.AgreementHelpRuleList.Count; + while (count < 64) + { + agreementVM.AgreementHelpRuleList.Add(new T_Agreement_Help_Rule() + { + AgreementName = agreementName, + SortIndex = count++ + }); + } + #endregion bool saveResult = _agreementConfigService.SaveAgreement(agreementVM, agreementName);